Skip to content

Commit 15c5c77

Browse files
chrisbubernakchrisbubernak
committed
Fixing tests and baselines
1 parent 8286b67 commit 15c5c77

30 files changed

+283
-275
lines changed

‎tests/baselines/reference/bitwiseNotOperatorWithEnumType.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ enum ENUM1 { A, B, "" };
77
var ResultIsNumber1 = ~ENUM1;
88

99
// enum type expressions
10-
var ResultIsNumber2 = ~ENUM1[1];
11-
var ResultIsNumber3 = ~(ENUM1[1] + ENUM1[2]);
10+
var ResultIsNumber2 = ~ENUM1["A"];
11+
var ResultIsNumber3 = ~(ENUM1.A + ENUM1["B"]);
1212

1313
// multiple ~ operators
14-
var ResultIsNumber4 = ~~~(ENUM1[1] + ENUM1[2]);
14+
var ResultIsNumber4 = ~~~(ENUM1["A"] + ENUM1.B);
1515

1616
// miss assignment operators
1717
~ENUM1;
18-
~ENUM1[1];
19-
~ENUM1[1], ~ENUM1[2];
18+
~ENUM1["A"];
19+
~ENUM1.A, ~ENUM1["B"];
2020

2121
//// [bitwiseNotOperatorWithEnumType.js]
2222
// ~ operator on enum type
@@ -30,11 +30,11 @@ var ENUM1;
3030
// enum type var
3131
var ResultIsNumber1 = ~ENUM1;
3232
// enum type expressions
33-
var ResultIsNumber2 = ~ENUM1[1];
34-
var ResultIsNumber3 = ~(ENUM1[1] + ENUM1[2]);
33+
var ResultIsNumber2 = ~ENUM1["A"];
34+
var ResultIsNumber3 = ~(0 /* A */ + ENUM1["B"]);
3535
// multiple ~ operators
36-
var ResultIsNumber4 = ~~~(ENUM1[1] + ENUM1[2]);
36+
var ResultIsNumber4 = ~~~(ENUM1["A"] + 1 /* B */);
3737
// miss assignment operators
3838
~ENUM1;
39-
~ENUM1[1];
40-
~ENUM1[1], ~ENUM1[2];
39+
~ENUM1["A"];
40+
~0 /* A */, ~ENUM1["B"];

‎tests/baselines/reference/bitwiseNotOperatorWithEnumType.types

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,54 @@ var ResultIsNumber1 = ~ENUM1;
1313
>ENUM1 : typeof ENUM1
1414

1515
// enum type expressions
16-
var ResultIsNumber2 = ~ENUM1[1];
16+
var ResultIsNumber2 = ~ENUM1["A"];
1717
>ResultIsNumber2 : number
18-
>~ENUM1[1] : number
19-
>ENUM1[1] : string
18+
>~ENUM1["A"] : number
19+
>ENUM1["A"] : ENUM1
2020
>ENUM1 : typeof ENUM1
2121

22-
var ResultIsNumber3 = ~(ENUM1[1] + ENUM1[2]);
22+
var ResultIsNumber3 = ~(ENUM1.A + ENUM1["B"]);
2323
>ResultIsNumber3 : number
24-
>~(ENUM1[1] + ENUM1[2]) : number
25-
>(ENUM1[1] + ENUM1[2]) : string
26-
>ENUM1[1] + ENUM1[2] : string
27-
>ENUM1[1] : string
24+
>~(ENUM1.A + ENUM1["B"]) : number
25+
>(ENUM1.A + ENUM1["B"]) : number
26+
>ENUM1.A + ENUM1["B"] : number
27+
>ENUM1.A : ENUM1
2828
>ENUM1 : typeof ENUM1
29-
>ENUM1[2] : string
29+
>A : ENUM1
30+
>ENUM1["B"] : ENUM1
3031
>ENUM1 : typeof ENUM1
3132

