diff options
author | Daniel Grunwald <daniel@danielgrunwald.de> | 2013-01-05 05:59:59 +0400 |
---|---|---|
committer | Daniel Grunwald <daniel@danielgrunwald.de> | 2013-01-05 05:59:59 +0400 |
commit | 46881e6ea2cd82c6ff922b597ee90eb0b3192136 (patch) | |
tree | 403d9e1a820bfade65bbae9e61b9a37eab8a9311 | |
parent | 964c2afbfe0ff2a00849a9b704194bc14b5b6095 (diff) |
Un-ignore some tests that were fixed
6 files changed, 29 insertions, 33 deletions
diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs index 17cbec07..79339bf4 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs @@ -1,4 +1,4 @@ -// +// // AddAnotherAccessorTests.cs // // Author: @@ -33,7 +33,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions [TestFixture] public class AddAnotherAccessorTests : ContextActionTestBase { - [Ignore("Broken")] [Test()] public void TestAddSet () { diff --git a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs index 81f39c5b..37a233a5 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs @@ -33,7 +33,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions [TestFixture] public class ConvertToInitializerTests : ContextActionTestBase { - // TODO: Remove this when the formatter handles object and collection initializers // This tests the expected code vs the actual code based on their ASTs instead of the text they produce. public new void Test<T>(string input, string output, int action = 0, bool expectErrors = false) @@ -113,7 +112,7 @@ class TestClass } }", baseText + @" var tc0 = new TestClass(); - var collection = new System.Collections.Generic.Dictionary<string> () { + var collection = new System.Collections.Generic.Dictionary<string, TestClass> () { {""string1"", new TestClass() { Property = ""tc1"" }}, {""string2"", new TestClass() { Property = ""tc2"" }} }; @@ -138,12 +137,12 @@ class TestClass } }", baseText + @" var collection = new System.Collections.Generic.List<string> () { - new TestClass() { + new TestClass () { Property = ""Value1"" }, - new TestClass() { + new TestClass () { Property = ""Value2"", - Nested = new TestClass() { + Nested = new TestClass () { Property = ""Value3"" } } @@ -163,7 +162,7 @@ class TestClass } }", baseText + @" var collection = new System.Collections.Generic.List<string> (); - var item = new TestClass() { + var item = new TestClass () { Property = ""Value1"" }; collection.Add(item); @@ -186,12 +185,12 @@ class TestClass public System.Collections.Generic.IList<TestClass> Children; }", baseText + @" - var variable = new TestClass() { + var variable = new TestClass () { Property = ""Value1"", - Children = new System.Collections.Generic.List<TestClass>() { - new TestClass(), - new TestClass(), - new TestClass() + Children = new System.Collections.Generic.List<TestClass> () { + new TestClass (), + new TestClass (), + new TestClass () } }; } @@ -306,9 +305,9 @@ class TestClass }", baseText + @" var variable = new TestClass () { Property = ""Value"", - Nested = new TestClass() { + Nested = new TestClass () { Property = ""NestedValue"", - Nested = new TestClass() { + Nested = new TestClass () { Property = ""NestedNestedValue"" } } @@ -330,7 +329,7 @@ class TestClass var variable = new TestClass () { Property = ""Value"", Nested = { - Nested = new TestClass() { + Nested = new TestClass () { Property = ""NestedNestedValue"" } } @@ -393,7 +392,7 @@ class TestClass }", baseText + @" var variable = new TestClass () { Property = ""Value"", - Nested = new TestClass() + Nested = new TestClass () }; System.Console.WriteLine(""""); variable.Nested.Property = ""NestedValue""; @@ -413,7 +412,7 @@ class TestClass }", baseText + @" var variable = new TestClass () { Property = ""Value"", - Nested = new TestClass() + Nested = new TestClass () }; variable.Nested.Property = variable.ToString(); } @@ -454,9 +453,9 @@ class TestClass }", baseText + @" var tc = new TestClass(); tc.Property = ""1""; - var tc2 = new TestClass() { + var tc2 = new TestClass () { Property = ""2"", - Nested = new TestClass() { + Nested = new TestClass () { Property = ""3"" } }; @@ -479,7 +478,7 @@ class TestClass }", baseText + @" var tc = new TestClass(); tc.Property = ""1""; - var tc2 = new TestClass() { + var tc2 = new TestClass () { Property = ""2"", Nested = tc }; @@ -499,7 +498,7 @@ class TestClass } }", baseText + @" var variable = new TestClass () { - Nested = new TestClass() + Nested = new TestClass () }; } }"); @@ -534,7 +533,7 @@ class TestClass var tc = new TestClass () { Property = ""Value"" }; - var _variable = new Test$Class (); + var _variable = new TestClass (); var variable = _variable; } }"); @@ -552,7 +551,7 @@ class TestClass } }", baseText + @" Nested = new TestClass () { - Nested = new TestClass(), + Nested = new TestClass (), Property = ""Value"" }; Nested.Nested.Property = Nested.Property; @@ -579,12 +578,12 @@ class TestClass } }", baseText + @" var collection = new System.Collections.Generic.List<string> () { - new TestClass() { + new TestClass () { Property = ""Value1"" }, - new TestClass() { + new TestClass () { Property = ""Value2"", - Nested = new TestClass() { + Nested = new TestClass () { Property = ""Value3"" } } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs index 5c4e9721..96a1ce4d 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression CheckIdentifier(@"l\U00000065xer", "lexer"); } - [Test, Ignore("The @ should not be part of IdentifierExpression.Identifier")] + [Test] public void TestKeyWordAsIdentifier() { CheckIdentifier("@int", "int"); @@ -67,7 +67,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression CheckIdentifier(@"i\u006et", "int"); } - [Test, Ignore("The @ should not be part of IdentifierExpression.Identifier")] + [Test] public void TestKeyWordAsIdentifierStartingWithUnderscore() { CheckIdentifier("@_int", "_int"); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs index 6aca231c..c6d830a5 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs @@ -82,7 +82,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression TestUnaryOperatorExpressionTest("a--", UnaryOperatorType.PostDecrement); } - [Test, Ignore("Incorrect start position")] + [Test] public void Dereference() { TestUnaryOperatorExpressionTest("*a", UnaryOperatorType.Dereference); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs index cf8afda5..101f7721 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs @@ -65,7 +65,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers Assert.AreEqual("op_UnaryPlus", od.Name); } - [Test, Ignore("Parser crash")] + [Test] public void InvalidOperatorTrueDeclaration() { ParseUtilCSharp.ParseTypeMember<OperatorDeclaration>("public static implicit operator true(MyBool b) {}", expectErrors: true); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs index 609c66ec..980a0ab4 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs @@ -174,7 +174,6 @@ class B { Assert.AreEqual("Point.X", result.Member.FullName); } - [Ignore("Broken")] [Test] public void CollectionInitializerTest() { @@ -188,7 +187,6 @@ class B { Assert.AreEqual("System.Collections.Generic.List.Add", result.Member.FullName); } - [Ignore("Broken on mcs/mac os x")] [Test] public void DictionaryInitializerTest() { |