Skip to content

Commit 97a8a37

Browse files
committed
fix tests
1 parent dd221ae commit 97a8a37

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

tests/neg/alpha-override/B_1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Java
2-
public class B_1 extends A_1 {
2+
public class B_1 {
33
public int bar() {
44
return 2;
55
}

tests/neg/alpha-override/C_2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import annotation.alpha
22
class C extends B_1 { // error: Name clash between defined and inherited member
3-
@alpha("bar") override def foo(): Int = 3
3+
@alpha("bar") def foo(): Int = 3
44
}

tests/neg/alpha-override1/B_1.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Java
2+
public class B_1 {
3+
public int bar() {
4+
return 2;
5+
}
6+
}

tests/neg/alpha-override/D_3.scala renamed to tests/neg/alpha-override1/D_2.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import annotation.alpha
22
class D extends B_1 {
3-
@alpha("bar") def foo(): Int = 3 // error: needs override
3+
@alpha("bar") def foo(): Int = 3
44
}
55
class E extends B_1 {
66
@alpha("baz") override def bar(): Int = 3 // error: cannot have an @alpha annotation since external names would be different

0 commit comments

Comments
 (0)