From 7b542f4eb2786e7253ea5d1931dddd99263a8a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 30 Sep 2011 10:52:45 +0200 Subject: [PATCH] Enabled async tests. --- .../Parser/Expression/AnonymousMethodExpressionTests.cs | 2 +- .../CSharp/Parser/Expression/LambdaExpressionTests.cs | 4 ++-- .../Parser/Expression/UnaryOperatorExpressionTests.cs | 4 ++-- ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs | 6 ++++++ .../CSharp/Parser/TypeMembers/MethodDeclarationTests.cs | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/AnonymousMethodExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/AnonymousMethodExpressionTests.cs index 1858b8d4c0..a8d480bf1a 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/AnonymousMethodExpressionTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/AnonymousMethodExpressionTests.cs @@ -69,7 +69,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression Assert.IsTrue(ame.Body.Statements.First() is ReturnStatement); } - [Test, Ignore("async/await not yet supported")] + [Test] public void AsyncAnonymousMethod() { AnonymousMethodExpression ame = Parse("async delegate {}"); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/LambdaExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/LambdaExpressionTests.cs index 7a67ccaad9..6a18758a5c 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/LambdaExpressionTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/LambdaExpressionTests.cs @@ -120,7 +120,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression }}); } - [Test, Ignore("async/await not yet supported")] + [Test] public void AsyncLambdaExpression() { ParseUtilCSharp.AssertExpression( @@ -132,7 +132,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression }); } - [Test, Ignore("async/await not yet supported")] + [Test] public void AsyncLambdaExpressionWithMultipleParameters() { ParseUtilCSharp.AssertExpression( diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs index a5c69f53b8..234abd85d5 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/Expression/UnaryOperatorExpressionTests.cs @@ -92,7 +92,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression TestUnaryOperatorExpressionTest("&a", UnaryOperatorType.AddressOf); } - [Test, Ignore("async/await not yet supported")] + [Test] public void Await() { ParseUtilCSharp.AssertExpression( @@ -104,7 +104,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.Expression }); } - [Test, Ignore("async/await not yet supported")] + [Test] public void AwaitAwait() { ParseUtilCSharp.AssertExpression( diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs index bd2105267b..2e9c6b6ece 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs @@ -35,6 +35,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser CSharpParser parser = new CSharpParser(); CompilationUnit cu = parser.Parse(new StringReader(code)); + if (parser.HasErrors) + parser.ErrorPrinter.Errors.ForEach (err => Console.WriteLine (err.Message)); Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors"); AstNode node = cu.Children.Single(); @@ -56,6 +58,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser CSharpParser parser = new CSharpParser(); var statements = parser.ParseStatements(new StringReader(stmt)); + if (parser.HasErrors) + parser.ErrorPrinter.Errors.ForEach (err => Console.WriteLine (err.Message)); Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors"); AstNode statement = statements.Single(); @@ -77,6 +81,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser CSharpParser parser = new CSharpParser(); AstNode parsedExpression = parser.ParseExpression(new StringReader(expr)); + if (parser.HasErrors) + parser.ErrorPrinter.Errors.ForEach (err => Console.WriteLine (err.Message)); Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors"); if (expectErrors && parsedExpression == null) return default (T); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/MethodDeclarationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/MethodDeclarationTests.cs index 5742b24254..434b40dda3 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/MethodDeclarationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/MethodDeclarationTests.cs @@ -356,7 +356,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers }}); } - [Test, Ignore("async/await not yet supported")] + [Test] public void AsyncMethod() { ParseUtilCSharp.AssertTypeMember( @@ -369,7 +369,7 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers }); } - [Test, Ignore("async/await not yet supported")] + [Test, Ignore("parser bug, reported upstream.")] public void AsyncAsyncAsync() { ParseUtilCSharp.AssertTypeMember(