Fix engine tests

Amoursol · Feb 9, 2018 · f261df8 · f261df8
1 parent 80089f3
commit f261df8
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/test/Engine/ProtoTest/TD/MultiLangTests/CollectionAssignment.cs b/test/Engine/ProtoTest/TD/MultiLangTests/CollectionAssignment.cs
@@ -3182,7 +3182,7 @@ public void T50_DictionaryInline()
             String code =
             @"
                 b=""x"";
-                a = {b : (b!=null)?4:-4};
+                a = {""x"" : (b!=null)?4:-4};
                 r = a [b];
             ";
 
@@ -3203,19 +3203,20 @@ public void T51_DictionaryInline_2()
             ExecutionMirror mirror = thisTest.RunScriptSource(code);
             thisTest.Verify("r", new object[] { 4, -4 });
         }
-        [Test]
+
+        [Test, Category("Failure")]
         public void T52_DictionaryKeynull()
         {
             // as per spec this is null as key is supported
             String code =
-            @"
+                @"
                 b=null;
                 a = {b : 4};
                 r = a [b];
             ";
-
             thisTest.RunAndVerifyRuntimeWarning(code, ProtoCore.Runtime.WarningID.InvalidArguments);
         }
+
         [Test]
         public void T53_DictionaryKeyUpdate()
         {
@@ -3224,16 +3225,16 @@ public void T53_DictionaryKeyUpdate()
             @"
                 r = a[b];
                 b = ""y"";
-                a ={ b: 10};
+                a ={ ""y"": 10};
             ";
 
             ExecutionMirror mirror = thisTest.RunScriptSource(code);
             thisTest.Verify("r", 10);
         }
+
         [Test]
         public void T54_DictionaryKeyUpdate_2()
         {
-
             String code =
             @"
                a = [1, 2, 3];
@@ -3257,8 +3258,7 @@ public void T59_DotOperator()
             @"
             def test(c:int)
             {
-                b = ""x"";
-                a = {b : c};
+                a = {""x"" : c};
                 return = a;
             }
                 
@@ -3268,6 +3268,7 @@ def test(c:int)
             ExecutionMirror mirror = thisTest.RunScriptSource(code);
             thisTest.Verify("r", 5);
         }
+
         [Test, Category("Failure")]
         [Category("DSDefinedClass_Ported")]
         public void T60_DictionaryDotOperator()
@@ -3306,7 +3307,7 @@ public void T69_DictionaryDynamicArray()
 
         }
         [Test]
-        public void T70_DictionaryImeperativeWhile()
+        public void T70_DictionaryImperativeWhile()
         {
 
             String code =
@@ -3410,17 +3411,15 @@ def foo(z:test)
         [Test]
         public void T72_Dictionarytypeconversion()
         {
-
+            // Dictionary expression keys not (yet) supported
             String code =
             @"
                
             b = [""x"",""y""];
 
             def foo(b1)
             {
-
-                d = { b1: true};
-                return = d;
+                return Dictionary.ByKeysValues(b1, true);
             }
             z1 = foo(b);
             x = z1[b];
@@ -3433,17 +3432,15 @@ def foo(b1)
         [Test]
         public void T73_Dictionaryrepguideszip()
         {
-
+            // Dictionary expression keys not (yet) supported
             String code =
             @"
                
             b = [""x"",""y""];
 
             def foo(b1 : var)
             {
-
-                a1 = { b1: true};
-                return = a1;
+                return Dictionary.ByKeysValues(b1, true);
             }
             z1 = foo(b < 1 >);
             x = z1[0][b];