3233
// multiple ~ operators
33-
var ResultIsNumber4 = ~~~(ENUM1[1] + ENUM1[2]);
34+
var ResultIsNumber4 = ~~~(ENUM1["A"] + ENUM1.B);
3435
>ResultIsNumber4 : number
35-
>~~~(ENUM1[1] + ENUM1[2]) : number
36-
>~~(ENUM1[1] + ENUM1[2]) : number
37-
>~(ENUM1[1] + ENUM1[2]) : number
38-
>(ENUM1[1] + ENUM1[2]) : string
39-
>ENUM1[1] + ENUM1[2] : string
40-
>ENUM1[1] : string
36+
>~~~(ENUM1["A"] + ENUM1.B) : number
37+
>~~(ENUM1["A"] + ENUM1.B) : number
38+
>~(ENUM1["A"] + ENUM1.B) : number
39+
>(ENUM1["A"] + ENUM1.B) : number
40+
>ENUM1["A"] + ENUM1.B : number
41+
>ENUM1["A"] : ENUM1
4142
>ENUM1 : typeof ENUM1
42-
>ENUM1[2] : string
43+
>ENUM1.B : ENUM1
4344
>ENUM1 : typeof ENUM1
45+
>B : ENUM1
4446

4547
// miss assignment operators
4648
~ENUM1;
4749
>~ENUM1 : number
4850
>ENUM1 : typeof ENUM1
4951

50-
~ENUM1[1];
51-
>~ENUM1[1] : number
52-
>ENUM1[1] : string
52+
~ENUM1["A"];
53+
>~ENUM1["A"] : number
54+
>ENUM1["A"] : ENUM1
5355
>ENUM1 : typeof ENUM1
5456

55-
~ENUM1[1], ~ENUM1[2];
56-
>~ENUM1[1], ~ENUM1[2] : number
57-
>~ENUM1[1] : number
58-
>ENUM1[1] : string
57+
~ENUM1.A, ~ENUM1["B"];
58+
>~ENUM1.A, ~ENUM1["B"] : number
59+
>~ENUM1.A : number
60+
>ENUM1.A : ENUM1
5961
>ENUM1 : typeof ENUM1
60-
>~ENUM1[2] : number
61-
>ENUM1[2] : string
62+
>A : ENUM1
63+
>~ENUM1["B"] : number
64+
>ENUM1["B"] : ENUM1
6265
>ENUM1 : typeof ENUM1
6366

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(6,25): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
2-
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(7,23): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
3-
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(10,3): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
1+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(7,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
42
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,1): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
3+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts(12,7): error TS2304: Cannot find name 'A'.
54

65

7-
==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts (4 errors) ====
6+
==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumType.ts (3 errors) ====
87
// -- operator on enum type
98

109
enum ENUM1 { A, B, "" };
1110

1211
// expression
13-
var ResultIsNumber1 = --ENUM1[1];
14-
~~~~~~~~
15-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
16-
var ResultIsNumber2 = ENUM1[1]--;
17-
~~~~~~~~
18-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
12+
var ResultIsNumber1 = --ENUM1["A"];
13+
var ResultIsNumber2 = ENUM1.A--;
14+
~~~~~~~
15+
!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
1916

2017
// miss assignment operator
21-
--ENUM1[1];
22-
~~~~~~~~
23-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
18+
--ENUM1["A"];
2419

25-
ENUM1[1]--;
20+
ENUM1[A]--;
2621
~~~~~~~~
27-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
22+
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
23+
~
24+
!!! error TS2304: Cannot find name 'A'.

‎tests/baselines/reference/decrementOperatorWithEnumType.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
enum ENUM1 { A, B, "" };
55

66
// expression
7-
var ResultIsNumber1 = --ENUM1[1];
8-
var ResultIsNumber2 = ENUM1[1]--;
7+
var ResultIsNumber1 = --ENUM1["A"];
8+
var ResultIsNumber2 = ENUM1.A--;
99

1010
// miss assignment operator
11-
--ENUM1[1];
11+
--ENUM1["A"];
1212

13-
ENUM1[1]--;
13+
ENUM1[A]--;
1414

