diff --git a/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj b/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj index 0c038e5055..3be2dbe3f4 100644 --- a/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj +++ b/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj @@ -151,8 +151,6 @@ - - diff --git a/VB/Test/Lexer/LexerContextTests.cs b/VB/Test/Lexer/LexerContextTests.cs index 3ff287220a..6a9472f8ae 100644 --- a/VB/Test/Lexer/LexerContextTests.cs +++ b/VB/Test/Lexer/LexerContextTests.cs @@ -4,7 +4,7 @@ using System; using System.IO; using NUnit.Framework; -using VBParser = ICSharpCode.NRefactory.VB.Parser; +using ICSharpCode.NRefactory.VB.Parser; namespace ICSharpCode.NRefactory.VB.Tests.Lexer { @@ -560,7 +560,7 @@ exit Global do { t = lexer.NextToken(); p.InformToken(t); - } while (t.Kind != VBParser.Tokens.EOF); + } while (t.Kind != Tokens.EOF); Console.WriteLine(p.Output); diff --git a/VB/Test/Lexer/LexerTests.cs b/VB/Test/Lexer/LexerTests.cs index f91b902abd..b8662b6efd 100644 --- a/VB/Test/Lexer/LexerTests.cs +++ b/VB/Test/Lexer/LexerTests.cs @@ -5,7 +5,7 @@ using NUnit.Framework; using ICSharpCode.NRefactory.VB.Parser; using ICSharpCode.NRefactory.VB.PrettyPrinter; -namespace ICSharpCode.NRefactory.VB.Tests.Lexer +namespace ICSharpCode.NRefactory.Tests.VB.Lexer { [TestFixture] public sealed class LexerTests diff --git a/VB/Test/Lexer/XmlModeLexerTests.cs b/VB/Test/Lexer/XmlModeLexerTests.cs index 76dd12d600..82970dbfc3 100644 --- a/VB/Test/Lexer/XmlModeLexerTests.cs +++ b/VB/Test/Lexer/XmlModeLexerTests.cs @@ -948,12 +948,12 @@ End Using"; #region Helpers ILexer GenerateLexer(StringReader sr) { - return ParserFactory.CreateLexer(SupportedLanguage.VBNet, sr); + return ParserFactory.CreateLexer(sr); } ILexer GenerateLexerForSnippet(StringReader sr, SnippetType type) { - var lexer = ParserFactory.CreateLexer(SupportedLanguage.VBNet, sr); + var lexer = ParserFactory.CreateLexer(sr); lexer.SetInitialContext(type); return lexer; } diff --git a/VB/Test/Parser/Expressions/BinaryOperatorExpressionTests.cs b/VB/Test/Parser/Expressions/BinaryOperatorExpressionTests.cs index f6d69559d3..c7ddd706e2 100644 --- a/VB/Test/Parser/Expressions/BinaryOperatorExpressionTests.cs +++ b/VB/Test/Parser/Expressions/BinaryOperatorExpressionTests.cs @@ -14,14 +14,11 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public class BinaryOperatorExpressionTests { void OperatorPrecedenceTest(string strongOperator, BinaryOperatorType strongOperatorType, - string weakOperator, BinaryOperatorType weakOperatorType, bool vb) + string weakOperator, BinaryOperatorType weakOperatorType) { string program = "a " + weakOperator + " b " + strongOperator + " c"; BinaryOperatorExpression boe; - if (vb) - boe = ParseUtilVBNet.ParseExpression(program); - else - boe = ParseUtilCSharp.ParseExpression(program); + boe = ParseUtilVBNet.ParseExpression(program); Assert.AreEqual(weakOperatorType, boe.Op); Assert.IsTrue(boe.Left is IdentifierExpression); boe = (BinaryOperatorExpression)boe.Right; @@ -30,10 +27,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.IsTrue(boe.Right is IdentifierExpression); program = "a " + strongOperator + " b " + weakOperator + " c"; - if (vb) - boe = ParseUtilVBNet.ParseExpression(program); - else - boe = ParseUtilCSharp.ParseExpression(program); + boe = ParseUtilVBNet.ParseExpression(program); Assert.AreEqual(weakOperatorType, boe.Op); Assert.IsTrue(boe.Right is IdentifierExpression); boe = (BinaryOperatorExpression)boe.Left; @@ -43,14 +37,11 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom } void SameOperatorPrecedenceTest(string firstOperator, BinaryOperatorType firstOperatorType, - string secondOperator, BinaryOperatorType secondOperatorType, bool vb) + string secondOperator, BinaryOperatorType secondOperatorType) { string program = "a " + secondOperator + " b " + firstOperator + " c"; BinaryOperatorExpression boe; - if (vb) - boe = ParseUtilVBNet.ParseExpression(program); - else - boe = ParseUtilCSharp.ParseExpression(program); + boe = ParseUtilVBNet.ParseExpression(program); Assert.AreEqual(firstOperatorType, boe.Op); Assert.IsTrue(boe.Right is IdentifierExpression); boe = (BinaryOperatorExpression)boe.Left; @@ -59,10 +50,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.IsTrue(boe.Right is IdentifierExpression); program = "a " + firstOperator + " b " + secondOperator + " c"; - if (vb) - boe = ParseUtilVBNet.ParseExpression(program); - else - boe = ParseUtilCSharp.ParseExpression(program); + boe = ParseUtilVBNet.ParseExpression(program); Assert.AreEqual(secondOperatorType, boe.Op); Assert.IsTrue(boe.Right is IdentifierExpression); boe = (BinaryOperatorExpression)boe.Left; @@ -84,29 +72,29 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [Test] public void VBOperatorPrecedenceTest() { - OperatorPrecedenceTest("^", BinaryOperatorType.Power, "*", BinaryOperatorType.Multiply, true); - SameOperatorPrecedenceTest("*", BinaryOperatorType.Multiply, "/", BinaryOperatorType.Divide, true); - OperatorPrecedenceTest("/", BinaryOperatorType.Divide, "\\", BinaryOperatorType.DivideInteger, true); - OperatorPrecedenceTest("\\", BinaryOperatorType.DivideInteger, "Mod", BinaryOperatorType.Modulus, true); - OperatorPrecedenceTest("Mod", BinaryOperatorType.Modulus, "+", BinaryOperatorType.Add, true); - SameOperatorPrecedenceTest("+", BinaryOperatorType.Add, "-", BinaryOperatorType.Subtract, true); - OperatorPrecedenceTest("-", BinaryOperatorType.Subtract, "&", BinaryOperatorType.Concat, true); - OperatorPrecedenceTest("&", BinaryOperatorType.Concat, "<<", BinaryOperatorType.ShiftLeft, true); - SameOperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, ">>", BinaryOperatorType.ShiftRight, true); - OperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("<>", BinaryOperatorType.InEquality, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("<", BinaryOperatorType.LessThan, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("<=", BinaryOperatorType.LessThanOrEqual, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest(">", BinaryOperatorType.GreaterThan, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest(">=", BinaryOperatorType.GreaterThanOrEqual, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("Like", BinaryOperatorType.Like, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("Is", BinaryOperatorType.ReferenceEquality, "=", BinaryOperatorType.Equality, true); - SameOperatorPrecedenceTest("IsNot", BinaryOperatorType.ReferenceInequality, "=", BinaryOperatorType.Equality, true); - OperatorPrecedenceTest("=", BinaryOperatorType.Equality, "And", BinaryOperatorType.BitwiseAnd, true); - SameOperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "AndAlso", BinaryOperatorType.LogicalAnd, true); - OperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "Or", BinaryOperatorType.BitwiseOr, true); - SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "OrElse", BinaryOperatorType.LogicalOr, true); - SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "Xor", BinaryOperatorType.ExclusiveOr, true); + OperatorPrecedenceTest("^", BinaryOperatorType.Power, "*", BinaryOperatorType.Multiply); + SameOperatorPrecedenceTest("*", BinaryOperatorType.Multiply, "/", BinaryOperatorType.Divide); + OperatorPrecedenceTest("/", BinaryOperatorType.Divide, "\\", BinaryOperatorType.DivideInteger); + OperatorPrecedenceTest("\\", BinaryOperatorType.DivideInteger, "Mod", BinaryOperatorType.Modulus); + OperatorPrecedenceTest("Mod", BinaryOperatorType.Modulus, "+", BinaryOperatorType.Add); + SameOperatorPrecedenceTest("+", BinaryOperatorType.Add, "-", BinaryOperatorType.Subtract); + OperatorPrecedenceTest("-", BinaryOperatorType.Subtract, "&", BinaryOperatorType.Concat); + OperatorPrecedenceTest("&", BinaryOperatorType.Concat, "<<", BinaryOperatorType.ShiftLeft); + SameOperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, ">>", BinaryOperatorType.ShiftRight); + OperatorPrecedenceTest("<<", BinaryOperatorType.ShiftLeft, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("<>", BinaryOperatorType.InEquality, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("<", BinaryOperatorType.LessThan, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("<=", BinaryOperatorType.LessThanOrEqual, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest(">", BinaryOperatorType.GreaterThan, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest(">=", BinaryOperatorType.GreaterThanOrEqual, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("Like", BinaryOperatorType.Like, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("Is", BinaryOperatorType.ReferenceEquality, "=", BinaryOperatorType.Equality); + SameOperatorPrecedenceTest("IsNot", BinaryOperatorType.ReferenceInequality, "=", BinaryOperatorType.Equality); + OperatorPrecedenceTest("=", BinaryOperatorType.Equality, "And", BinaryOperatorType.BitwiseAnd); + SameOperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "AndAlso", BinaryOperatorType.LogicalAnd); + OperatorPrecedenceTest("And", BinaryOperatorType.BitwiseAnd, "Or", BinaryOperatorType.BitwiseOr); + SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "OrElse", BinaryOperatorType.LogicalOr); + SameOperatorPrecedenceTest("Or", BinaryOperatorType.BitwiseOr, "Xor", BinaryOperatorType.ExclusiveOr); } [Test] @@ -285,9 +273,9 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom string AddInteger(string input, int number) where T : Expression { - Expression e = ParseUtilCSharp.ParseExpression(input); + Expression e = ParseUtilVBNet.ParseExpression(input); e = Expression.AddInteger(e, number); - CSharpOutputVisitor v = new CSharpOutputVisitor(); + VBNetOutputVisitor v = new VBNetOutputVisitor(); e.AcceptVisitor(v, null); return v.Text; } diff --git a/VB/Test/Parser/Expressions/ClassReferenceExpressionTests.cs b/VB/Test/Parser/Expressions/ClassReferenceExpressionTests.cs index 5c55234255..0772013d32 100644 --- a/VB/Test/Parser/Expressions/ClassReferenceExpressionTests.cs +++ b/VB/Test/Parser/Expressions/ClassReferenceExpressionTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ClassReferenceExpressionTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetClassReferenceExpressionTest1() diff --git a/VB/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs b/VB/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs index 2a7b2b1756..dd6b0fd2b6 100644 --- a/VB/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs +++ b/VB/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs @@ -12,14 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class GlobalReferenceExpressionTests { - [Test] - public void CSharpGlobalReferenceExpressionTest() - { - TypeReferenceExpression tre = ParseUtilCSharp.ParseExpression("global::System"); - Assert.IsTrue(tre.TypeReference.IsGlobal); - Assert.AreEqual("System", tre.TypeReference.Type); - } - [Test] public void VBNetGlobalReferenceExpressionTest() { @@ -28,15 +20,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.AreEqual("System", tre.TypeReference.Type); } - [Test] - public void CSharpGlobalTypeDeclaration() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("global::System.String a;"); - TypeReference typeRef = lvd.GetTypeForVariable(0); - Assert.IsTrue(typeRef.IsGlobal); - Assert.AreEqual("System.String", typeRef.Type); - } - [Test] public void VBNetGlobalTypeDeclaration() { diff --git a/VB/Test/Parser/Expressions/ObjectCreateExpressionTests.cs b/VB/Test/Parser/Expressions/ObjectCreateExpressionTests.cs index e29bf5c4cf..75e259067a 100644 --- a/VB/Test/Parser/Expressions/ObjectCreateExpressionTests.cs +++ b/VB/Test/Parser/Expressions/ObjectCreateExpressionTests.cs @@ -23,7 +23,12 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom } } - #region VB.NET + Expression CheckPropertyInitializationExpression(Expression e, string name) + { + Assert.IsInstanceOf(typeof(MemberInitializerExpression), e); + Assert.AreEqual(name, ((MemberInitializerExpression)e).Name); + return ((MemberInitializerExpression)e).Expression; + } [Test] public void VBNetAnonymousType() @@ -105,7 +110,5 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.AreEqual(1, oce.CreateType.GenericTypes.Count); Assert.AreEqual("System.Int32", oce.CreateType.GenericTypes[0].Type); } - - #endregion } } diff --git a/VB/Test/Parser/Expressions/QueryExpressionTests.cs b/VB/Test/Parser/Expressions/QueryExpressionTests.cs index 233b4eacdf..c6d150f257 100644 --- a/VB/Test/Parser/Expressions/QueryExpressionTests.cs +++ b/VB/Test/Parser/Expressions/QueryExpressionTests.cs @@ -14,98 +14,5 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class QueryExpressionTests { - [Test] - public void SimpleExpression() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from c in customers where c.City == \"London\" select c" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.AreEqual(1, qe.MiddleClauses.Count); - Assert.IsInstanceOf(typeof(QueryExpressionWhereClause), qe.MiddleClauses[0]); - QueryExpressionWhereClause wc = (QueryExpressionWhereClause)qe.MiddleClauses[0]; - Assert.IsInstanceOf(typeof(BinaryOperatorExpression), wc.Condition); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - [Test] - public void ExpressionWithType1() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from Customer c in customers select c" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("Customer", qe.FromClause.Sources.First().Type.ToString()); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - [Test] - public void ExpressionWithType2() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from int c in customers select c" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("System.Int32", qe.FromClause.Sources.First().Type.Type); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - - [Test] - public void ExpressionWithType3() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from S? c in customers select c" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("System.Nullable>", qe.FromClause.Sources.First().Type.ToString()); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - [Test] - public void MultipleGenerators() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression(@" -from c in customers -where c.City == ""London"" -from o in c.Orders -where o.OrderDate.Year == 2005 -select new { c.Name, o.OrderID, o.Total }"); - Assert.AreEqual(3, qe.MiddleClauses.Count); - Assert.IsInstanceOf(typeof(QueryExpressionWhereClause), qe.MiddleClauses[0]); - Assert.IsInstanceOf(typeof(QueryExpressionFromClause), qe.MiddleClauses[1]); - Assert.IsInstanceOf(typeof(QueryExpressionWhereClause), qe.MiddleClauses[2]); - - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - [Test] - public void ExpressionWithOrderBy() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from c in customers orderby c.Name select c" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.IsInstanceOf(typeof(QueryExpressionOrderClause), qe.MiddleClauses[0]); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } - - [Test] - public void ExpressionWithOrderByAndLet() - { - QueryExpression qe = ParseUtilCSharp.ParseExpression( - "from c in customers orderby c.Name let x = c select x" - ); - Assert.AreEqual("c", qe.FromClause.Sources.First().Identifier); - Assert.AreEqual("customers", ((IdentifierExpression)qe.FromClause.Sources.First().Expression).Identifier); - Assert.IsInstanceOf(typeof(QueryExpressionOrderClause), qe.MiddleClauses[0]); - Assert.IsInstanceOf(typeof(QueryExpressionLetClause), qe.MiddleClauses[1]); - Assert.IsInstanceOf(typeof(QueryExpressionSelectClause), qe.SelectOrGroupClause); - } } } diff --git a/VB/Test/Parser/Expressions/TypeOfIsExpressionTests.cs b/VB/Test/Parser/Expressions/TypeOfIsExpressionTests.cs index 4e3c967ecc..7a6ead2585 100644 --- a/VB/Test/Parser/Expressions/TypeOfIsExpressionTests.cs +++ b/VB/Test/Parser/Expressions/TypeOfIsExpressionTests.cs @@ -12,38 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class TypeOfIsExpressionTests { - #region C# - [Test] - public void GenericArrayIsExpression() - { - TypeOfIsExpression ce = ParseUtilCSharp.ParseExpression("o is List[]"); - Assert.AreEqual("List", ce.TypeReference.Type); - Assert.AreEqual("System.String", ce.TypeReference.GenericTypes[0].Type); - Assert.AreEqual(new int[] { 0 }, ce.TypeReference.RankSpecifier); - Assert.IsTrue(ce.Expression is IdentifierExpression); - } - - [Test] - public void NullableIsExpression() - { - TypeOfIsExpression ce = ParseUtilCSharp.ParseExpression("o is int?"); - Assert.AreEqual("System.Nullable", ce.TypeReference.Type); - Assert.AreEqual("System.Int32", ce.TypeReference.GenericTypes[0].Type); - Assert.IsTrue(ce.Expression is IdentifierExpression); - } - - [Test] - public void NullableIsExpressionInBinaryOperatorExpression() - { - BinaryOperatorExpression boe; - boe = ParseUtilCSharp.ParseExpression("o is int? == true"); - TypeOfIsExpression ce = (TypeOfIsExpression)boe.Left; - Assert.AreEqual("System.Nullable", ce.TypeReference.Type); - Assert.AreEqual("System.Int32", ce.TypeReference.GenericTypes[0].Type); - Assert.IsTrue(ce.Expression is IdentifierExpression); - } - #endregion - #region VB.NET [Test] public void VBNetSimpleTypeOfIsExpression() diff --git a/VB/Test/Parser/GlobalScope/OptionDeclarationTests.cs b/VB/Test/Parser/GlobalScope/OptionDeclarationTests.cs index 2d179640db..aede30f105 100644 --- a/VB/Test/Parser/GlobalScope/OptionDeclarationTests.cs +++ b/VB/Test/Parser/GlobalScope/OptionDeclarationTests.cs @@ -79,7 +79,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetInvalidOptionDeclarationTest() { string program = "Option\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.IsFalse(parser.Errors.ErrorOutput.Length == 0, "Expected errors, but operation completed successfully"); } diff --git a/VB/Test/Parser/GlobalScope/UsingDeclarationTests.cs b/VB/Test/Parser/GlobalScope/UsingDeclarationTests.cs index 75aa08b471..aa4522b279 100644 --- a/VB/Test/Parser/GlobalScope/UsingDeclarationTests.cs +++ b/VB/Test/Parser/GlobalScope/UsingDeclarationTests.cs @@ -61,7 +61,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetWrongUsingTest() { string program = "Imports\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.IsTrue(parser.Errors.Count > 0); UsingDeclaration u = (UsingDeclaration)parser.CompilationUnit.Children[0]; @@ -74,7 +74,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetWrongUsing2Test() { string program = "Imports ,\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.IsTrue(parser.Errors.Count > 0); UsingDeclaration u = (UsingDeclaration)parser.CompilationUnit.Children[0]; @@ -88,7 +88,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom { string program = "Imports System\n" + "Imports My.Name.Space\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); @@ -101,7 +101,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom string program = "Imports TESTME=System\n" + "Imports myAlias=My.Name.Space\n" + "Imports StringCollection = System.Collections.Generic.List(Of string)\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); @@ -112,7 +112,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetComplexUsingAliasDeclarationTest() { string program = "Imports NS1, AL=NS2, NS3, AL2=NS4, NS5\n"; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); @@ -123,7 +123,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetXmlNamespaceUsingTest() { string program = "Imports "; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); @@ -144,7 +144,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetXmlNamespaceWithPrefixUsingTest() { string program = "Imports "; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); @@ -165,7 +165,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public void VBNetXmlNamespaceSingleQuotedUsingTest() { string program = "Imports "; - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); Assert.AreEqual("", parser.Errors.ErrorOutput); diff --git a/VB/Test/Parser/ParseUtilVBNet.cs b/VB/Test/Parser/ParseUtilVBNet.cs index 5f47d3035f..1a56036524 100644 --- a/VB/Test/Parser/ParseUtilVBNet.cs +++ b/VB/Test/Parser/ParseUtilVBNet.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public static T ParseGlobal(string program, bool expectErrors) where T : INode { - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(program)); + IParser parser = ParserFactory.CreateParser(new StringReader(program)); parser.Parse(); if (expectErrors) @@ -76,7 +76,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom public static T ParseExpression(string expr, bool expectErrors) where T : INode { - IParser parser = ParserFactory.CreateParser(SupportedLanguage.VBNet, new StringReader(expr)); + IParser parser = ParserFactory.CreateParser(new StringReader(expr)); INode parsedExpression = parser.ParseExpression(); if (expectErrors) Assert.IsFalse(parser.Errors.ErrorOutput.Length == 0, "Expected errors, but operation completed successfully"); diff --git a/VB/Test/Parser/SkipMethodBodiesTest.cs b/VB/Test/Parser/SkipMethodBodiesTest.cs deleted file mode 100644 index 66e068662e..0000000000 --- a/VB/Test/Parser/SkipMethodBodiesTest.cs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.NRefactory.VB.Dom; -using NUnit.Framework; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class SkipMethodBodiesTest - { - [Test] - public void EmptyMethods() - { - string txt = @"internal sealed class Lexer : AbstractLexer - { - public Lexer(TextReader reader) : base(reader) - { - } - - void Method() - { - } - }"; - Check(ParseUtilCSharp.ParseGlobal(txt, false, true)); - } - - [Test] - public void NonEmptyMethods() - { - string txt = @"internal sealed class Lexer : AbstractLexer - { - public Lexer(TextReader reader) : base(reader) - { - if (reader == null) { - throw new ArgumentNullException(""reader""); - } - } - - void Method() - { - while(something) { - if (anything) - break; - } - } - }"; - Check(ParseUtilCSharp.ParseGlobal(txt, false, true)); - } - - void Check(TypeDeclaration td) - { - Assert.AreEqual("Lexer", td.Name); - Assert.AreEqual(2, td.Children.Count); - Assert.AreEqual(0, ((ConstructorDeclaration)td.Children[0]).Body.Children.Count); - Assert.AreEqual(0, ((MethodDeclaration)td.Children[1]).Body.Children.Count); - } - } -} diff --git a/VB/Test/Parser/Statements/BlockStatementTests.cs b/VB/Test/Parser/Statements/BlockStatementTests.cs index 237e9427fe..962cbfd14c 100644 --- a/VB/Test/Parser/Statements/BlockStatementTests.cs +++ b/VB/Test/Parser/Statements/BlockStatementTests.cs @@ -12,34 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class BlockStatementTests { - #region C# - [Test] - public void CSharpBlockStatementTest() - { - BlockStatement blockStmt = ParseUtilCSharp.ParseStatement("{}"); - } - - [Test] - public void CSharpComplexBlockStatementPositionTest() - { - string code = @"{ - WebClient wc = new WebClient(); - wc.Test(); - wc.UploadStringCompleted += delegate { - output.BeginInvoke((MethodInvoker)delegate { - output.Text += newText; - }); - }; -}"; - BlockStatement blockStmt = ParseUtilCSharp.ParseStatement(code); - //Assert.AreEqual(1, blockStmt.StartLocation.Column); // does not work because ParseStatement inserts special code - Assert.AreEqual(1, blockStmt.StartLocation.Line); - Assert.AreEqual(2, blockStmt.EndLocation.Column); - Assert.AreEqual(9, blockStmt.EndLocation.Line); - } - - #endregion - #region VB.NET // TODO #endregion diff --git a/VB/Test/Parser/Statements/BreakStatementTests.cs b/VB/Test/Parser/Statements/BreakStatementTests.cs index ab92d94828..f067e3ddc1 100644 --- a/VB/Test/Parser/Statements/BreakStatementTests.cs +++ b/VB/Test/Parser/Statements/BreakStatementTests.cs @@ -12,14 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class BreakStatementTests { - #region C# - [Test] - public void CSharpBreakStatementTest() - { - BreakStatement breakStmt = ParseUtilCSharp.ParseStatement("break;"); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/CheckedStatementTests.cs b/VB/Test/Parser/Statements/CheckedStatementTests.cs index 025a64f829..b965010928 100644 --- a/VB/Test/Parser/Statements/CheckedStatementTests.cs +++ b/VB/Test/Parser/Statements/CheckedStatementTests.cs @@ -12,25 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class CheckedStatementTests { - #region C# - [Test] - public void CSharpCheckedStatementTest() - { - CheckedStatement checkedStatement = ParseUtilCSharp.ParseStatement("checked { }"); - Assert.IsFalse(checkedStatement.Block.IsNull); - } - - [Test] - public void CSharpCheckedStatementAndExpressionTest() - { - CheckedStatement checkedStatement = ParseUtilCSharp.ParseStatement("checked { checked(++i); }"); - Assert.IsFalse(checkedStatement.Block.IsNull); - ExpressionStatement es = (ExpressionStatement)checkedStatement.Block.Children[0]; - CheckedExpression ce = (CheckedExpression)es.Expression; - Assert.IsInstanceOf(ce.Expression); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/ContinueStatementTests.cs b/VB/Test/Parser/Statements/ContinueStatementTests.cs index 67a34a92ee..ea7ce29bf3 100644 --- a/VB/Test/Parser/Statements/ContinueStatementTests.cs +++ b/VB/Test/Parser/Statements/ContinueStatementTests.cs @@ -12,14 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ContinueStatementTests { - #region C# - [Test] - public void CSharpContinueStatementTest() - { - ContinueStatement continueStmt = ParseUtilCSharp.ParseStatement("continue;"); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/DoLoopStatementTests.cs b/VB/Test/Parser/Statements/DoLoopStatementTests.cs index c7254dcd27..4a726ec5b5 100644 --- a/VB/Test/Parser/Statements/DoLoopStatementTests.cs +++ b/VB/Test/Parser/Statements/DoLoopStatementTests.cs @@ -12,28 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class DoLoopStatementTests { - #region C# - [Test] - public void CSharpWhileStatementTest() - { - DoLoopStatement doLoopStmt = ParseUtilCSharp.ParseStatement("while (true) { }"); - Assert.AreEqual(ConditionPosition.Start, doLoopStmt.ConditionPosition); - Assert.AreEqual(ConditionType.While, doLoopStmt.ConditionType); - Assert.IsTrue(doLoopStmt.Condition is PrimitiveExpression); - Assert.IsTrue(doLoopStmt.EmbeddedStatement is BlockStatement); - } - - [Test] - public void CSharpDoWhileStatementTest() - { - DoLoopStatement doLoopStmt = ParseUtilCSharp.ParseStatement("do { } while (true);"); - Assert.AreEqual(ConditionPosition.End, doLoopStmt.ConditionPosition); - Assert.AreEqual(ConditionType.While, doLoopStmt.ConditionType); - Assert.IsTrue(doLoopStmt.Condition is PrimitiveExpression); - Assert.IsTrue(doLoopStmt.EmbeddedStatement is BlockStatement); - } - #endregion - #region VB.NET // TODO #endregion diff --git a/VB/Test/Parser/Statements/EmptyStatementTests.cs b/VB/Test/Parser/Statements/EmptyStatementTests.cs index 0278e5d790..3698089327 100644 --- a/VB/Test/Parser/Statements/EmptyStatementTests.cs +++ b/VB/Test/Parser/Statements/EmptyStatementTests.cs @@ -12,17 +12,8 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class EmptyStatementTests { - #region C# - [Test] - public void CSharpEmptyStatementTest() - { - EmptyStatement emptyStmt = ParseUtilCSharp.ParseStatement(";"); - } - #endregion - #region VB.NET // No VB.NET representation #endregion - } } diff --git a/VB/Test/Parser/Statements/EndStatementTests.cs b/VB/Test/Parser/Statements/EndStatementTests.cs index df06dae1a3..9699481308 100644 --- a/VB/Test/Parser/Statements/EndStatementTests.cs +++ b/VB/Test/Parser/Statements/EndStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class EndStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetEndStatementTest() diff --git a/VB/Test/Parser/Statements/EraseStatementTests.cs b/VB/Test/Parser/Statements/EraseStatementTests.cs index 85cbf6475d..9fd7ab0a3a 100644 --- a/VB/Test/Parser/Statements/EraseStatementTests.cs +++ b/VB/Test/Parser/Statements/EraseStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class EraseStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetEraseStatementTest() diff --git a/VB/Test/Parser/Statements/ErrorStatementTests.cs b/VB/Test/Parser/Statements/ErrorStatementTests.cs index 83733b1131..aee5455bea 100644 --- a/VB/Test/Parser/Statements/ErrorStatementTests.cs +++ b/VB/Test/Parser/Statements/ErrorStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ErrorStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetErrorStatementTest() diff --git a/VB/Test/Parser/Statements/ExpressionStatementTests.cs b/VB/Test/Parser/Statements/ExpressionStatementTests.cs index e8433ee369..3645f348aa 100644 --- a/VB/Test/Parser/Statements/ExpressionStatementTests.cs +++ b/VB/Test/Parser/Statements/ExpressionStatementTests.cs @@ -12,21 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ExpressionStatementTests { - #region C# - [Test] - public void CSharpStatementExpressionTest() - { - ExpressionStatement stmtExprStmt = ParseUtilCSharp.ParseStatement("my.Obj.PropCall;"); - Assert.IsTrue(stmtExprStmt.Expression is MemberReferenceExpression); - } - [Test] - public void CSharpStatementExpressionTest1() - { - ExpressionStatement stmtExprStmt = ParseUtilCSharp.ParseStatement("yield.yield;"); - Assert.IsTrue(stmtExprStmt.Expression is MemberReferenceExpression); - } - #endregion - #region VB.NET // TODO #endregion diff --git a/VB/Test/Parser/Statements/FixedStatementTests.cs b/VB/Test/Parser/Statements/FixedStatementTests.cs index 1a4519c3b6..8a19eb5591 100644 --- a/VB/Test/Parser/Statements/FixedStatementTests.cs +++ b/VB/Test/Parser/Statements/FixedStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class FixedStatementTests { - #region C# - [Test] - public void CSharpFixedStatementTest() - { - FixedStatement fixedStmt = ParseUtilCSharp.ParseStatement("fixed (int* ptr = &myIntArr) { }"); - // TODO : Extend test. - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/ForNextStatementTests.cs b/VB/Test/Parser/Statements/ForNextStatementTests.cs index b439a647b0..44c0f23301 100644 --- a/VB/Test/Parser/Statements/ForNextStatementTests.cs +++ b/VB/Test/Parser/Statements/ForNextStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ForNextStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetForNextStatementTest() diff --git a/VB/Test/Parser/Statements/ForStatementTests.cs b/VB/Test/Parser/Statements/ForStatementTests.cs index 6307f001ce..99866101fd 100644 --- a/VB/Test/Parser/Statements/ForStatementTests.cs +++ b/VB/Test/Parser/Statements/ForStatementTests.cs @@ -12,28 +12,8 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ForStatementTests { - #region C# - [Test] - public void CSharpEmptyForStatementTest() - { - ForStatement forStmt = ParseUtilCSharp.ParseStatement("for (;;) ;"); - Assert.AreEqual(0, forStmt.Initializers.Count); - Assert.AreEqual(0, forStmt.Iterator.Count); - Assert.IsTrue(forStmt.Condition.IsNull); - Assert.IsTrue(forStmt.EmbeddedStatement is EmptyStatement); - } - - [Test] - public void CSharpForStatementTest() - { - ForStatement forStmt = ParseUtilCSharp.ParseStatement("for (int i = 5; i < 6; ++i) {} "); - // TODO : Extend test. - } - #endregion - #region VB.NET // No VB.NET representation (for ... next is different) #endregion - } } diff --git a/VB/Test/Parser/Statements/ForeachStatementTests.cs b/VB/Test/Parser/Statements/ForeachStatementTests.cs index 70bfa7d659..bcd8a619c1 100644 --- a/VB/Test/Parser/Statements/ForeachStatementTests.cs +++ b/VB/Test/Parser/Statements/ForeachStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ForeachStatementTests { - #region C# - [Test] - public void CSharpForeachStatementTest() - { - ForeachStatement foreachStmt = ParseUtilCSharp.ParseStatement("foreach (int i in myColl) {} "); - // TODO : Extend test. - } - #endregion - #region VB.NET [Test] public void VBNetForeachStatementTest() diff --git a/VB/Test/Parser/Statements/GotoCaseStatementTests.cs b/VB/Test/Parser/Statements/GotoCaseStatementTests.cs index ae55f387b7..3a5d0713ca 100644 --- a/VB/Test/Parser/Statements/GotoCaseStatementTests.cs +++ b/VB/Test/Parser/Statements/GotoCaseStatementTests.cs @@ -12,23 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class GotoCaseStatementTests { - #region C# - [Test] - public void CSharpGotoCaseDefaltStatementTest() - { - GotoCaseStatement gotoCaseStmt = ParseUtilCSharp.ParseStatement("goto default;"); - Assert.IsTrue(gotoCaseStmt.IsDefaultCase); - } - - [Test] - public void CSharpGotoCaseStatementTest() - { - GotoCaseStatement gotoCaseStmt = ParseUtilCSharp.ParseStatement("goto case 6;"); - Assert.IsFalse(gotoCaseStmt.IsDefaultCase); - Assert.IsTrue(gotoCaseStmt.Expression is PrimitiveExpression); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/GotoStatementTests.cs b/VB/Test/Parser/Statements/GotoStatementTests.cs index 808ad8bf6c..2e04a7ddd0 100644 --- a/VB/Test/Parser/Statements/GotoStatementTests.cs +++ b/VB/Test/Parser/Statements/GotoStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class GotoStatementTests { - #region C# - [Test] - public void CSharpGotoStatementTest() - { - GotoStatement gotoStmt = ParseUtilCSharp.ParseStatement("goto myLabel;"); - Assert.AreEqual("myLabel", gotoStmt.Label); - } - #endregion - #region VB.NET [Test] public void VBNetGotoStatementTest() diff --git a/VB/Test/Parser/Statements/IfElseStatementTests.cs b/VB/Test/Parser/Statements/IfElseStatementTests.cs index 4a06841e01..32e32e8387 100644 --- a/VB/Test/Parser/Statements/IfElseStatementTests.cs +++ b/VB/Test/Parser/Statements/IfElseStatementTests.cs @@ -12,49 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class IfElseStatementTests { - #region C# - [Test] - public void CSharpSimpleIfStatementTest() - { - IfElseStatement ifElseStatement = ParseUtilCSharp.ParseStatement("if (true) { }"); - Assert.IsFalse(ifElseStatement.Condition.IsNull); - Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count); - Assert.IsTrue(ifElseStatement.FalseStatement.Count == 0, "false count != 0:" + ifElseStatement.FalseStatement.Count); - - Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement); - } - - [Test] - public void CSharpSimpleIfElseStatementTest() - { - IfElseStatement ifElseStatement = ParseUtilCSharp.ParseStatement("if (true) { } else { }"); - Assert.IsFalse(ifElseStatement.Condition.IsNull); - Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count); - Assert.IsTrue(ifElseStatement.FalseStatement.Count == 1, "false count != 1:" + ifElseStatement.FalseStatement.Count); - - Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]); - Assert.IsTrue(ifElseStatement.FalseStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.FalseStatement[0]); - } - - - [Test] - public void CSharpIfElseIfStatementTest() - { - IfElseStatement ifElseStatement = ParseUtilCSharp.ParseStatement("if (1) { } else if (2) { } else if (3) { } else { }"); - Assert.IsFalse(ifElseStatement.Condition.IsNull); - Assert.IsTrue(ifElseStatement.ElseIfSections.Count == 2, "elseif section count != 2:" + ifElseStatement.ElseIfSections.Count); - Assert.IsTrue(ifElseStatement.TrueStatement.Count == 1, "true count != 1:" + ifElseStatement.TrueStatement.Count); - Assert.IsTrue(ifElseStatement.FalseStatement.Count == 1, "false count != 1:" + ifElseStatement.FalseStatement.Count); - - Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]); - Assert.IsTrue(ifElseStatement.FalseStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.FalseStatement[0]); - Assert.IsTrue(ifElseStatement.ElseIfSections[0].EmbeddedStatement is BlockStatement, "Statement was: " + ifElseStatement.ElseIfSections[0].EmbeddedStatement); - Assert.IsTrue(ifElseStatement.ElseIfSections[1].EmbeddedStatement is BlockStatement, "Statement was: " + ifElseStatement.ElseIfSections[1].EmbeddedStatement); - Assert.AreEqual(2, (ifElseStatement.ElseIfSections[0].Condition as PrimitiveExpression).Value); - Assert.AreEqual(3, (ifElseStatement.ElseIfSections[1].Condition as PrimitiveExpression).Value); - } - #endregion - #region VB.NET [Test] public void VBNetSimpleIfStatementTest() diff --git a/VB/Test/Parser/Statements/LabelStatementTests.cs b/VB/Test/Parser/Statements/LabelStatementTests.cs index f85bd54ef7..b7ac2d3e66 100644 --- a/VB/Test/Parser/Statements/LabelStatementTests.cs +++ b/VB/Test/Parser/Statements/LabelStatementTests.cs @@ -12,21 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class LabelStatementTests { - #region C# - [Test] - public void CSharpLabelStatementTest() - { - LabelStatement labelStmt = ParseUtilCSharp.ParseStatement("myLabel: ; "); - Assert.AreEqual("myLabel", labelStmt.Label); - } - [Test] - public void CSharpLabel2StatementTest() - { - LabelStatement labelStmt = ParseUtilCSharp.ParseStatement("yield: ; "); - Assert.AreEqual("yield", labelStmt.Label); - } - #endregion - #region VB.NET [Test] public void VBNetLabelStatementTest() diff --git a/VB/Test/Parser/Statements/LocalVariableDeclarationTests.cs b/VB/Test/Parser/Statements/LocalVariableDeclarationTests.cs index fe5d83cafc..97005bb50c 100644 --- a/VB/Test/Parser/Statements/LocalVariableDeclarationTests.cs +++ b/VB/Test/Parser/Statements/LocalVariableDeclarationTests.cs @@ -12,222 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class LocalVariableDeclarationTests { - #region C# - - [Test] - public void CSharpLocalVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("int a = 5;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("System.Int32", type.Type); - Assert.AreEqual(5, ((PrimitiveExpression)lvd.Variables[0].Initializer).Value); - } - - [Test] - public void CSharpVoidPointerVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("void *a;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("System.Void", type.Type); - Assert.AreEqual(1, type.PointerNestingLevel); - } - - [Test] - public void CSharpComplexGenericLocalVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("Generic > where = new Generic>();"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("where", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("Generic", type.Type); - Assert.AreEqual(2, type.GenericTypes.Count); - Assert.AreEqual("Namespace.Printable", type.GenericTypes[0].Type); - Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count); - Assert.AreEqual("G", type.GenericTypes[1].Type); - Assert.AreEqual(1, type.GenericTypes[1].GenericTypes.Count); - Assert.AreEqual("Printable", type.GenericTypes[1].GenericTypes[0].Type); - - // TODO: Check initializer - } - - [Test] - public void CSharpNestedGenericLocalVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("MyType.InnerClass.InnerInnerClass a;"); - Assert.AreEqual(1, lvd.Variables.Count); - InnerClassTypeReference ic = (InnerClassTypeReference)lvd.GetTypeForVariable(0); - Assert.AreEqual("InnerInnerClass", ic.Type); - Assert.AreEqual(0, ic.GenericTypes.Count); - ic = (InnerClassTypeReference)ic.BaseType; - Assert.AreEqual("InnerClass", ic.Type); - Assert.AreEqual(1, ic.GenericTypes.Count); - Assert.AreEqual("System.Int32", ic.GenericTypes[0].Type); - Assert.AreEqual("MyType", ic.BaseType.Type); - Assert.AreEqual(1, ic.BaseType.GenericTypes.Count); - Assert.AreEqual("System.String", ic.BaseType.GenericTypes[0].Type); - } - - [Test] - public void CSharpGenericWithArrayLocalVariableDeclarationTest1() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("G[] a;"); - Assert.AreEqual(1, lvd.Variables.Count); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("G", type.Type); - Assert.AreEqual(1, type.GenericTypes.Count); - Assert.AreEqual("System.Int32", type.GenericTypes[0].Type); - Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count); - Assert.IsFalse(type.GenericTypes[0].IsArrayType); - Assert.AreEqual(new int[] {0}, type.RankSpecifier); - } - - [Test] - public void CSharpGenericWithArrayLocalVariableDeclarationTest2() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("G a;"); - Assert.AreEqual(1, lvd.Variables.Count); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("G", type.Type); - Assert.AreEqual(1, type.GenericTypes.Count); - Assert.AreEqual("System.Int32", type.GenericTypes[0].Type); - Assert.AreEqual(0, type.GenericTypes[0].GenericTypes.Count); - Assert.IsFalse(type.IsArrayType); - Assert.AreEqual(new int[] {0}, type.GenericTypes[0].RankSpecifier); - } - - [Test] - public void CSharpGenericLocalVariableDeclarationTest2() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("G > a;"); - Assert.AreEqual(1, lvd.Variables.Count); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("G", type.Type); - Assert.AreEqual(1, type.GenericTypes.Count); - Assert.AreEqual("G", type.GenericTypes[0].Type); - Assert.AreEqual(1, type.GenericTypes[0].GenericTypes.Count); - Assert.AreEqual("System.Int32", type.GenericTypes[0].GenericTypes[0].Type); - } - - [Test] - public void CSharpGenericLocalVariableDeclarationTest2WithoutSpace() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("G> a;"); - Assert.AreEqual(1, lvd.Variables.Count); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("G", type.Type); - Assert.AreEqual(1, type.GenericTypes.Count); - Assert.AreEqual("G", type.GenericTypes[0].Type); - Assert.AreEqual(1, type.GenericTypes[0].GenericTypes.Count); - Assert.AreEqual("System.Int32", type.GenericTypes[0].GenericTypes[0].Type); - } - - [Test] - public void CSharpGenericLocalVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("G a;"); - Assert.AreEqual(1, lvd.Variables.Count); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("G", type.Type); - Assert.AreEqual(1, type.GenericTypes.Count); - Assert.AreEqual("System.Int32", type.GenericTypes[0].Type); - } - - [Test] - public void CSharpSimpleLocalVariableDeclarationTest() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("MyVar var = new MyVar();"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("var", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("MyVar", type.Type); - // TODO: Check initializer - } - - [Test] - public void CSharpSimpleLocalVariableDeclarationTest1() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("yield yield = new yield();"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("yield", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("yield", type.Type); - // TODO: Check initializer - } - - [Test] - public void CSharpNullableLocalVariableDeclarationTest1() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("int? a;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("System.Nullable", type.Type); - Assert.AreEqual("System.Int32", type.GenericTypes[0].Type); - } - - [Test] - public void CSharpNullableLocalVariableDeclarationTest2() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("DateTime? a;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("System.Nullable", type.Type); - Assert.AreEqual("DateTime", type.GenericTypes[0].Type); - } - - [Test] - public void CSharpNullableLocalVariableDeclarationTest3() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("DateTime?[] a;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.IsTrue(type.IsArrayType); - Assert.AreEqual("System.Nullable", type.Type); - Assert.AreEqual("DateTime", type.GenericTypes[0].Type); - } - - [Test] - public void CSharpNullableLocalVariableDeclarationTest4() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("SomeStruct? a;"); - Assert.AreEqual(1, lvd.Variables.Count); - Assert.AreEqual("a", ((VariableDeclaration)lvd.Variables[0]).Name); - TypeReference type = lvd.GetTypeForVariable(0); - Assert.AreEqual("System.Nullable", type.Type); - Assert.AreEqual("SomeStruct", type.GenericTypes[0].Type); - Assert.AreEqual("System.Nullable", type.GenericTypes[0].GenericTypes[0].Type); - Assert.AreEqual("System.Int32", type.GenericTypes[0].GenericTypes[0].GenericTypes[0].Type); - } - - [Test] - public void PositionTestWithoutModifier() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("\ndouble w = 7;"); - Assert.AreEqual(2, lvd.StartLocation.Line); - Assert.AreEqual(1, lvd.StartLocation.Column); - Assert.AreEqual(2, lvd.EndLocation.Line); - Assert.AreEqual(14, lvd.EndLocation.Column); - } - - [Test] - public void PositionTestWithModifier() - { - LocalVariableDeclaration lvd = ParseUtilCSharp.ParseStatement("\nconst double w = 7;"); - Assert.AreEqual(Modifiers.Const, lvd.Modifier); - Assert.AreEqual(2, lvd.StartLocation.Line); - Assert.AreEqual(1, lvd.StartLocation.Column); - Assert.AreEqual(2, lvd.EndLocation.Line); - Assert.AreEqual(20, lvd.EndLocation.Column); - } - - #endregion - #region VB.NET [Test] public void VBNetLocalVariableDeclarationTest() diff --git a/VB/Test/Parser/Statements/LockStatementTests.cs b/VB/Test/Parser/Statements/LockStatementTests.cs index 6c58948a12..b954121b54 100644 --- a/VB/Test/Parser/Statements/LockStatementTests.cs +++ b/VB/Test/Parser/Statements/LockStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class LockStatementTests { - #region C# - [Test] - public void CSharpLockStatementTest() - { - LockStatement lockStmt = ParseUtilCSharp.ParseStatement("lock (myObj) {}"); - // TODO : Extend test. - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/OnErrorStatementTest.cs b/VB/Test/Parser/Statements/OnErrorStatementTest.cs index b4b561bbcb..69901f4a46 100644 --- a/VB/Test/Parser/Statements/OnErrorStatementTest.cs +++ b/VB/Test/Parser/Statements/OnErrorStatementTest.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class OnErrorStatementTest { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetOnErrorStatementTest() diff --git a/VB/Test/Parser/Statements/RaiseEventStatementTest.cs b/VB/Test/Parser/Statements/RaiseEventStatementTest.cs index 1916c6a8de..9cbb8d47e6 100644 --- a/VB/Test/Parser/Statements/RaiseEventStatementTest.cs +++ b/VB/Test/Parser/Statements/RaiseEventStatementTest.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class RaiseEventStatementTest { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetRaiseEventStatementTest() diff --git a/VB/Test/Parser/Statements/RemoveHandlerStatement.cs b/VB/Test/Parser/Statements/RemoveHandlerStatement.cs index e64ab8bc34..ba0e9792fb 100644 --- a/VB/Test/Parser/Statements/RemoveHandlerStatement.cs +++ b/VB/Test/Parser/Statements/RemoveHandlerStatement.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class RemoveHandlerStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetRemoveHandlerTest() diff --git a/VB/Test/Parser/Statements/ResumeStatement.cs b/VB/Test/Parser/Statements/ResumeStatement.cs index ffcaac39d2..bc24ae6fbd 100644 --- a/VB/Test/Parser/Statements/ResumeStatement.cs +++ b/VB/Test/Parser/Statements/ResumeStatement.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ResumeStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetResumeStatementTest() diff --git a/VB/Test/Parser/Statements/ReturnStatementTests.cs b/VB/Test/Parser/Statements/ReturnStatementTests.cs index cdd28f6629..f3dc2161d6 100644 --- a/VB/Test/Parser/Statements/ReturnStatementTests.cs +++ b/VB/Test/Parser/Statements/ReturnStatementTests.cs @@ -12,30 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ReturnStatementTests { - #region C# - [Test] - public void CSharpEmptyReturnStatementTest() - { - ReturnStatement returnStatement = ParseUtilCSharp.ParseStatement("return;"); - Assert.IsTrue(returnStatement.Expression.IsNull); - } - - [Test] - public void CSharpReturnStatementTest() - { - ReturnStatement returnStatement = ParseUtilCSharp.ParseStatement("return 5;"); - Assert.IsFalse(returnStatement.Expression.IsNull); - Assert.IsTrue(returnStatement.Expression is PrimitiveExpression); - } - [Test] - public void CSharpReturnStatementTest1() - { - ReturnStatement returnStatement = ParseUtilCSharp.ParseStatement("return yield;"); - Assert.IsFalse(returnStatement.Expression.IsNull); - Assert.IsTrue(returnStatement.Expression is IdentifierExpression); - } - #endregion - #region VB.NET [Test] public void VBNetEmptyReturnStatementTest() diff --git a/VB/Test/Parser/Statements/StopStatementTests.cs b/VB/Test/Parser/Statements/StopStatementTests.cs index 79b09272a3..c8210c27c5 100644 --- a/VB/Test/Parser/Statements/StopStatementTests.cs +++ b/VB/Test/Parser/Statements/StopStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class StopStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetStopStatementTest() diff --git a/VB/Test/Parser/Statements/SwitchStatementTests.cs b/VB/Test/Parser/Statements/SwitchStatementTests.cs index 820e8b47fc..3908213d9c 100644 --- a/VB/Test/Parser/Statements/SwitchStatementTests.cs +++ b/VB/Test/Parser/Statements/SwitchStatementTests.cs @@ -12,16 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class SwitchStatementTests { - #region C# - [Test] - public void CSharpSwitchStatementTest() - { - SwitchStatement switchStmt = ParseUtilCSharp.ParseStatement("switch (a) { case 4: case 5: break; case 6: break; default: break; }"); - Assert.AreEqual("a", ((IdentifierExpression)switchStmt.SwitchExpression).Identifier); - // TODO: Extend test - } - #endregion - #region VB.NET [Test] public void VBSwitchStatementTest() diff --git a/VB/Test/Parser/Statements/ThrowStatementTests.cs b/VB/Test/Parser/Statements/ThrowStatementTests.cs index 98144fb731..76c7492fa0 100644 --- a/VB/Test/Parser/Statements/ThrowStatementTests.cs +++ b/VB/Test/Parser/Statements/ThrowStatementTests.cs @@ -12,22 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ThrowStatementTests { - #region C# - [Test] - public void CSharpEmptyThrowStatementTest() - { - ThrowStatement throwStmt = ParseUtilCSharp.ParseStatement("throw;"); - Assert.IsTrue(throwStmt.Expression.IsNull); - } - - [Test] - public void CSharpThrowStatementTest() - { - ThrowStatement throwStmt = ParseUtilCSharp.ParseStatement("throw new Exception();"); - Assert.IsTrue(throwStmt.Expression is ObjectCreateExpression); - } - #endregion - #region VB.NET // TODO #endregion diff --git a/VB/Test/Parser/Statements/TryCatchStatementTests.cs b/VB/Test/Parser/Statements/TryCatchStatementTests.cs index ccef00c176..824d415475 100644 --- a/VB/Test/Parser/Statements/TryCatchStatementTests.cs +++ b/VB/Test/Parser/Statements/TryCatchStatementTests.cs @@ -12,40 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class TryCatchStatementTests { - #region C# - [Test] - public void CSharpSimpleTryCatchStatementTest() - { - TryCatchStatement tryCatchStatement = ParseUtilCSharp.ParseStatement("try { } catch { } "); - Assert.IsTrue(tryCatchStatement.FinallyBlock.IsNull); - Assert.AreEqual(1, tryCatchStatement.CatchClauses.Count); - Assert.IsTrue(tryCatchStatement.CatchClauses[0].TypeReference.IsNull); - Assert.IsEmpty(tryCatchStatement.CatchClauses[0].VariableName); - } - - [Test] - public void CSharpSimpleTryCatchStatementTest2() - { - TryCatchStatement tryCatchStatement = ParseUtilCSharp.ParseStatement("try { } catch (Exception e) { } "); - Assert.IsTrue(tryCatchStatement.FinallyBlock.IsNull); - Assert.AreEqual(1, tryCatchStatement.CatchClauses.Count); - Assert.AreEqual("Exception", tryCatchStatement.CatchClauses[0].TypeReference.Type); - Assert.AreEqual("e", tryCatchStatement.CatchClauses[0].VariableName); - } - - [Test] - public void CSharpSimpleTryCatchFinallyStatementTest() - { - TryCatchStatement tryCatchStatement = ParseUtilCSharp.ParseStatement("try { } catch (Exception) { } catch { } finally { } "); - Assert.IsFalse(tryCatchStatement.FinallyBlock.IsNull); - Assert.AreEqual(2, tryCatchStatement.CatchClauses.Count); - Assert.AreEqual("Exception", tryCatchStatement.CatchClauses[0].TypeReference.Type); - Assert.IsEmpty(tryCatchStatement.CatchClauses[0].VariableName); - Assert.IsTrue(tryCatchStatement.CatchClauses[1].TypeReference.IsNull); - Assert.IsEmpty(tryCatchStatement.CatchClauses[1].VariableName); - } - #endregion - #region VB.NET // TODO #endregion diff --git a/VB/Test/Parser/Statements/UncheckedStatementTests.cs b/VB/Test/Parser/Statements/UncheckedStatementTests.cs index 5bf445f76a..bfff608bc9 100644 --- a/VB/Test/Parser/Statements/UncheckedStatementTests.cs +++ b/VB/Test/Parser/Statements/UncheckedStatementTests.cs @@ -12,26 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class UncheckedStatementTests { - #region C# - [Test] - public void CSharpUncheckedStatementTest() - { - UncheckedStatement uncheckedStatement = ParseUtilCSharp.ParseStatement("unchecked { }"); - Assert.IsFalse(uncheckedStatement.Block.IsNull); - } - - - [Test] - public void CSharpUncheckedStatementAndExpressionTest() - { - UncheckedStatement uncheckedStatement = ParseUtilCSharp.ParseStatement("unchecked { unchecked(++i); }"); - Assert.IsFalse(uncheckedStatement.Block.IsNull); - ExpressionStatement es = (ExpressionStatement)uncheckedStatement.Block.Children[0]; - UncheckedExpression ce = (UncheckedExpression)es.Expression; - Assert.IsInstanceOf(ce.Expression); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/UnsafeStatementTests.cs b/VB/Test/Parser/Statements/UnsafeStatementTests.cs index 5905815d7e..2267a49f8c 100644 --- a/VB/Test/Parser/Statements/UnsafeStatementTests.cs +++ b/VB/Test/Parser/Statements/UnsafeStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class UnsafeStatementTests { - #region C# - [Test] - public void CSharpUnsafeStatementTest() - { - UnsafeStatement unsafeStatement = ParseUtilCSharp.ParseStatement("unsafe { }"); - Assert.IsFalse(unsafeStatement.Block.IsNull); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/Statements/UsingStatementTests.cs b/VB/Test/Parser/Statements/UsingStatementTests.cs index 60f9048489..870d6b5bde 100644 --- a/VB/Test/Parser/Statements/UsingStatementTests.cs +++ b/VB/Test/Parser/Statements/UsingStatementTests.cs @@ -12,15 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class UsingStatementTests { - #region C# - [Test] - public void CSharpUsingStatementTest() - { - UsingStatement usingStmt = ParseUtilCSharp.ParseStatement("using (MyVar var = new MyVar()) { } "); - // TODO : Extend test. - } - #endregion - #region VB.NET [Test] public void VBNetUsingStatementTest() diff --git a/VB/Test/Parser/Statements/WithStatementTests.cs b/VB/Test/Parser/Statements/WithStatementTests.cs index db92ce6330..bd38f25c36 100644 --- a/VB/Test/Parser/Statements/WithStatementTests.cs +++ b/VB/Test/Parser/Statements/WithStatementTests.cs @@ -12,10 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class WithStatementTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetWithStatementTest() diff --git a/VB/Test/Parser/Statements/YieldStatementTests.cs b/VB/Test/Parser/Statements/YieldStatementTests.cs deleted file mode 100644 index 58b47c30aa..0000000000 --- a/VB/Test/Parser/Statements/YieldStatementTests.cs +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class YieldStatementTests - { - [Test] - public void YieldReturnStatementTest() - { - YieldStatement yieldStmt = ParseUtilCSharp.ParseStatement("yield return \"Foo\";"); - Assert.IsTrue(yieldStmt.IsYieldReturn); - ReturnStatement retStmt = (ReturnStatement)yieldStmt.Statement; - PrimitiveExpression expr = (PrimitiveExpression)retStmt.Expression; - Assert.AreEqual("Foo", expr.Value); - } - - [Test] - public void YieldBreakStatementTest() - { - YieldStatement yieldStmt = ParseUtilCSharp.ParseStatement("yield break;"); - Assert.IsTrue(yieldStmt.IsYieldBreak); - } - - [Test] - public void YieldAsVariableTest() - { - ExpressionStatement se = ParseUtilCSharp.ParseStatement("yield = 3;"); - AssignmentExpression ae = se.Expression as AssignmentExpression; - - Assert.AreEqual(AssignmentOperatorType.Assign, ae.Op); - - Assert.IsTrue(ae.Left is IdentifierExpression); - Assert.AreEqual("yield", ((IdentifierExpression)ae.Left).Identifier); - Assert.IsTrue(ae.Right is PrimitiveExpression); - } - } -} diff --git a/VB/Test/Parser/TypeLevel/ConstructorDeclarationTests.cs b/VB/Test/Parser/TypeLevel/ConstructorDeclarationTests.cs index 66e2165c55..1754b07a2c 100644 --- a/VB/Test/Parser/TypeLevel/ConstructorDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/ConstructorDeclarationTests.cs @@ -10,47 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ConstructorDeclarationTests { - #region C# - [Test] - public void CSharpConstructorDeclarationTest1() - { - ConstructorDeclaration cd = ParseUtilCSharp.ParseTypeMember("MyClass() {}"); - Assert.IsTrue(cd.ConstructorInitializer.IsNull); - } - - [Test] - public void CSharpConstructorDeclarationTest2() - { - ConstructorDeclaration cd = ParseUtilCSharp.ParseTypeMember("MyClass() : this(5) {}"); - Assert.AreEqual(ConstructorInitializerType.This, cd.ConstructorInitializer.ConstructorInitializerType); - Assert.AreEqual(1, cd.ConstructorInitializer.Arguments.Count); - } - - [Test] - public void CSharpConstructorDeclarationTest3() - { - ConstructorDeclaration cd = ParseUtilCSharp.ParseTypeMember("MyClass() : base(1, 2, 3) {}"); - Assert.AreEqual(ConstructorInitializerType.Base, cd.ConstructorInitializer.ConstructorInitializerType); - Assert.AreEqual(3, cd.ConstructorInitializer.Arguments.Count); - } - - [Test] - public void CSharpStaticConstructorDeclarationTest1() - { - ConstructorDeclaration cd = ParseUtilCSharp.ParseTypeMember("static MyClass() {}"); - Assert.IsTrue(cd.ConstructorInitializer.IsNull); - Assert.AreEqual(Modifiers.Static, cd.Modifier); - } - - [Test] - public void CSharpExternStaticConstructorDeclarationTest() - { - ConstructorDeclaration cd = ParseUtilCSharp.ParseTypeMember("extern static MyClass();"); - Assert.IsTrue(cd.ConstructorInitializer.IsNull); - Assert.AreEqual(Modifiers.Static | Modifiers.Extern, cd.Modifier); - } - #endregion - #region VB.NET [Test] public void VBNetConstructorDeclarationTest1() diff --git a/VB/Test/Parser/TypeLevel/DeclareDeclarationTests.cs b/VB/Test/Parser/TypeLevel/DeclareDeclarationTests.cs index 485d7a831a..40f98b6df1 100644 --- a/VB/Test/Parser/TypeLevel/DeclareDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/DeclareDeclarationTests.cs @@ -10,10 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class DeclareDeclarationTests { - #region C# - // No C# representation - #endregion - #region VB.NET [Test] public void VBNetDeclareDeclarationTest() diff --git a/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs b/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs index a0fd1b91c4..dd9a38c807 100644 --- a/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs @@ -10,28 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class DestructorDeclarationTests { - #region C# - [Test] - public void CSharpDestructorDeclarationTest() - { - DestructorDeclaration dd = ParseUtilCSharp.ParseTypeMember("~MyClass() {}"); - } - - [Test] - public void CSharpExternDestructorDeclarationTest() - { - DestructorDeclaration dd = ParseUtilCSharp.ParseTypeMember("extern ~MyClass();"); - Assert.AreEqual(Modifiers.Extern, dd.Modifier); - } - - [Test] - public void CSharpUnsafeDestructorDeclarationTest() - { - DestructorDeclaration dd = ParseUtilCSharp.ParseTypeMember("unsafe ~MyClass() {}"); - Assert.AreEqual(Modifiers.Unsafe, dd.Modifier); - } - #endregion - #region VB.NET // No VB.NET representation #endregion diff --git a/VB/Test/Parser/TypeLevel/EventDeclarationTests.cs b/VB/Test/Parser/TypeLevel/EventDeclarationTests.cs index 824ae3a081..563046429c 100644 --- a/VB/Test/Parser/TypeLevel/EventDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/EventDeclarationTests.cs @@ -10,78 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class EventDeclarationTests { - #region C# - [Test] - public void CSharpSimpleEventDeclarationTest() - { - EventDeclaration ed = ParseUtilCSharp.ParseTypeMember("event System.EventHandler MyEvent;"); - Assert.AreEqual("MyEvent", ed.Name); - Assert.AreEqual("System.EventHandler", ed.TypeReference.Type); - - Assert.IsFalse(ed.HasAddRegion); - Assert.IsFalse(ed.HasRemoveRegion); - } - - [Test] - public void CSharpMultipleEventDeclarationTest() - { - TypeDeclaration t = ParseUtilCSharp.ParseGlobal("class C { public event EventHandler A, B; }"); - Assert.AreEqual(2, t.Children.Count); - - EventDeclaration ed = (EventDeclaration)t.Children[0]; - Assert.AreEqual(Modifiers.Public, ed.Modifier); - Assert.AreEqual("EventHandler", ed.TypeReference.Type); - Assert.AreEqual("A", ed.Name); - - ed = (EventDeclaration)t.Children[1]; - Assert.AreEqual(Modifiers.Public, ed.Modifier); - Assert.AreEqual("EventHandler", ed.TypeReference.Type); - Assert.AreEqual("B", ed.Name); - } - - [Test] - public void CSharpEventImplementingInterfaceDeclarationTest() - { - EventDeclaration ed = ParseUtilCSharp.ParseTypeMember("event EventHandler MyInterface.MyEvent;"); - - Assert.AreEqual("MyEvent", ed.Name); - Assert.AreEqual("EventHandler", ed.TypeReference.Type); - - Assert.IsFalse(ed.HasAddRegion); - Assert.IsFalse(ed.HasRemoveRegion); - - Assert.AreEqual("MyInterface", ed.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("MyEvent", ed.InterfaceImplementations[0].MemberName); - } - - [Test] - public void CSharpEventImplementingGenericInterfaceDeclarationTest() - { - EventDeclaration ed = ParseUtilCSharp.ParseTypeMember("event EventHandler MyInterface.MyEvent;"); - - Assert.AreEqual("MyEvent", ed.Name); - Assert.AreEqual("EventHandler", ed.TypeReference.Type); - - Assert.IsFalse(ed.HasAddRegion); - Assert.IsFalse(ed.HasRemoveRegion); - - Assert.AreEqual("MyInterface", ed.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("System.String", ed.InterfaceImplementations[0].InterfaceType.GenericTypes[0].Type); - Assert.AreEqual("MyEvent", ed.InterfaceImplementations[0].MemberName); - } - - [Test] - public void CSharpAddRemoveEventDeclarationTest() - { - EventDeclaration ed = ParseUtilCSharp.ParseTypeMember("event System.EventHandler MyEvent { add { } remove { } }"); - Assert.AreEqual("MyEvent", ed.Name); - Assert.AreEqual("System.EventHandler", ed.TypeReference.Type); - - Assert.IsTrue(ed.HasAddRegion); - Assert.IsTrue(ed.HasRemoveRegion); - } - #endregion - #region VB.NET [Test] public void VBNetSimpleEventDeclarationTest() diff --git a/VB/Test/Parser/TypeLevel/FieldDeclarationTests.cs b/VB/Test/Parser/TypeLevel/FieldDeclarationTests.cs index 6ba2fc82ad..b388e96165 100644 --- a/VB/Test/Parser/TypeLevel/FieldDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/FieldDeclarationTests.cs @@ -10,19 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class FieldDeclarationTests { - #region C# - [Test] - public void CSharpSimpleFieldDeclarationTest() - { - FieldDeclaration fd = ParseUtilCSharp.ParseTypeMember("int[,,,] myField;"); - Assert.AreEqual("System.Int32", fd.TypeReference.Type); - Assert.AreEqual(new int[] { 3 } , fd.TypeReference.RankSpecifier); - Assert.AreEqual(1, fd.Fields.Count); - - Assert.AreEqual("myField", ((VariableDeclaration)fd.Fields[0]).Name); - } - #endregion - #region VB.NET [Test] public void VBNetSimpleFieldDeclarationTest() diff --git a/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs b/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs index 0900350d3c..0b5e8840eb 100644 --- a/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs @@ -10,43 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class IndexerDeclarationTests { - #region C# - [Test] - public void CSharpIndexerDeclarationTest() - { - PropertyDeclaration id = ParseUtilCSharp.ParseTypeMember("int this[int a, string b] { get { } set { } }"); - Assert.AreEqual(2, id.Parameters.Count); - Assert.IsTrue(id.HasGetRegion, "No get region found!"); - Assert.IsTrue(id.HasSetRegion, "No set region found!"); - Assert.IsTrue(id.IsIndexer, "No Default modifier set!"); - } - - [Test] - public void CSharpIndexerImplementingInterfaceTest() - { - PropertyDeclaration id = ParseUtilCSharp.ParseTypeMember("int MyInterface.this[int a, string b] { get { } set { } }"); - Assert.AreEqual(2, id.Parameters.Count); - Assert.IsTrue(id.HasGetRegion, "No get region found!"); - Assert.IsTrue(id.HasSetRegion, "No set region found!"); - Assert.IsTrue(id.IsIndexer, "No Default modifier set!"); - - Assert.AreEqual("MyInterface", id.InterfaceImplementations[0].InterfaceType.Type); - } - - [Test] - public void CSharpIndexerImplementingGenericInterfaceTest() - { - PropertyDeclaration id = ParseUtilCSharp.ParseTypeMember("int MyInterface.this[int a, string b] { get { } set { } }"); - Assert.AreEqual(2, id.Parameters.Count); - Assert.IsTrue(id.HasGetRegion, "No get region found!"); - Assert.IsTrue(id.HasSetRegion, "No set region found!"); - Assert.IsTrue(id.IsIndexer, "No Default modifier set!"); - - Assert.AreEqual("MyInterface", id.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("System.String", id.InterfaceImplementations[0].InterfaceType.GenericTypes[0].Type); - } - #endregion - #region VB.NET // no vb.net representation (indexers are properties named "item" in vb.net) #endregion diff --git a/VB/Test/Parser/TypeLevel/MethodDeclarationTests.cs b/VB/Test/Parser/TypeLevel/MethodDeclarationTests.cs index 9d0b6506bd..ae00d18851 100644 --- a/VB/Test/Parser/TypeLevel/MethodDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/MethodDeclarationTests.cs @@ -10,295 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class MethodDeclarationTests { - #region C# - [Test] - public void CSharpSimpleMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("void MyMethod() {} "); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(0, md.Parameters.Count); - Assert.IsFalse(md.IsExtensionMethod); - } - - [Test] - public void CSharpAbstractMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("abstract void MyMethod();"); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(0, md.Parameters.Count); - Assert.IsFalse(md.IsExtensionMethod); - Assert.IsTrue(md.Body.IsNull); - Assert.AreEqual(Modifiers.Abstract, md.Modifier); - } - - [Test] - public void CSharpDefiningPartialMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("partial void MyMethod();"); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(0, md.Parameters.Count); - Assert.IsFalse(md.IsExtensionMethod); - Assert.IsTrue(md.Body.IsNull); - Assert.AreEqual(Modifiers.Partial, md.Modifier); - } - - [Test] - public void CSharpImplementingPartialMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("partial void MyMethod() { }"); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(0, md.Parameters.Count); - Assert.IsFalse(md.IsExtensionMethod); - Assert.IsFalse(md.Body.IsNull); - Assert.AreEqual(Modifiers.Partial, md.Modifier); - } - - [Test] - public void CSharpSimpleMethodRegionTest() - { - const string program = @" - void MyMethod() - { - OtherMethod(); - } -"; - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember(program); - Assert.AreEqual(2, md.StartLocation.Line, "StartLocation.Y"); - Assert.AreEqual(2, md.EndLocation.Line, "EndLocation.Y"); - Assert.AreEqual(3, md.StartLocation.Column, "StartLocation.X"); - // endLocation.X is currently 20. It should be 18, but that error is not critical - //Assert.AreEqual(18, md.EndLocation.X, "EndLocation.X"); - } - - [Test] - public void CSharpMethodWithModifiersRegionTest() - { - const string program = @" - public static void MyMethod() - { - OtherMethod(); - } -"; - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember(program); - Assert.AreEqual(2, md.StartLocation.Line, "StartLocation.Y"); - Assert.AreEqual(2, md.EndLocation.Line, "EndLocation.Y"); - Assert.AreEqual(3, md.StartLocation.Column, "StartLocation.X"); - } - - [Test] - public void CSharpMethodWithUnnamedParameterDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("void MyMethod(int) {} ", true); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - //Assert.AreEqual("?", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - } - - [Test] - public void CSharpGenericVoidMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("void MyMethod(T a) {} "); - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type); - Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - } - - [Test] - public void CSharpGenericMethodDeclarationTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("T MyMethod(T a) {} "); - Assert.AreEqual("T", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type); - Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - } - - [Test] - public void CSharpGenericMethodDeclarationWithConstraintTest() - { - string program = "T MyMethod(T a) where T : ISomeInterface {} "; - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember(program); - Assert.AreEqual("T", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type); - Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - Assert.AreEqual(1, md.Templates[0].Bases.Count); - Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type); - } - - [Test] - public void CSharpGenericMethodInInterface() - { - const string program = @"interface MyInterface { - T MyMethod(T a) where T : ISomeInterface; -} -"; - TypeDeclaration td = ParseUtilCSharp.ParseGlobal(program); - MethodDeclaration md = (MethodDeclaration)td.Children[0]; - Assert.AreEqual("T", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type); - Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - Assert.AreEqual(1, md.Templates[0].Bases.Count); - Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type); - } - - [Test] - public void CSharpGenericVoidMethodInInterface() - { - const string program = @"interface MyInterface { - void MyMethod(T a) where T : ISomeInterface; -} -"; - TypeDeclaration td = ParseUtilCSharp.ParseGlobal(program); - MethodDeclaration md = (MethodDeclaration)td.Children[0]; - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(1, md.Parameters.Count); - Assert.AreEqual("T", ((ParameterDeclarationExpression)md.Parameters[0]).TypeReference.Type); - Assert.AreEqual("a", ((ParameterDeclarationExpression)md.Parameters[0]).ParameterName); - - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - Assert.AreEqual(1, md.Templates[0].Bases.Count); - Assert.AreEqual("ISomeInterface", md.Templates[0].Bases[0].Type); - } - - [Test] - public void CSharpShadowingMethodInInterface() - { - const string program = @"interface MyInterface : IDisposable { - new void Dispose(); -} -"; - TypeDeclaration td = ParseUtilCSharp.ParseGlobal(program); - MethodDeclaration md = (MethodDeclaration)td.Children[0]; - Assert.AreEqual("System.Void", md.TypeReference.Type); - Assert.AreEqual(0, md.Parameters.Count); - Assert.AreEqual(Modifiers.New, md.Modifier); - } - - [Test] - public void CSharpMethodImplementingInterfaceTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("int MyInterface.MyMethod() {} "); - Assert.AreEqual("System.Int32", md.TypeReference.Type); - - Assert.AreEqual("MyInterface", md.InterfaceImplementations[0].InterfaceType.Type); - } - - [Test] - public void CSharpMethodImplementingGenericInterfaceTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("int MyInterface.MyMethod() {} "); - Assert.AreEqual("System.Int32", md.TypeReference.Type); - - Assert.AreEqual("MyInterface", md.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("System.String", md.InterfaceImplementations[0].InterfaceType.GenericTypes[0].Type); - } - - [Test] - public void CSharpVoidMethodImplementingInterfaceTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("void MyInterface.MyMethod() {} "); - Assert.AreEqual("System.Void", md.TypeReference.Type); - - Assert.AreEqual("MyInterface", md.InterfaceImplementations[0].InterfaceType.Type); - } - - [Test] - public void CSharpVoidMethodImplementingGenericInterfaceTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember("void MyInterface.MyMethod() {} "); - Assert.AreEqual("System.Void", md.TypeReference.Type); - - Assert.AreEqual("MyInterface", md.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("System.String", md.InterfaceImplementations[0].InterfaceType.GenericTypes[0].Type); - } - - [Test] - public void CSharpIncompleteConstraintsTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( - "void a() where T { }", true /* expect errors */ - ); - Assert.AreEqual("a", md.Name); - Assert.AreEqual(1, md.Templates.Count); - Assert.AreEqual("T", md.Templates[0].Name); - Assert.AreEqual(0, md.Templates[0].Bases.Count); - } - - [Test] - public void CSharpExtensionMethodTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( - "public static int ToInt32(this string s) { return int.Parse(s); }" - ); - Assert.AreEqual("ToInt32", md.Name); - Assert.IsTrue(md.IsExtensionMethod); - Assert.AreEqual("s", md.Parameters[0].ParameterName); - Assert.AreEqual("System.String", md.Parameters[0].TypeReference.Type); - } - - [Test] - public void CSharpVoidExtensionMethodTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( - "public static void Print(this string s) { Console.WriteLine(s); }" - ); - Assert.AreEqual("Print", md.Name); - Assert.IsTrue(md.IsExtensionMethod); - Assert.AreEqual("s", md.Parameters[0].ParameterName); - Assert.AreEqual("System.String", md.Parameters[0].TypeReference.Type); - } - - [Test] - public void CSharpMethodWithEmptyAssignmentErrorInBody() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( - "void A\n" + - "{\n" + - "int a = 3;\n" + - " = 4;\n" + - "}", true /* expect errors */ - ); - Assert.AreEqual("A", md.Name); - Assert.AreEqual(new Location(1, 2), md.Body.StartLocation); - Assert.AreEqual(new Location(2, 5), md.Body.EndLocation); - } - - [Test] - public void CSharpOptionalParameterTest() - { - MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( - "public void Foo(string bar = null, int baz = 0) { }" - ); - Assert.AreEqual("Foo", md.Name); - - Assert.AreEqual("bar", md.Parameters[0].ParameterName); - Assert.AreEqual("System.String", md.Parameters[0].TypeReference.Type); - Assert.AreEqual(ParameterModifiers.In | ParameterModifiers.Optional, md.Parameters[0].ParamModifier); - Assert.IsNull(((PrimitiveExpression)md.Parameters[0].DefaultValue).Value); - - Assert.AreEqual("baz", md.Parameters[1].ParameterName); - Assert.AreEqual("System.Int32", md.Parameters[1].TypeReference.Type); - Assert.AreEqual(ParameterModifiers.In | ParameterModifiers.Optional, md.Parameters[1].ParamModifier); - Assert.AreEqual(0, ((PrimitiveExpression)md.Parameters[1].DefaultValue).Value); - } - #endregion - #region VB.NET [Test] diff --git a/VB/Test/Parser/TypeLevel/OperatorDeclarationTests.cs b/VB/Test/Parser/TypeLevel/OperatorDeclarationTests.cs index b22415c9ce..4699ef7a99 100644 --- a/VB/Test/Parser/TypeLevel/OperatorDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/OperatorDeclarationTests.cs @@ -10,50 +10,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class OperatorDeclarationTests { - #region C# - [Test] - public void CSharpImplictOperatorDeclarationTest() - { - OperatorDeclaration od = ParseUtilCSharp.ParseTypeMember("public static implicit operator double(MyObject f) { return 0.5d; }"); - Assert.IsTrue(od.IsConversionOperator); - Assert.AreEqual(1, od.Parameters.Count); - Assert.AreEqual(ConversionType.Implicit, od.ConversionType); - Assert.AreEqual("System.Double", od.TypeReference.Type); - } - - [Test] - public void CSharpExplicitOperatorDeclarationTest() - { - OperatorDeclaration od = ParseUtilCSharp.ParseTypeMember("public static explicit operator double(MyObject f) { return 0.5d; }"); - Assert.IsTrue(od.IsConversionOperator); - Assert.AreEqual(1, od.Parameters.Count); - Assert.AreEqual(ConversionType.Explicit, od.ConversionType); - Assert.AreEqual("System.Double", od.TypeReference.Type); - } - - [Test] - public void CSharpBinaryPlusOperatorDeclarationTest() - { - OperatorDeclaration od = ParseUtilCSharp.ParseTypeMember("public static MyObject operator +(MyObject a, MyObject b) {}"); - Assert.IsTrue(!od.IsConversionOperator); - Assert.AreEqual(OverloadableOperatorType.Add, od.OverloadableOperator); - Assert.AreEqual(2, od.Parameters.Count); - Assert.AreEqual("MyObject", od.TypeReference.Type); - Assert.AreEqual("op_Addition", od.Name); - } - - [Test] - public void CSharpUnaryPlusOperatorDeclarationTest() - { - OperatorDeclaration od = ParseUtilCSharp.ParseTypeMember("public static MyObject operator +(MyObject a) {}"); - Assert.IsTrue(!od.IsConversionOperator); - Assert.AreEqual(OverloadableOperatorType.UnaryPlus, od.OverloadableOperator); - Assert.AreEqual(1, od.Parameters.Count); - Assert.AreEqual("MyObject", od.TypeReference.Type); - Assert.AreEqual("op_UnaryPlus", od.Name); - } - #endregion - #region VB.NET [Test] diff --git a/VB/Test/Parser/TypeLevel/PropertyDeclarationTests.cs b/VB/Test/Parser/TypeLevel/PropertyDeclarationTests.cs index a990c83408..d3df1c7738 100644 --- a/VB/Test/Parser/TypeLevel/PropertyDeclarationTests.cs +++ b/VB/Test/Parser/TypeLevel/PropertyDeclarationTests.cs @@ -11,98 +11,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class PropertyDeclarationTests { - #region C# - [Test] - public void CSharpSimpleGetSetPropertyDeclarationTest() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyProperty { get {} set {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(pd.HasGetRegion); - Assert.IsTrue(pd.HasSetRegion); - } - - [Test] - public void CSharpGetSetPropertyDeclarationWithAccessorModifiers() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyProperty { private get {} protected internal set {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(pd.HasGetRegion); - Assert.IsTrue(pd.HasSetRegion); - } - - [Test] - public void CSharpSimpleGetPropertyDeclarationTest() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyProperty { get {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(pd.HasGetRegion); - Assert.IsTrue(!pd.HasSetRegion); - } - - [Test] - public void CSharpSimpleSetPropertyDeclarationTest() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyProperty { set {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(!pd.HasGetRegion); - Assert.IsTrue(pd.HasSetRegion); - } - - void CSharpPropertyRegionTest(bool parseMethodBodies) - { - const string code = "class T {\n\tint Prop {\n\t\tget { return f; }\n\t\tset { f = value; }\n\t}\n}\n"; - int line2Pos = code.IndexOf("\tint Prop"); - int line3Pos = code.IndexOf("\t\tget"); - int line4Pos = code.IndexOf("\t\tset"); - - IParser p = ParserFactory.CreateParser(new StringReader(code)); - p.ParseMethodBodies = parseMethodBodies; - p.Parse(); - PropertyDeclaration pd = (PropertyDeclaration)p.CompilationUnit.Children[0].Children[0]; - Assert.AreEqual(new Location(code.IndexOf("{\n\t\tget") - line2Pos + 1, 2), pd.BodyStart); - Assert.AreEqual(new Location(3, 5), pd.BodyEnd); - Assert.AreEqual(new Location(code.IndexOf("{ return") - line3Pos + 1, 3), pd.GetRegion.Block.StartLocation); - Assert.AreEqual(new Location(code.IndexOf("}\n\t\tset") + 1 - line3Pos + 1, 3), pd.GetRegion.Block.EndLocation); - Assert.AreEqual(new Location(code.IndexOf("{ f =") - line4Pos + 1, 4), pd.SetRegion.Block.StartLocation); - Assert.AreEqual(new Location(code.IndexOf("}\n\t}") + 1 - line4Pos + 1, 4), pd.SetRegion.Block.EndLocation); - } - - [Test] - public void CSharpPropertyRegionTest() - { - CSharpPropertyRegionTest(true); - } - - [Test] - public void CSharpPropertyRegionTestSkipParseMethodBodies() - { - CSharpPropertyRegionTest(false); - } - - [Test] - public void CSharpPropertyImplementingInterfaceTest() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyInterface.MyProperty { get {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(pd.HasGetRegion); - Assert.IsTrue(!pd.HasSetRegion); - - Assert.AreEqual("MyInterface", pd.InterfaceImplementations[0].InterfaceType.Type); - } - - [Test] - public void CSharpPropertyImplementingGenericInterfaceTest() - { - PropertyDeclaration pd = ParseUtilCSharp.ParseTypeMember("int MyInterface.MyProperty { get {} } "); - Assert.AreEqual("MyProperty", pd.Name); - Assert.IsTrue(pd.HasGetRegion); - Assert.IsTrue(!pd.HasSetRegion); - - Assert.AreEqual("MyInterface", pd.InterfaceImplementations[0].InterfaceType.Type); - Assert.AreEqual("System.String", pd.InterfaceImplementations[0].InterfaceType.GenericTypes[0].Type); - } - #endregion - #region VB.NET [Test] public void VBNetSimpleGetSetPropertyDeclarationTest()