Skip to content

Commit 6ccabea

Browse files
committed
Fix tests to new scheme
1 parent c0b6b0f commit 6ccabea

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

Diff for: tests/pos-java-interop-separate/i6868/MyScala_2.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@MyJava_1("MyScala1", typeA = MyJava_1.MyClassTypeA.B)
1+
@MyJava_1(value = "MyScala1", typeA = MyJava_1.MyClassTypeA.B)
22
object MyScala {
33
def a(mj: MyJava_1): Unit = {
44
println("MyJava")

Diff for: tests/pos/i6151/Test.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import Expect.*
2-
@Outcome(ExpectVal)
2+
@Outcome(enm = ExpectVal)
33
class SimpleTest

Diff for: tests/run-macros/i19951-java-annotations-tasty-compat-2/ScalaUser_1.scala

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
class ScalaUser {
2-
@JavaAnnot(5)
3-
def f1(): Int = 1
42

53
@JavaAnnot(a = 5)
64
def f2(): Int = 1
75

8-
@JavaAnnot(5, "foo")
6+
@JavaAnnot(a = 5, b = "foo")
97
def f3(): Int = 1
108

11-
@JavaAnnot(5, "foo", 3)
12-
def f4(): Int = 1
13-
14-
@JavaAnnot(5, c = 3)
9+
@JavaAnnot(a = 5, c = 3)
1510
def f5(): Int = 1
1611

17-
@JavaAnnot(5, c = 3, b = "foo")
12+
@JavaAnnot(a = 5, c = 3, b = "foo")
1813
def f6(): Int = 1
1914

2015
@JavaAnnot(b = "foo", c = 3, a = 5)

Diff for: tests/run-macros/i19951-java-annotations-tasty-compat.check

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ScalaUser:
22
new JavaAnnot(c = _, a = 5, d = _, b = _)
3-
new JavaAnnot(c = _, a = 5, d = _, b = _)
43
new JavaAnnot(c = _, a = 5, d = _, b = "foo")
54
new JavaAnnot(c = 3, a = 5, d = _, b = "foo")
65
new JavaAnnot(c = 3, a = 5, d = _, b = _)

Diff for: tests/run-macros/i19951-java-annotations-tasty-compat/ScalaUser_2.scala

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
class ScalaUser {
2-
@JavaAnnot(5)
3-
def f1(): Int = 1
42

53
@JavaAnnot(a = 5)
64
def f2(): Int = 1
75

8-
@JavaAnnot(5, "foo")
6+
@JavaAnnot(a = 5, b = "foo")
97
def f3(): Int = 1
108

11-
@JavaAnnot(5, "foo", 3)
9+
@JavaAnnot(a = 5, b = "foo", c = 3)
1210
def f4(): Int = 1
1311

14-
@JavaAnnot(5, c = 3)
12+
@JavaAnnot(a = 5, c = 3)
1513
def f5(): Int = 1
1614

17-
@JavaAnnot(5, c = 3, b = "foo")
15+
@JavaAnnot(a = 5, c = 3, b = "foo")
1816
def f6(): Int = 1
1917

2018
@JavaAnnot(b = "foo", c = 3, a = 5)

0 commit comments

Comments
 (0)