Browse Source

Un-ignore some tests that were fixed

newNRvisualizers
Daniel Grunwald 14 years ago
parent
commit
46881e6ea2
  1. 3
      ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs
  2. 49
      ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs
  3. 4
      ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs
  4. 2
      ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs
  5. 2
      ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs
  6. 2
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs

3
ICSharpCode.NRefactory.Tests/CSharp/CodeActions/AddAnotherAccessorTests.cs

@ -1,4 +1,4 @@
// //
// AddAnotherAccessorTests.cs // AddAnotherAccessorTests.cs
// //
// Author: // Author:
@ -33,7 +33,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
[TestFixture] [TestFixture]
public class AddAnotherAccessorTests : ContextActionTestBase public class AddAnotherAccessorTests : ContextActionTestBase
{ {
[Ignore("Broken")]
[Test()] [Test()]
public void TestAddSet () public void TestAddSet ()
{ {

49
ICSharpCode.NRefactory.Tests/CSharp/CodeActions/ConvertToInitializer/ConvertToInitializerTests.cs

@ -33,7 +33,6 @@ namespace ICSharpCode.NRefactory.CSharp.CodeActions
[TestFixture] [TestFixture]
public class ConvertToInitializerTests : ContextActionTestBase public class ConvertToInitializerTests : ContextActionTestBase
{ {
// TODO: Remove this when the formatter handles object and collection initializers // 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. // 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) public new void Test<T>(string input, string output, int action = 0, bool expectErrors = false)
@ -113,7 +112,7 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
var tc0 = new TestClass(); 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"" }}, {""string1"", new TestClass() { Property = ""tc1"" }},
{""string2"", new TestClass() { Property = ""tc2"" }} {""string2"", new TestClass() { Property = ""tc2"" }}
}; };
@ -138,12 +137,12 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
var collection = new System.Collections.Generic.List<string> () { var collection = new System.Collections.Generic.List<string> () {
new TestClass() { new TestClass () {
Property = ""Value1"" Property = ""Value1""
}, },
new TestClass() { new TestClass () {
Property = ""Value2"", Property = ""Value2"",
Nested = new TestClass() { Nested = new TestClass () {
Property = ""Value3"" Property = ""Value3""
} }
} }
@ -163,7 +162,7 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
var collection = new System.Collections.Generic.List<string> (); var collection = new System.Collections.Generic.List<string> ();
var item = new TestClass() { var item = new TestClass () {
Property = ""Value1"" Property = ""Value1""
}; };
collection.Add(item); collection.Add(item);
@ -186,12 +185,12 @@ class TestClass
public System.Collections.Generic.IList<TestClass> Children; public System.Collections.Generic.IList<TestClass> Children;
}", baseText + @" }", baseText + @"
var variable = new TestClass() { var variable = new TestClass () {
Property = ""Value1"", Property = ""Value1"",
Children = new System.Collections.Generic.List<TestClass>() { Children = new System.Collections.Generic.List<TestClass> () {
new TestClass(), new TestClass (),
new TestClass(), new TestClass (),
new TestClass() new TestClass ()
} }
}; };
} }
@ -306,9 +305,9 @@ class TestClass
}", baseText + @" }", baseText + @"
var variable = new TestClass () { var variable = new TestClass () {
Property = ""Value"", Property = ""Value"",
Nested = new TestClass() { Nested = new TestClass () {
Property = ""NestedValue"", Property = ""NestedValue"",
Nested = new TestClass() { Nested = new TestClass () {
Property = ""NestedNestedValue"" Property = ""NestedNestedValue""
} }
} }
@ -330,7 +329,7 @@ class TestClass
var variable = new TestClass () { var variable = new TestClass () {
Property = ""Value"", Property = ""Value"",
Nested = { Nested = {
Nested = new TestClass() { Nested = new TestClass () {
Property = ""NestedNestedValue"" Property = ""NestedNestedValue""
} }
} }
@ -393,7 +392,7 @@ class TestClass
}", baseText + @" }", baseText + @"
var variable = new TestClass () { var variable = new TestClass () {
Property = ""Value"", Property = ""Value"",
Nested = new TestClass() Nested = new TestClass ()
}; };
System.Console.WriteLine(""""); System.Console.WriteLine("""");
variable.Nested.Property = ""NestedValue""; variable.Nested.Property = ""NestedValue"";
@ -413,7 +412,7 @@ class TestClass
}", baseText + @" }", baseText + @"
var variable = new TestClass () { var variable = new TestClass () {
Property = ""Value"", Property = ""Value"",
Nested = new TestClass() Nested = new TestClass ()
}; };
variable.Nested.Property = variable.ToString(); variable.Nested.Property = variable.ToString();
} }
@ -454,9 +453,9 @@ class TestClass
}", baseText + @" }", baseText + @"
var tc = new TestClass(); var tc = new TestClass();
tc.Property = ""1""; tc.Property = ""1"";
var tc2 = new TestClass() { var tc2 = new TestClass () {
Property = ""2"", Property = ""2"",
Nested = new TestClass() { Nested = new TestClass () {
Property = ""3"" Property = ""3""
} }
}; };
@ -479,7 +478,7 @@ class TestClass
}", baseText + @" }", baseText + @"
var tc = new TestClass(); var tc = new TestClass();
tc.Property = ""1""; tc.Property = ""1"";
var tc2 = new TestClass() { var tc2 = new TestClass () {
Property = ""2"", Property = ""2"",
Nested = tc Nested = tc
}; };
@ -499,7 +498,7 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
var variable = new TestClass () { var variable = new TestClass () {
Nested = new TestClass() Nested = new TestClass ()
}; };
} }
}"); }");
@ -534,7 +533,7 @@ class TestClass
var tc = new TestClass () { var tc = new TestClass () {
Property = ""Value"" Property = ""Value""
}; };
var _variable = new Test$Class (); var _variable = new TestClass ();
var variable = _variable; var variable = _variable;
} }
}"); }");
@ -552,7 +551,7 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
Nested = new TestClass () { Nested = new TestClass () {
Nested = new TestClass(), Nested = new TestClass (),
Property = ""Value"" Property = ""Value""
}; };
Nested.Nested.Property = Nested.Property; Nested.Nested.Property = Nested.Property;
@ -579,12 +578,12 @@ class TestClass
} }
}", baseText + @" }", baseText + @"
var collection = new System.Collections.Generic.List<string> () { var collection = new System.Collections.Generic.List<string> () {
new TestClass() { new TestClass () {
Property = ""Value1"" Property = ""Value1""
}, },
new TestClass() { new TestClass () {
Property = ""Value2"", Property = ""Value2"",
Nested = new TestClass() { Nested = new TestClass () {
Property = ""Value3"" Property = ""Value3""
} }
} }

4
ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/IdentifierExpressionTests.cs

@ -55,7 +55,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
CheckIdentifier(@"l\U00000065xer", "lexer"); CheckIdentifier(@"l\U00000065xer", "lexer");
} }
[Test, Ignore("The @ should not be part of IdentifierExpression.Identifier")] [Test]
public void TestKeyWordAsIdentifier() public void TestKeyWordAsIdentifier()
{ {
CheckIdentifier("@int", "int"); CheckIdentifier("@int", "int");
@ -67,7 +67,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
CheckIdentifier(@"i\u006et", "int"); CheckIdentifier(@"i\u006et", "int");
} }
[Test, Ignore("The @ should not be part of IdentifierExpression.Identifier")] [Test]
public void TestKeyWordAsIdentifierStartingWithUnderscore() public void TestKeyWordAsIdentifierStartingWithUnderscore()
{ {
CheckIdentifier("@_int", "_int"); CheckIdentifier("@_int", "_int");

2
ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs

@ -82,7 +82,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression
TestUnaryOperatorExpressionTest("a--", UnaryOperatorType.PostDecrement); TestUnaryOperatorExpressionTest("a--", UnaryOperatorType.PostDecrement);
} }
[Test, Ignore("Incorrect start position")] [Test]
public void Dereference() public void Dereference()
{ {
TestUnaryOperatorExpressionTest("*a", UnaryOperatorType.Dereference); TestUnaryOperatorExpressionTest("*a", UnaryOperatorType.Dereference);

2
ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/OperatorDeclarationTests.cs

@ -65,7 +65,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers
Assert.AreEqual("op_UnaryPlus", od.Name); Assert.AreEqual("op_UnaryPlus", od.Name);
} }
[Test, Ignore("Parser crash")] [Test]
public void InvalidOperatorTrueDeclaration() public void InvalidOperatorTrueDeclaration()
{ {
ParseUtilCSharp.ParseTypeMember<OperatorDeclaration>("public static implicit operator true(MyBool b) {}", expectErrors: true); ParseUtilCSharp.ParseTypeMember<OperatorDeclaration>("public static implicit operator true(MyBool b) {}", expectErrors: true);

2
ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs

@ -174,7 +174,6 @@ class B {
Assert.AreEqual("Point.X", result.Member.FullName); Assert.AreEqual("Point.X", result.Member.FullName);
} }
[Ignore("Broken")]
[Test] [Test]
public void CollectionInitializerTest() public void CollectionInitializerTest()
{ {
@ -188,7 +187,6 @@ class B {
Assert.AreEqual("System.Collections.Generic.List.Add", result.Member.FullName); Assert.AreEqual("System.Collections.Generic.List.Add", result.Member.FullName);
} }
[Ignore("Broken on mcs/mac os x")]
[Test] [Test]
public void DictionaryInitializerTest() public void DictionaryInitializerTest()
{ {

Loading…
Cancel
Save