More tests for protected members

Author: ahejlsberg

tests/baselines/reference/classConstructorAccessibility.errors.txt

@@ -1,8 +1,10 @@
 tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(6,5): error TS1089: 'private' modifier cannot appear on a constructor declaration.
-tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(18,9): error TS1089: 'private' modifier cannot appear on a constructor declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(10,5): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(23,9): error TS1089: 'private' modifier cannot appear on a constructor declaration.
+tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts(27,9): error TS1089: 'protected' modifier cannot appear on a constructor declaration.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts (2 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessibility.ts (4 errors) ====
     class C {
         public constructor(public x: number) { }
     }
@@ -13,8 +15,15 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
 !!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
     }
 
+    class E {
+        protected constructor(public x: number) { } // error
+        ~~~~~~~~~
+!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+    }
+    
     var c = new C(1);
     var d = new D(1);
+    var e = new E(1);
 
     module Generic {
         class C<T> {
@@ -27,7 +36,14 @@ tests/cases/conformance/classes/constructorDeclarations/classConstructorAccessib
 !!! error TS1089: 'private' modifier cannot appear on a constructor declaration.
         }
 
+        class E<T> {
+            protected constructor(public x: T) { } // error
+            ~~~~~~~~~
+!!! error TS1089: 'protected' modifier cannot appear on a constructor declaration.
+        }
+    
         var c = new C(1);
         var d = new D(1);
+        var e = new E(1);
     }
 

tests/baselines/reference/classPropertyAsProtected.errors.txt

