Updating some tests for resolved bugs

microsoft · danquirk · Jul 15, 2014 · Jul 14, 2014 · Jul 15, 2014 · Jul 14, 2014
commit 4b1ff742ddb99efaa82653b078813bf478401a30
diff --git a/tests/baselines/reference/classExtendingPrimitive2.errors.txt b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts (3 errors) ====
+    // classes cannot extend primitives
+
+    class C4a extends void {}
+                      ~~~~
+!!! Identifier expected.
+    class C5a extends null { }
+                      ~~~~
+!!! Identifier expected.
+                           ~
+!!! ';' expected.
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts (3 errors) ====
+    class C2 extends { foo: string; } { } // error
+                     ~
+!!! Identifier expected.
+
+    class C6 extends []{ } // error
+                     ~
+!!! Identifier expected.
+                       ~
+!!! ';' expected.
diff --git a/tests/baselines/reference/duplicateVarAndImport.js b/tests/baselines/reference/duplicateVarAndImport.js
@@ -0,0 +1,8 @@
+//// [duplicateVarAndImport.ts]
+// no error since module is not instantiated
+var a;
+module M {}
+import a = M;
+
+//// [duplicateVarAndImport.js]
+var a;
diff --git a/tests/baselines/reference/duplicateVarAndImport2.errors.txt b/tests/baselines/reference/duplicateVarAndImport2.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/duplicateVarAndImport2.ts (1 errors) ====
+    // error since module is instantiated
+    var a;
+    module M { export var x = 1; }
+    import a = M;
+    ~~~~~~~~~~~~~
+!!! Import declaration conflicts with local declaration of 'a'
diff --git a/tests/baselines/reference/duplicateVarAndImport2.js b/tests/baselines/reference/duplicateVarAndImport2.js
@@ -0,0 +1,13 @@
+//// [duplicateVarAndImport2.ts]
+// error since module is instantiated
+var a;
+module M { export var x = 1; }
+import a = M;
+
+//// [duplicateVarAndImport2.js]
+var a;
+var M;
+(function (M) {
+    M.x = 1;
+})(M || (M = {}));
+var a = M;
diff --git a/tests/cases/compiler/duplicateVarAndImport.ts b/tests/cases/compiler/duplicateVarAndImport.ts
@@ -0,0 +1,4 @@
+// no error since module is not instantiated
+var a;
+module M {}
+import a = M;
diff --git a/tests/cases/compiler/duplicateVarAndImport2.ts b/tests/cases/compiler/duplicateVarAndImport2.ts
@@ -0,0 +1,4 @@
+// error since module is instantiated
+var a;
+module M { export var x = 1; }
+import a = M;
diff --git a/...formance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts b/...formance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
@@ -0,0 +1,4 @@
+// classes cannot extend primitives
+
+class C4a extends void {}
+class C5a extends null { }
diff --git a/...ance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts b/...ance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
@@ -0,0 +1,3 @@
+class C2 extends { foo: string; } { } // error
+
+class C6 extends []{ } // error
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		class C2 extends { foo: string; } { } // error

		class C6 extends []{ } // error