Skip to content

Commit d2affa2

Browse files
RyanCavanaughRyanCavanaugh
committed
Better test files
1 parent e86e10d commit d2affa2

6 files changed

+49
-250
lines changed

‎tests/baselines/reference/divergentAccessorsTypes1.errors.txt

-78
This file was deleted.

‎tests/baselines/reference/divergentAccessorsTypes1.js

+21-32
Original file line numberDiff line numberDiff line change
@@ -65,54 +65,43 @@ type Test3 = {
6565

6666
//// [divergentAccessorsTypes1.js]
6767
"use strict";
68-
var Test1 = /** @class */ (function () {
69-
function Test1() {
68+
class Test1 {
69+
get foo() { return ""; }
70+
set foo(s) {
71+
let a = s;
72+
let b = s;
7073
}
71-
Object.defineProperty(Test1.prototype, "foo", {
72-
get: function () { return ""; },
73-
set: function (s) {
74-
var a = s;
75-
var b = s;
76-
},
77-
enumerable: false,
78-
configurable: true
79-
});
80-
Object.defineProperty(Test1.prototype, "bar", {
81-
get: function () { return ""; },
82-
set: function (s) {
83-
},
84-
enumerable: false,
85-
configurable: true
86-
});
87-
return Test1;
88-
}());
74+
get bar() { return ""; }
75+
set bar(s) {
76+
}
77+
}
8978
{
90-
var t = new Test1();
79+
const t = new Test1();
9180
t.foo = 32;
92-
var m = t.foo;
81+
let m = t.foo;
9382
// See how CFA interacts with out-of-type writes
9483
t.bar = 42;
95-
var n = t.bar;
84+
let n = t.bar;
9685
t.bar = false;
97-
var o = t.bar;
86+
let o = t.bar;
9887
}
9988
{
100-
var t = {};
89+
const t = {};
10190
t.foo = 32;
102-
var m = t.foo;
91+
let m = t.foo;
10392
// See how CFA interacts with out-of-type writes
10493
t.bar = 42;
105-
var n = t.bar;
94+
let n = t.bar;
10695
t.bar = false;
107-
var o = t.bar;
96+
let o = t.bar;
10897
}
10998
{
110-
var t = {};
99+
const t = {};
111100
t.foo = 32;
112-
var m = t.foo;
101+
let m = t.foo;
113102
// See how CFA interacts with out-of-type writes
114103
t.bar = 42;
115-
var n = t.bar;
104+
let n = t.bar;
116105
t.bar = false;
117-
var o = t.bar;
106+
let o = t.bar;
118107
}

‎tests/baselines/reference/divergentAccessorsVisibility1.errors.txt

+1-55
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
1-
tests/cases/compiler/divergentAccessorsVisibility1.ts(2,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
2-
tests/cases/compiler/divergentAccessorsVisibility1.ts(3,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
3-
tests/cases/compiler/divergentAccessorsVisibility1.ts(5,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
4-
tests/cases/compiler/divergentAccessorsVisibility1.ts(6,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
5-
tests/cases/compiler/divergentAccessorsVisibility1.ts(8,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
6-
tests/cases/compiler/divergentAccessorsVisibility1.ts(9,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
7-
tests/cases/compiler/divergentAccessorsVisibility1.ts(11,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
81
tests/cases/compiler/divergentAccessorsVisibility1.ts(11,19): error TS2798: A get accessor must be at least as accessible as the setter
9-
tests/cases/compiler/divergentAccessorsVisibility1.ts(12,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
102
tests/cases/compiler/divergentAccessorsVisibility1.ts(12,9): error TS2798: A get accessor must be at least as accessible as the setter
11-
tests/cases/compiler/divergentAccessorsVisibility1.ts(14,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
12-
tests/cases/compiler/divergentAccessorsVisibility1.ts(15,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
13-
tests/cases/compiler/divergentAccessorsVisibility1.ts(17,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
14-
tests/cases/compiler/divergentAccessorsVisibility1.ts(18,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
15-
tests/cases/compiler/divergentAccessorsVisibility1.ts(20,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
163
tests/cases/compiler/divergentAccessorsVisibility1.ts(20,17): error TS2798: A get accessor must be at least as accessible as the setter
17-
tests/cases/compiler/divergentAccessorsVisibility1.ts(21,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
184
tests/cases/compiler/divergentAccessorsVisibility1.ts(21,9): error TS2798: A get accessor must be at least as accessible as the setter
19-
tests/cases/compiler/divergentAccessorsVisibility1.ts(23,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
205
tests/cases/compiler/divergentAccessorsVisibility1.ts(23,17): error TS2798: A get accessor must be at least as accessible as the setter
21-
tests/cases/compiler/divergentAccessorsVisibility1.ts(24,19): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
226
tests/cases/compiler/divergentAccessorsVisibility1.ts(24,19): error TS2798: A get accessor must be at least as accessible as the setter
23-
tests/cases/compiler/divergentAccessorsVisibility1.ts(26,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
24-
tests/cases/compiler/divergentAccessorsVisibility1.ts(27,17): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
257
tests/cases/compiler/divergentAccessorsVisibility1.ts(66,14): error TS2341: Property 'PublicPrivate' is private and only accessible within class 'Base'.
268
tests/cases/compiler/divergentAccessorsVisibility1.ts(69,14): error TS2341: Property 'ProtectedPrivate' is private and only accessible within class 'Base'.
279
tests/cases/compiler/divergentAccessorsVisibility1.ts(72,14): error TS2341: Property 'PrivatePrivate' is private and only accessible within class 'Base'.
@@ -69,82 +51,46 @@ tests/cases/compiler/divergentAccessorsVisibility1.ts(155,11): error TS2445: Pro
6951
tests/cases/compiler/divergentAccessorsVisibility1.ts(156,11): error TS2341: Property 'PrivatePrivate' is private and only accessible within class 'Base'.
7052

7153

72-
==== tests/cases/compiler/divergentAccessorsVisibility1.ts (69 errors) ====
54+
==== tests/cases/compiler/divergentAccessorsVisibility1.ts (51 errors) ====
7355
class Base {
7456
get PublicPublic() { return 0; }
75-
~~~~~~~~~~~~
76-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
7757
set PublicPublic(v) { return; }
78-
~~~~~~~~~~~~
79-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
8058

8159
get PublicProtected() { return 0; }
82-
~~~~~~~~~~~~~~~
83-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
8460
protected set PublicProtected(v) { return; }
85-
~~~~~~~~~~~~~~~
86-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
8761

8862
get PublicPrivate() { return 0; }
89-
~~~~~~~~~~~~~
90-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
9163
private set PublicPrivate(v) { return; }
92-
~~~~~~~~~~~~~
93-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
9464

9565
protected get ProtectedPublic() { return 0; }
9666
~~~~~~~~~~~~~~~
97-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
98-
~~~~~~~~~~~~~~~
9967
!!! error TS2798: A get accessor must be at least as accessible as the setter
10068
set ProtectedPublic(v) { return; }
10169
~~~~~~~~~~~~~~~
102-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
103-
~~~~~~~~~~~~~~~
10470
!!! error TS2798: A get accessor must be at least as accessible as the setter
10571

10672
protected get ProtectedProtected() { return 0; }
107-
~~~~~~~~~~~~~~~~~~
108-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
10973
protected set ProtectedProtected(v) { return; }
110-
~~~~~~~~~~~~~~~~~~
111-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
11274

11375
protected get ProtectedPrivate() { return 0; }
114-
~~~~~~~~~~~~~~~~
115-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
11676
private set ProtectedPrivate(v) { return; }
117-
~~~~~~~~~~~~~~~~
118-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
11977

12078
private get PrivatePublic() { return 0; }
12179
~~~~~~~~~~~~~
122-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
123-
~~~~~~~~~~~~~
12480
!!! error TS2798: A get accessor must be at least as accessible as the setter
12581
set PrivatePublic(v) { return; }
12682
~~~~~~~~~~~~~
127-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
128-
~~~~~~~~~~~~~
12983
!!! error TS2798: A get accessor must be at least as accessible as the setter
13084

13185
private get PrivateProtected() { return 0; }
13286
~~~~~~~~~~~~~~~~
133-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
134-
~~~~~~~~~~~~~~~~
13587
!!! error TS2798: A get accessor must be at least as accessible as the setter
13688
protected set PrivateProtected(v) { return; }
13789
~~~~~~~~~~~~~~~~
138-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
139-
~~~~~~~~~~~~~~~~
14090
!!! error TS2798: A get accessor must be at least as accessible as the setter
14191

14292
private get PrivatePrivate() { return 0; }
143-
~~~~~~~~~~~~~~
144-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
14593
private set PrivatePrivate(v) { return; }
146-
~~~~~~~~~~~~~~
147-
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
14894

14995
test() {
15096
this.PublicPublic = 0;

‎tests/baselines/reference/divergentAccessorsVisibility1.js

+25-84
Original file line numberDiff line numberDiff line change
@@ -160,79 +160,26 @@ function fn() {
160160

161161
//// [divergentAccessorsVisibility1.js]
162162
"use strict";
163-
var __extends = (this && this.__extends) || (function () {
164-
var extendStatics = function (d, b) {
165-
extendStatics = Object.setPrototypeOf ||
166-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
167-
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
168-
return extendStatics(d, b);
169-
};
170-
return function (d, b) {
171-
if (typeof b !== "function" && b !== null)
172-
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
173-
extendStatics(d, b);
174-
function __() { this.constructor = d; }
175-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
176-
};
177-
})();
178-
var Base = /** @class */ (function () {
179-
function Base() {
180-
}
181-
Object.defineProperty(Base.prototype, "PublicPublic", {
182-
get: function () { return 0; },
183-
set: function (v) { return; },
184-
enumerable: false,
185-
configurable: true
186-
});
187-
Object.defineProperty(Base.prototype, "PublicProtected", {
188-
get: function () { return 0; },
189-
set: function (v) { return; },
190-
enumerable: false,
191-
configurable: true
192-
});
193-
Object.defineProperty(Base.prototype, "PublicPrivate", {
194-
get: function () { return 0; },
195-
set: function (v) { return; },
196-
enumerable: false,
197-
configurable: true
198-
});
199-
Object.defineProperty(Base.prototype, "ProtectedPublic", {
200-
get: function () { return 0; },
201-
set: function (v) { return; },
202-
enumerable: false,
203-
configurable: true
204-
});
205-
Object.defineProperty(Base.prototype, "ProtectedProtected", {
206-
get: function () { return 0; },
207-
set: function (v) { return; },
208-
enumerable: false,
209-
configurable: true
210-
});
211-
Object.defineProperty(Base.prototype, "ProtectedPrivate", {
212-
get: function () { return 0; },
213-
set: function (v) { return; },
214-
enumerable: false,
215-
configurable: true
216-
});
217-
Object.defineProperty(Base.prototype, "PrivatePublic", {
218-
get: function () { return 0; },
219-
set: function (v) { return; },
220-
enumerable: false,
221-
configurable: true
222-
});
223-
Object.defineProperty(Base.prototype, "PrivateProtected", {
224-
get: function () { return 0; },
225-
set: function (v) { return; },
226-
enumerable: false,
227-
configurable: true
228-
});
229-
Object.defineProperty(Base.prototype, "PrivatePrivate", {
230-
get: function () { return 0; },
231-
set: function (v) { return; },
232-
enumerable: false,
233-
configurable: true
234-
});
235-
Base.prototype.test = function () {
163+
class Base {
164+
get PublicPublic() { return 0; }
165+
set PublicPublic(v) { return; }
166+
get PublicProtected() { return 0; }
167+
set PublicProtected(v) { return; }
168+
get PublicPrivate() { return 0; }
169+
set PublicPrivate(v) { return; }
170+
get ProtectedPublic() { return 0; }
171+
set ProtectedPublic(v) { return; }
172+
get ProtectedProtected() { return 0; }
173+
set ProtectedProtected(v) { return; }
174+
get ProtectedPrivate() { return 0; }
175+
set ProtectedPrivate(v) { return; }
176+
get PrivatePublic() { return 0; }
177+
set PrivatePublic(v) { return; }
178+
get PrivateProtected() { return 0; }
179+
set PrivateProtected(v) { return; }
180+
get PrivatePrivate() { return 0; }
181+
set PrivatePrivate(v) { return; }
182+
test() {
236183
this.PublicPublic = 0;
237184
this.PublicProtected = 0;
238185
this.PublicPrivate = 0;
@@ -260,15 +207,10 @@ var Base = /** @class */ (function () {
260207
this.PrivatePublic += 0;
261208
this.PrivateProtected += 0;
262209
this.PrivatePrivate += 0;
263-
};
264-
return Base;
265-
}());
266-
var Derived = /** @class */ (function (_super) {
267-
__extends(Derived, _super);
268-
function Derived() {
269-
return _super !== null && _super.apply(this, arguments) || this;
270210
}
271-
Derived.prototype.test2 = function () {
211+
}
212+
class Derived extends Base {
213+
test2() {
272214
this.PublicPublic = 0;
273215
this.PublicProtected = 0;
274216
this.PublicPrivate = 0;
@@ -296,9 +238,8 @@ var Derived = /** @class */ (function (_super) {
296238
this.PrivatePublic += 0;
297239
this.PrivateProtected += 0;
298240
this.PrivatePrivate += 0;
299-
};
300-
return Derived;
301-
}(Base));
241+
}
242+
}
302243
function fn() {
303244
base.PublicPublic = 0;
304245
base.PublicProtected = 0;

0 commit comments

Comments
 (0)