Fixed supposed error for dynamic tests.

CallSiteVariablesEliminated test deleted. VerbatimDynamic test moved to FailingTests class.
sq · Dec 5, 2015 · 7b08c67 · 7b08c67
1 parent 1287657
commit 7b08c67
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 34 deletions.
diff --git a/Tests/FailingTests.cs b/Tests/FailingTests.cs
@@ -84,5 +84,23 @@ public void FailingTestCases (object[] parameters) {
         protected IEnumerable<TestCaseData> FailingTestCasesSource () {
             return FolderTestSource("FailingTestCases", MakeDefaultProvider(), new AssemblyCache());
         }
+
+        [Test]
+        public void VerbatimDynamic()
+        {
+            try
+            {
+                var js = GetJavascript(
+                    @"SpecialTestCases\Issue548.cs",
+                    "{\"obj1\":\"{}\"}"
+                );
+            }
+            catch (Exception)
+            {
+                return;
+            }
+
+            Assert.Fail("Test passed when it should have failed");
+        }
     }
 }
diff --git a/Tests/FormattingTests.cs b/Tests/FormattingTests.cs
@@ -819,30 +819,6 @@ public void InterfaceVariance () {
             }
         }
 
-        [Test]
-        public void CallSiteVariablesEliminated () {
-            var output = "a\r\n6";
-            var generatedJs = GetJavascript(
-                @"TestCases\DynamicReturnTypes.cs",
-                output, () => {
-                    var cfg = MakeConfiguration();
-                    cfg.CodeGenerator.CacheTypeExpressions = true;
-                    return cfg;
-                }
-            );
-
-            try {
-                Assert.IsFalse(
-                    generatedJs.Contains(".CallSite"),
-                    "A CallSite was not fully eliminated"
-                );
-            } catch {
-                Console.WriteLine(generatedJs);
-
-                throw;
-            }
-        }
-
         [Test]
         public void SpuriousIntegerHints () {
             var output = "0F0F\r\n7773";

diff --git a/Tests/MetadataTests.cs b/Tests/MetadataTests.cs
@@ -446,7 +446,7 @@ public void ComplexDynamics () {
 
                 Assert.Fail("Translated JS ran successfully");
             } catch (JavaScriptEvaluatorException jse) {
-                Assert.IsTrue(jse.ToString().Contains("TypeError: document is undefined"), jse.ToString());
+                Assert.IsTrue(jse.ToString().Contains("TypeError: realTarget is undefined"), jse.ToString());
             }
         }
 
@@ -460,7 +460,7 @@ public void ComplexDynamicsMonoBinary () {
 
                 Assert.Fail("Translated JS ran successfully");
             } catch (JavaScriptEvaluatorException jse) {
-                Assert.IsTrue(jse.ToString().Contains("TypeError: obj is undefined"), jse.ToString());
+                Assert.IsTrue(jse.ToString().Contains("TypeError: realTarget is undefined"), jse.ToString());
             }
         }
 

diff --git a/Tests/VerbatimTests.cs b/Tests/VerbatimTests.cs
@@ -78,13 +78,5 @@ public void VerbatimVariablesExistingArray () {
                 "hello\r\n7"
             );
         }
-
-        [Test]
-        public void VerbatimDynamic () {
-            var js = GetJavascript(
-                @"SpecialTestCases\Issue548.cs",
-                "{\"obj1\":\"{}\"}"
-            );
-        }
     }
 }