@@ -0,0 +1,62 @@
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(3,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(4,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(8,26): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(9,26): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(15,1): error TS2445: Property 'x' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(16,1): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(17,1): error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(18,1): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(20,1): error TS2445: Property 'a' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(21,1): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(22,1): error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts(23,1): error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+
+
+==== tests/cases/conformance/classes/members/accessibility/classPropertyAsProtected.ts (12 errors) ====
+    class C {
+        protected x: string;
+        protected get y() { return null; }
+                      ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+        protected set y(x) { }
+                      ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+        protected foo() { }
+    
+        protected static a: string;
+        protected static get b() { return null; }
+                             ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+        protected static set b(x) { }
+                             ~
+!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
+        protected static foo() { }
+    }
+    
+    var c: C;
+    // all errors
+    c.x;
+    ~~~
+!!! error TS2445: Property 'x' is protected and only accessible within class 'C' and its subclasses.
+    c.y;
+    ~~~
+!!! error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+    c.y = 1;
+    ~~~
+!!! error TS2445: Property 'y' is protected and only accessible within class 'C' and its subclasses.
+    c.foo();
+    ~~~~~
+!!! error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.
+    
+    C.a;
+    ~~~
+!!! error TS2445: Property 'a' is protected and only accessible within class 'C' and its subclasses.
+    C.b();
+    ~~~
+!!! error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+    C.b = 1;
+    ~~~
+!!! error TS2445: Property 'b' is protected and only accessible within class 'C' and its subclasses.
+    C.foo();
+    ~~~~~
+!!! error TS2445: Property 'foo' is protected and only accessible within class 'C' and its subclasses.

tests/baselines/reference/constructorParameterProperties.errors.txt

@@ -1,23 +1,28 @@
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(8,10): error TS2341: Property 'x' is private and only accessible within class 'C'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(17,10): error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
-tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(18,12): error TS2339: Property 'a' does not exist on type 'D<string>'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(9,10): error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(18,10): error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(19,12): error TS2339: Property 'a' does not exist on type 'D<string>'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts(20,10): error TS2445: Property 'z' is protected and only accessible within class 'D<T>' and its subclasses.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts (3 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties.ts (5 errors) ====
     class C {
         y: string;
-        constructor(private x: string) { }
+        constructor(private x: string, protected z: string) { }
     }
 
     var c: C;
     var r = c.y;
     var r2 = c.x; // error
              ~~~
 !!! error TS2341: Property 'x' is private and only accessible within class 'C'.
+    var r3 = c.z; // error
+             ~~~
+!!! error TS2445: Property 'z' is protected and only accessible within class 'C' and its subclasses.
 
     class D<T> {
         y: T;
-        constructor(a: T, private x: T) { }
+        constructor(a: T, private x: T, protected z: T) { }
     }
 
     var d: D<string>;
@@ -27,4 +32,8 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
 !!! error TS2341: Property 'x' is private and only accessible within class 'D<T>'.
     var r3 = d.a; // error
                ~
-!!! error TS2339: Property 'a' does not exist on type 'D<string>'.
+!!! error TS2339: Property 'a' does not exist on type 'D<string>'.
+    var r4 = d.z; // error
+             ~~~
+!!! error TS2445: Property 'z' is protected and only accessible within class 'D<T>' and its subclasses.
+    

tests/baselines/reference/constructorParameterProperties.js

@@ -1,40 +1,47 @@
 //// [constructorParameterProperties.ts]
 class C {
     y: string;
-    constructor(private x: string) { }
+    constructor(private x: string, protected z: string) { }
 }
 
 var c: C;
 var r = c.y;
 var r2 = c.x; // error
+var r3 = c.z; // error
 
 class D<T> {
     y: T;
-    constructor(a: T, private x: T) { }
+    constructor(a: T, private x: T, protected z: T) { }
 }
 
 var d: D<string>;
 var r = d.y;
 var r2 = d.x; // error
-var r3 = d.a; // error
+var r3 = d.a; // error
+var r4 = d.z; // error
+
 
 //// [constructorParameterProperties.js]
 var C = (function () {
-    function C(x) {
+    function C(x, z) {
         this.x = x;
+        this.z = z;
     }
     return C;
 })();
 var c;
 var r = c.y;
 var r2 = c.x; // error
+var r3 = c.z; // error
 var D = (function () {
-    function D(a, x) {
+    function D(a, x, z) {
         this.x = x;
+        this.z = z;
     }
     return D;
 })();
 var d;
 var r = d.y;
 var r2 = d.x; // error
 var r3 = d.a; // error
+var r4 = d.z; // error

tests/baselines/reference/constructorParameterProperties2.errors.txt

@@ -1,8 +1,9 @@
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(11,24): error TS2300: Duplicate identifier 'y'.
 tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(19,25): error TS2300: Duplicate identifier 'y'.
+tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts(27,27): error TS2300: Duplicate identifier 'y'.
 
 
-==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts (2 errors) ====
+==== tests/cases/conformance/classes/constructorDeclarations/constructorParameters/constructorParameterProperties2.ts (3 errors) ====
     class C {
         y: number;
         constructor(y: number) { } // ok
@@ -29,4 +30,15 @@ tests/cases/conformance/classes/constructorDeclarations/constructorParameters/co
     }
 
     var e: E;
-    var r3 = e.y; // error
+    var r3 = e.y; // error
+    
+    class F {
+        y: number;
+        constructor(protected y: number) { } // error
+                              ~
+!!! error TS2300: Duplicate identifier 'y'.
+    }
+    
+    var f: F;
+    var r4 = f.y; // error
+    

tests/baselines/reference/constructorParameterProperties2.js

@@ -21,7 +21,16 @@ class E {
 }
 
 var e: E;
-var r3 = e.y; // error
+var r3 = e.y; // error
+
+class F {
+    y: number;
+    constructor(protected y: number) { } // error
+}
+
+var f: F;
+var r4 = f.y; // error
+
 
 //// [constructorParameterProperties2.js]
 var C = (function () {
@@ -47,3 +56,11 @@ var E = (function () {
 })();
 var e;
 var r3 = e.y; // error
+var F = (function () {
+    function F(y) {
+        this.y = y;
+    } // error
+    return F;
+})();
+var f;
+var r4 = f.y; // error

tests/baselines/reference/implementingAnInterfaceExtendingClassWithProtecteds.errors.txt

@@ -0,0 +1,74 @@
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(9,7): error TS2421: Class 'Bar' incorrectly implements interface 'I':
+  Property 'y' is missing in type 'Bar'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(12,7): error TS2421: Class 'Bar2' incorrectly implements interface 'I':
+  Property 'x' is missing in type 'Bar2'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(16,7): error TS2421: Class 'Bar3' incorrectly implements interface 'I':
+  Property 'x' is protected but type 'Bar3' is not a class derived from 'Foo'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(21,7): error TS2421: Class 'Bar4' incorrectly implements interface 'I':
+  Property 'x' is protected but type 'Bar4' is not a class derived from 'Foo'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(26,7): error TS2421: Class 'Bar5' incorrectly implements interface 'I':
+  Property 'y' is missing in type 'Bar5'.
+tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts(29,7): error TS2421: Class 'Bar6' incorrectly implements interface 'I':
+  Property 'y' is protected in type 'Bar6' but public in type 'I'.
+
+
+==== tests/cases/conformance/interfaces/interfacesExtendingClasses/implementingAnInterfaceExtendingClassWithProtecteds.ts (6 errors) ====
+    class Foo {
+        protected x: string;
+    }
+    
+    interface I extends Foo {
+        y: number;
+    }
+    
+    class Bar implements I { // error
+          ~~~
+!!! error TS2421: Class 'Bar' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'y' is missing in type 'Bar'.
+    }
+    
+    class Bar2 implements I { // error
+          ~~~~
+!!! error TS2421: Class 'Bar2' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'x' is missing in type 'Bar2'.
+        y: number;
+    }
+    
+    class Bar3 implements I { // error
+          ~~~~
+!!! error TS2421: Class 'Bar3' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'x' is protected but type 'Bar3' is not a class derived from 'Foo'.
+        x: string;
+        y: number;
+    }
+    
+    class Bar4 implements I { // error
+          ~~~~
+!!! error TS2421: Class 'Bar4' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'x' is protected but type 'Bar4' is not a class derived from 'Foo'.
+        protected x: string;
+        y: number;
+    }
+    
+    class Bar5 extends Foo implements I { // error
+          ~~~~
+!!! error TS2421: Class 'Bar5' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'y' is missing in type 'Bar5'.
+    }
+    
+    class Bar6 extends Foo implements I { // error
+          ~~~~
+!!! error TS2421: Class 'Bar6' incorrectly implements interface 'I':
+!!! error TS2421:   Property 'y' is protected in type 'Bar6' but public in type 'I'.
+        protected y: number;
+    }
+    
+    class Bar7 extends Foo implements I {
+        y: number;
+    }
+    
+    class Bar8 extends Foo implements I {
+        x: string;
+        y: number;
+    }
+