Skip to content

Commit ce8ce43

Browse files
committed
Update tests and checkfiles after impl class removal
``` Selected 36 tests drawn from previously failed tests ok 1 - pos/S1.scala ok 2 - pos/NoCyclicReference.scala ok 3 - pos/A.scala ok 4 - pos/S3.scala ok 5 - pos/FPTest.scala ok 6 - pos/List1.scala !! 7 - pos/val_infer.scala [compilation failed] !! 8 - pos/t6780.scala [compilation failed] ok 9 - pos/MailBox.scala ok 10 - pos/CustomGlobal.scala !! 1 - neg/t2796.scala [compilation failed] !! 2 - neg/val_sig_infer_struct.scala [expected compilation failure] !! 3 - neg/val_sig_infer_match.scala [expected compilation failure] !! 4 - neg/t5148.scala [output differs] !! 1 - run/preinits.scala [compilation failed] !! 2 - run/elidable-opt.scala [non-zero exit code] !! 3 - run/elidable.scala [non-zero exit code] !! 4 - run/t0936.scala [non-zero exit code] !! 5 - run/parmap-ops.scala [non-zero exit code] !! 6 - run/bugs.scala [output differs] !! 7 - run/reflection-implClass.scala [non-zero exit code] !! 8 - run/synchronized.scala [non-zero exit code] !! 9 - run/t5652 [non-zero exit code] !! 10 - run/t4891 [output differs] !! 11 - run/t4813.scala [non-zero exit code] !! 12 - run/t7700.scala [output differs] !! 13 - run/t8199.scala [non-zero exit code] !! 14 - run/sbt-icode-interface.scala [output differs] !! 15 - run/trait_fields_bytecode.scala [output differs] !! 16 - run/trait-renaming [non-zero exit code] !! 17 - run/t6733.scala [output differs] !! 18 - run/trait_fields_final.scala [output differs] !! 19 - run/trait_fields_volatile.scala [output differs] !! 20 - run/t8549.scala [non-zero exit code] !! 21 - run/t6028.scala [output differs] !! 1 - jvm/innerClassAttribute [non-zero exit code] test/partest --update-check \ /Users/jason/code/scala/test/files/pos/t6780.scala \ /Users/jason/code/scala/test/files/pos/val_infer.scala \ /Users/jason/code/scala/test/files/neg/t2796.scala \ /Users/jason/code/scala/test/files/neg/t5148.scala \ /Users/jason/code/scala/test/files/neg/val_sig_infer_match.scala \ /Users/jason/code/scala/test/files/neg/val_sig_infer_struct.scala \ /Users/jason/code/scala/test/files/run/bugs.scala \ /Users/jason/code/scala/test/files/run/elidable-opt.scala \ /Users/jason/code/scala/test/files/run/elidable.scala \ /Users/jason/code/scala/test/files/run/parmap-ops.scala \ /Users/jason/code/scala/test/files/run/preinits.scala \ /Users/jason/code/scala/test/files/run/reflection-implClass.scala \ /Users/jason/code/scala/test/files/run/sbt-icode-interface.scala \ /Users/jason/code/scala/test/files/run/synchronized.scala \ /Users/jason/code/scala/test/files/run/t0936.scala \ /Users/jason/code/scala/test/files/run/t4813.scala \ /Users/jason/code/scala/test/files/run/t4891 \ /Users/jason/code/scala/test/files/run/t5652 \ /Users/jason/code/scala/test/files/run/t6028.scala \ /Users/jason/code/scala/test/files/run/t6733.scala \ /Users/jason/code/scala/test/files/run/t7700.scala \ /Users/jason/code/scala/test/files/run/t8199.scala \ /Users/jason/code/scala/test/files/run/t8549.scala \ /Users/jason/code/scala/test/files/run/trait-renaming \ /Users/jason/code/scala/test/files/run/trait_fields_bytecode.scala \ /Users/jason/code/scala/test/files/run/trait_fields_final.scala \ /Users/jason/code/scala/test/files/run/trait_fields_volatile.scala \ /Users/jason/code/scala/test/files/jvm/innerClassAttribute ```
1 parent 8d39f7e commit ce8ce43

File tree

5 files changed

+39
-42
lines changed

5 files changed

+39
-42
lines changed
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#partest !avian
21
true
32
Method call statistics:
43
1 Foo1.<init>()V
@@ -7,8 +6,5 @@ Method call statistics:
76
1 instrumented/Foo2.someMethod()I
87
1 scala/DeprecatedConsole.<init>()V
98
1 scala/Predef$.println(Ljava/lang/Object;)V
10-
1 scala/io/AnsiColor$class.$init$(Lscala/io/AnsiColor;)V
9+
1 scala/io/AnsiColor.$init$()V
1110
1 scala/runtime/BoxesRunTime.boxToBoolean(Z)Ljava/lang/Boolean;
12-
#partest avian
13-
!!!TEST SKIPPED!!!
14-
Instrumentation is not supported on Avian.