1515
//// [decrementOperatorWithEnumType.js]
1616
// -- operator on enum type
@@ -22,8 +22,8 @@ var ENUM1;
2222
})(ENUM1 || (ENUM1 = {}));
2323
;
2424
// expression
25-
var ResultIsNumber1 = --ENUM1[1];
26-
var ResultIsNumber2 = ENUM1[1]--;
25+
var ResultIsNumber1 = --ENUM1["A"];
26+
var ResultIsNumber2 = 0 /* A */--;
2727
// miss assignment operator
28-
--ENUM1[1];
29-
ENUM1[1]--;
28+
--ENUM1["A"];
29+
ENUM1[A]--;

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOp
22
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(8,25): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
33
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(10,23): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
44
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(11,23): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
5-
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(14,25): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
6-
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(15,23): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
5+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(14,25): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
6+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(14,43): error TS2339: Property 'B' does not exist on type 'typeof ENUM'.
7+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(15,23): error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
8+
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(15,29): error TS2339: Property 'A' does not exist on type 'typeof ENUM'.
79
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(18,3): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
810
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(19,3): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
911
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(21,1): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
1012
tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts(22,1): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
1113

1214

13-
==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts (10 errors) ====
15+
==== tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOperatorWithEnumTypeInvalidOperations.ts (12 errors) ====
1416
// -- operator on enum type
1517

1618
enum ENUM { };
@@ -32,12 +34,16 @@ tests/cases/conformance/expressions/unaryOperators/decrementOperator/decrementOp
3234
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
3335

3436
// enum type expressions
35-
var ResultIsNumber5 = --(ENUM[1] + ENUM[2]);
36-
~~~~~~~~~~~~~~~~~~~
37-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
38-
var ResultIsNumber6 = (ENUM[1] + ENUM[2])--;
39-
~~~~~~~~~~~~~~~~~~~
40-
!!! error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type.
37+
var ResultIsNumber5 = --(ENUM["A"] + ENUM.B);
38+
~~~~~~~~~~~~~~~~~~~~
39+
!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
40+
~
41+
!!! error TS2339: Property 'B' does not exist on type 'typeof ENUM'.
42+
var ResultIsNumber6 = (ENUM.A + ENUM["B"])--;
43+
~~~~~~~~~~~~~~~~~~~~
44+
!!! error TS2357: The operand of an increment or decrement operator must be a variable, property or indexer.
45+
~
46+
!!! error TS2339: Property 'A' does not exist on type 'typeof ENUM'.
4147

4248
// miss assignment operator
4349
--ENUM;

‎tests/baselines/reference/decrementOperatorWithEnumTypeInvalidOperations.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ var ResultIsNumber3 = ENUM--;
1212
var ResultIsNumber4 = ENUM1--;
1313

1414
// enum type expressions
15-
var ResultIsNumber5 = --(ENUM[1] + ENUM[2]);
16-
var ResultIsNumber6 = (ENUM[1] + ENUM[2])--;
15+
var ResultIsNumber5 = --(ENUM["A"] + ENUM.B);
16+
var ResultIsNumber6 = (ENUM.A + ENUM["B"])--;
1717

1818
// miss assignment operator
1919
--ENUM;
@@ -41,8 +41,8 @@ var ResultIsNumber2 = --ENUM1;
4141
var ResultIsNumber3 = ENUM--;
4242
var ResultIsNumber4 = ENUM1--;
4343
// enum type expressions
44-
var ResultIsNumber5 = --(ENUM[1] + ENUM[2]);
45-
var ResultIsNumber6 = (ENUM[1] + ENUM[2])--;
44+
var ResultIsNumber5 = --(ENUM["A"] + ENUM.B);
45+
var ResultIsNumber6 = (ENUM.A + ENUM["B"])--;
4646
// miss assignment operator
4747
--ENUM;
4848
--ENUM1;

‎tests/baselines/reference/deleteOperatorWithEnumType.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ var ResultIsBoolean1 = delete ENUM;
99
var ResultIsBoolean2 = delete ENUM1;
1010

1111
// enum type expressions
12-
var ResultIsBoolean3 = delete ENUM1[0];
13-
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1[1]);
12+
var ResultIsBoolean3 = delete ENUM1["A"];
13+
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1["B"]);
1414

1515
// multiple delete operators
1616
var ResultIsBoolean5 = delete delete ENUM;
17-
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1[1]);
17+
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1["B"]);
1818

1919
// miss assignment operators
2020
delete ENUM;
2121
delete ENUM1;
22-
delete ENUM1[1];
22+
delete ENUM1.B;
2323
delete ENUM, ENUM1;
2424

