Merge pull request #3142 from henricm/fix-for-win-mono_string_to_utf8

[mono.git] / mcs / class / Mono.CSharp / Test / Evaluator / ExpressionsTest.cs

diff --git a/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs b/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
index 3eef06b3b15b7d07dc77eda93a63a4555461b354..8c414dad79feaced6c3d48e6a4b7ff4865e0e3ff 100644 (file)
--- a/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
+++ b/mcs/class/Mono.CSharp/Test/Evaluator/ExpressionsTest.cs
@@ -83,6 +83,26 @@ namespace MonoTests.EvaluatorTest
                        Evaluator.Evaluate ("File.Exists (\"/etc/passwd\");");
                }
 
+               [Test]
+               public void UsingWithError ()
+               {
+                       try {
+                               Evaluator.Run ("using System.DateTime;");
+                               Assert.Fail ("#1");
+                       } catch {
+                       }
+
+                       Evaluator.Evaluate ("1+1");
+               }
+
+               [Test]
+               public void UsingAlias ()
+               {
+                       Evaluator.Run("using System;");
+                       Evaluator.Run("using MyConsole = System.Console;");
+                       Evaluator.Run("Console.WriteLine(\"Hello World\")");
+               }
+
                [Test]
                public void WithTypeBuilders ()
                {
@@ -100,7 +120,8 @@ namespace MonoTests.EvaluatorTest
                        Evaluator.Run ("var a = new int[]{1,2,3};");
 
                        object res = Evaluator.Evaluate ("from x in a select x + 1;");
-                       CollectionAssert.AreEqual (new int[] { 2, 3, 4 }, ((IEnumerable<int>) res).ToArray ());
+
+                       Assert.AreEqual (new int[] { 2, 3, 4 }, ((IEnumerable<int>) res).ToArray ());
                }
 
                [Test]
@@ -155,7 +176,6 @@ namespace MonoTests.EvaluatorTest
                        Assert.AreEqual (124, res);     
                }
 
-#if NET_4_0
                [Test]
                public void DynamicStatement ()
                {
@@ -163,9 +183,7 @@ namespace MonoTests.EvaluatorTest
                        Evaluator.Run ("d = 'a';");
                        Evaluator.Run ("d.GetType ();");
                }
-#endif
 
-#if NET_4_5
                [Test]
                public void AwaitExpression ()
                {
@@ -174,6 +192,14 @@ namespace MonoTests.EvaluatorTest
                        res = Evaluator.Evaluate ("res;");
                        Assert.AreEqual (3, res, "#1");
                }
-#endif
+
+               [Test]
+               public void UsingStatic ()
+               {
+                       Evaluator.Run ("using static System.String;");
+                       var res = Evaluator.Evaluate("Join (\"--\", new [] { \"a\", \"b\" } );");
+                       Assert.AreEqual ("a--b", res);
+               }
+
        }
-}
\ No newline at end of file
+}