test/files/jvm/javaReflection.check

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,7 @@ AT$D$ / AT.D$ (canon) / D$ (simple)
162162
- declared cls: List()
163163
- enclosing : interface AT (declaring cls) / interface AT (cls) / null (constr) / null (meth)
164164
- properties : false (local) / true (member)
165-
AT$class / AT$class (canon) / AT$class (simple)
166-
- declared cls: List()
167-
- enclosing : null (declaring cls) / null (cls) / null (constr) / null (meth)
168-
- properties : false (local) / false (member)
169165
T / T (canon) / T (simple)
170166
- declared cls: List()
171167
- enclosing : null (declaring cls) / null (cls) / null (constr) / null (meth)
172168
- properties : false (local) / false (member)
173-
T$class / T$class (canon) / T$class (simple)
174-
- declared cls: List()
175-
- enclosing : null (declaring cls) / null (cls) / null (constr) / null (meth)
176-
- properties : false (local) / false (member)

test/files/run/analyzerPlugins.check

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ lub(List(Int @testAnn, Int)) [1]
2121
pluginsPt(?, Trees$Annotated) [7]
2222
pluginsPt(?, Trees$Apply) [11]
2323
pluginsPt(?, Trees$ApplyImplicitView) [2]
24-
pluginsPt(?, Trees$Assign) [7]
2524
pluginsPt(?, Trees$Block) [4]
2625
pluginsPt(?, Trees$ClassDef) [2]
2726
pluginsPt(?, Trees$DefDef) [14]
@@ -31,9 +30,9 @@ pluginsPt(?, Trees$Literal) [16]
3130
pluginsPt(?, Trees$New) [5]
3231
pluginsPt(?, Trees$PackageDef) [1]
3332
pluginsPt(?, Trees$Return) [1]
34-
pluginsPt(?, Trees$Select) [50]
33+
pluginsPt(?, Trees$Select) [43]
3534
pluginsPt(?, Trees$Super) [2]
36-
pluginsPt(?, Trees$This) [20]
35+
pluginsPt(?, Trees$This) [13]
3736
pluginsPt(?, Trees$TypeApply) [3]
3837
pluginsPt(?, Trees$TypeBoundsTree) [2]
3938
pluginsPt(?, Trees$TypeDef) [1]
@@ -47,23 +46,19 @@ pluginsPt(Boolean @testAnn, Trees$Literal) [1]
4746
pluginsPt(Boolean @testAnn, Trees$Select) [1]
4847
pluginsPt(Boolean, Trees$Apply) [1]
4948
pluginsPt(Boolean, Trees$Ident) [1]
50-
pluginsPt(Boolean, Trees$Literal) [1]
5149
pluginsPt(Double, Trees$Select) [1]
5250
pluginsPt(Int @testAnn, Trees$Literal) [1]
5351
pluginsPt(Int, Trees$Apply) [1]
54-
pluginsPt(Int, Trees$Ident) [2]
55-
pluginsPt(Int, Trees$If) [1]
56-
pluginsPt(Int, Trees$Literal) [5]
52+
pluginsPt(Int, Trees$Ident) [1]
53+
pluginsPt(Int, Trees$Literal) [4]
5754
pluginsPt(Int, Trees$Select) [3]
58-
pluginsPt(List, Trees$Apply) [1]
5955
pluginsPt(List[Any], Trees$Select) [1]
6056
pluginsPt(String @testAnn, Trees$Select) [1]
6157
pluginsPt(String, Trees$Apply) [1]
6258
pluginsPt(String, Trees$Block) [2]
63-
pluginsPt(String, Trees$Ident) [4]
59+
pluginsPt(String, Trees$Ident) [3]
6460
pluginsPt(String, Trees$Literal) [1]
6561
pluginsPt(String, Trees$Select) [1]
66-
pluginsPt(String, Trees$Typed) [1]
6762
pluginsPt(Unit, Trees$Assign) [1]
6863
pluginsPt(testAnn, Trees$Apply) [5]
6964
pluginsTypeSig(<none>, Trees$Template) [2]
@@ -119,7 +114,7 @@ pluginsTyped(=> Int, Trees$TypeApply) [1]
119114
pluginsTyped(=> String @testAnn, Trees$Select) [1]
120115
pluginsTyped(A, Trees$Apply) [1]
121116
pluginsTyped(A, Trees$Ident) [2]
122-
pluginsTyped(A, Trees$This) [8]
117+
pluginsTyped(A, Trees$This) [1]
123118
pluginsTyped(A, Trees$TypeTree) [4]
124119
pluginsTyped(A.super.type, Trees$Super) [1]
125120
pluginsTyped(A.this.type, Trees$This) [11]
@@ -128,25 +123,23 @@ pluginsTyped(AnyRef, Trees$Select) [4]
128123
pluginsTyped(Array[Any], Trees$ArrayValue) [1]
129124
pluginsTyped(Boolean @testAnn, Trees$Select) [1]
130125
pluginsTyped(Boolean @testAnn, Trees$TypeTree) [4]
131-
pluginsTyped(Boolean(false), Trees$Literal) [2]
126+
pluginsTyped(Boolean(false), Trees$Literal) [1]
132127
pluginsTyped(Boolean, Trees$Apply) [1]
133-
pluginsTyped(Boolean, Trees$Select) [4]
128+
pluginsTyped(Boolean, Trees$Select) [3]
134129
pluginsTyped(Char('c'), Trees$Literal) [2]
135130
pluginsTyped(Double, Trees$Apply) [3]
136131
pluginsTyped(Double, Trees$Select) [6]
137132
pluginsTyped(Int @testAnn, Trees$TypeTree) [2]
138133
pluginsTyped(Int @testAnn, Trees$Typed) [2]
139-
pluginsTyped(Int(0), Trees$Literal) [3]
134+
pluginsTyped(Int(0), Trees$Literal) [2]
140135
pluginsTyped(Int(1) @testAnn, Trees$Typed) [1]
141136
pluginsTyped(Int(1), Trees$Literal) [8]
142137
pluginsTyped(Int(2), Trees$Literal) [1]
143138
pluginsTyped(Int, Trees$Apply) [1]
144-
pluginsTyped(Int, Trees$Ident) [2]
145-
pluginsTyped(Int, Trees$If) [2]
146-
pluginsTyped(Int, Trees$Select) [15]
139+
pluginsTyped(Int, Trees$Ident) [1]
140+
pluginsTyped(Int, Trees$If) [1]
141+
pluginsTyped(Int, Trees$Select) [12]
147142
pluginsTyped(Int, Trees$TypeTree) [13]
148-
pluginsTyped(List, Trees$Apply) [1]
149-
pluginsTyped(List, Trees$Select) [1]
150143
pluginsTyped(List[Any], Trees$Apply) [1]
151144
pluginsTyped(List[Any], Trees$Select) [1]
152145
pluginsTyped(List[Any], Trees$TypeTree) [3]
@@ -159,15 +152,13 @@ pluginsTyped(String(""), Trees$Literal) [2]
159152
pluginsTyped(String("huhu"), Trees$Literal) [1]
160153
pluginsTyped(String("str") @testAnn, Trees$Typed) [1]
161154
pluginsTyped(String("str"), Trees$Literal) [1]
162-
pluginsTyped(String("str"), Trees$Typed) [1]
163155
pluginsTyped(String("two"), Trees$Literal) [2]
164156
pluginsTyped(String, Trees$Apply) [2]
165157
pluginsTyped(String, Trees$Block) [2]
166-
pluginsTyped(String, Trees$Ident) [1]
167-
pluginsTyped(String, Trees$Select) [9]
158+
pluginsTyped(String, Trees$Select) [7]
168159
pluginsTyped(String, Trees$TypeTree) [7]
169160
pluginsTyped(Unit, Trees$Apply) [2]
170-
pluginsTyped(Unit, Trees$Assign) [8]
161+
pluginsTyped(Unit, Trees$Assign) [1]
171162
pluginsTyped(Unit, Trees$Block) [4]
172163
pluginsTyped(Unit, Trees$If) [1]
173164
pluginsTyped(Unit, Trees$Literal) [5]