2525
//// [deleteOperatorWithEnumType.js]
@@ -39,13 +39,13 @@ var ENUM1;
3939
var ResultIsBoolean1 = delete ENUM;
4040
var ResultIsBoolean2 = delete ENUM1;
4141
// enum type expressions
42-
var ResultIsBoolean3 = delete ENUM1[0];
43-
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1[1]);
42+
var ResultIsBoolean3 = delete ENUM1["A"];
43+
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1["B"]);
4444
// multiple delete operators
4545
var ResultIsBoolean5 = delete delete ENUM;
46-
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1[1]);
46+
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1["B"]);
4747
// miss assignment operators
4848
delete ENUM;
4949
delete ENUM1;
50-
delete ENUM1[1];
50+
delete 1 /* B */;
5151
delete ENUM, ENUM1;

‎tests/baselines/reference/deleteOperatorWithEnumType.types

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ var ResultIsBoolean2 = delete ENUM1;
2121
>ENUM1 : typeof ENUM1
2222

2323
// enum type expressions
24-
var ResultIsBoolean3 = delete ENUM1[0];
24+
var ResultIsBoolean3 = delete ENUM1["A"];
2525
>ResultIsBoolean3 : boolean
26-
>delete ENUM1[0] : boolean
27-
>ENUM1[0] : string
26+
>delete ENUM1["A"] : boolean
27+
>ENUM1["A"] : ENUM1
2828
>ENUM1 : typeof ENUM1
2929

30-
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1[1]);
30+
var ResultIsBoolean4 = delete (ENUM[0] + ENUM1["B"]);
3131
>ResultIsBoolean4 : boolean
32-
>delete (ENUM[0] + ENUM1[1]) : boolean
33-
>(ENUM[0] + ENUM1[1]) : string
34-
>ENUM[0] + ENUM1[1] : string
32+
>delete (ENUM[0] + ENUM1["B"]) : boolean
33+
>(ENUM[0] + ENUM1["B"]) : string
34+
>ENUM[0] + ENUM1["B"] : string
3535
>ENUM[0] : string
3636
>ENUM : typeof ENUM
37-
>ENUM1[1] : string
37+
>ENUM1["B"] : ENUM1
3838
>ENUM1 : typeof ENUM1
3939

4040
// multiple delete operators
@@ -44,16 +44,16 @@ var ResultIsBoolean5 = delete delete ENUM;
4444
>delete ENUM : boolean
4545
>ENUM : typeof ENUM
4646

47-
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1[1]);
47+
var ResultIsBoolean6 = delete delete delete (ENUM[0] + ENUM1["B"]);
4848
>ResultIsBoolean6 : boolean
49-
>delete delete delete (ENUM[0] + ENUM1[1]) : boolean
50-
>delete delete (ENUM[0] + ENUM1[1]) : boolean
51-
>delete (ENUM[0] + ENUM1[1]) : boolean
52-
>(ENUM[0] + ENUM1[1]) : string
53-
>ENUM[0] + ENUM1[1] : string
49+
>delete delete delete (ENUM[0] + ENUM1["B"]) : boolean
50+
>delete delete (ENUM[0] + ENUM1["B"]) : boolean
51+
>delete (ENUM[0] + ENUM1["B"]) : boolean
52+
>(ENUM[0] + ENUM1["B"]) : string
53+
>ENUM[0] + ENUM1["B"] : string
5454
>ENUM[0] : string
5555
>ENUM : typeof ENUM
56-
>ENUM1[1] : string
56+
>ENUM1["B"] : ENUM1
5757
>ENUM1 : typeof ENUM1
5858

5959
// miss assignment operators
@@ -65,10 +65,11 @@ delete ENUM1;
6565
>delete ENUM1 : boolean
6666
>ENUM1 : typeof ENUM1
6767

68-
delete ENUM1[1];
69-
>delete ENUM1[1] : boolean
70-
>ENUM1[1] : string
68+
delete ENUM1.B;
69+
>delete ENUM1.B : boolean
70+
>ENUM1.B : ENUM1
7171
>ENUM1 : typeof ENUM1
72+
>B : ENUM1
7273

7374
delete ENUM, ENUM1;
7475
>delete ENUM, ENUM1 : typeof ENUM1

0 commit comments

Comments
 (0)