test/files/run/mixin-signatures.check

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,30 @@ class Test$bar5$ {
4848
public java.lang.Object Test$bar5$.h(java.lang.Object)
4949
}
5050

51-
class Foo1$class {
52-
public static java.lang.String Foo1$class.f(Foo1,java.lang.Object)
51+
interface Foo1 {
52+
public abstract java.lang.Object Base.f(java.lang.Object)
53+
generic: public abstract R Base.f(T)
54+
public default java.lang.String Foo1.f(java.lang.Object)
55+
generic: public default java.lang.String Foo1.f(T)
56+
public abstract java.lang.Object Base.g(java.lang.Object)
57+
generic: public abstract R Base.g(T)
58+
public abstract java.lang.String Foo1.g(java.lang.Object)
59+
generic: public abstract java.lang.String Foo1.g(T)
60+
public default java.lang.Object Base.h(java.lang.Object)
61+
generic: public default R Base.h(T)
5362
}
5463

55-
class Foo2$class {
56-
public static java.lang.Object Foo2$class.f(Foo2,java.lang.String)
64+
interface Foo2 {
65+
public abstract java.lang.Object Base.f(java.lang.Object)
66+
generic: public abstract R Base.f(T)
67+
public default java.lang.Object Foo2.f(java.lang.String)
68+
generic: public default R Foo2.f(java.lang.String)
69+
public abstract java.lang.Object Base.g(java.lang.Object)
70+
generic: public abstract R Base.g(T)
71+
public abstract java.lang.Object Foo2.g(java.lang.String)
72+
generic: public abstract R Foo2.g(java.lang.String)
73+
public default java.lang.Object Base.h(java.lang.Object)
74+
generic: public default R Base.h(T)
5775
}
5876

5977
000000000000000000000000000000000000

test/files/run/mixin-signatures.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ object Test {
9999

100100
def main(args: Array[String]): Unit = {
101101
List(bar1, bar2, bar3, bar4, bar5) foreach show
102-
List("Foo1$class", "Foo2$class") foreach show
102+
List("Foo1", "Foo2") foreach show
103103
println(go)
104104
}
105-
}
105+
}

0 commit comments

Comments
 (0)