| Index: editor/util/plugins/com.google.dart.java2dart_test/src/com/google/dart/java2dart/SemanticTest.java
|
| diff --git a/editor/util/plugins/com.google.dart.java2dart_test/src/com/google/dart/java2dart/SemanticTest.java b/editor/util/plugins/com.google.dart.java2dart_test/src/com/google/dart/java2dart/SemanticTest.java
|
| index 5ecf348cce25b107fd79d7d5654aab5ca4cc0e91..34fb25541d43207cc5bc370f67c838e7c992dcd6 100644
|
| --- a/editor/util/plugins/com.google.dart.java2dart_test/src/com/google/dart/java2dart/SemanticTest.java
|
| +++ b/editor/util/plugins/com.google.dart.java2dart_test/src/com/google/dart/java2dart/SemanticTest.java
|
| @@ -76,7 +76,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " public static main() {",
|
| " final int myValue = 5;",
|
| " Test v = new Test(1, 2.3) {",
|
| - " int foo() {",
|
| + " public int foo() {",
|
| " return myValue;",
|
| " }",
|
| " };",
|
| @@ -147,7 +147,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public interface ErrorListener {",
|
| - " void onError();",
|
| + " public void onError();",
|
| "}"));
|
| setFileLines(
|
| "test/Test.java",
|
| @@ -158,7 +158,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " public static void main() {",
|
| " final boolean[] hasErrors = {false};",
|
| " ErrorListener v = new ErrorListener() {",
|
| - " void onError() {",
|
| + " public void onError() {",
|
| " hasErrors[0] = false;",
|
| " hasErrors[0] = true;",
|
| " }",
|
| @@ -198,7 +198,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public interface ErrorListener {",
|
| - " void onError();",
|
| + " public void onError();",
|
| "}"));
|
| setFileLines(
|
| "test/Test.java",
|
| @@ -207,10 +207,10 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "package test;",
|
| "public class Test {",
|
| " boolean hasErrors;",
|
| - " void foo() {};",
|
| - " void main() {",
|
| + " public void foo() {};",
|
| + " public void main() {",
|
| " ErrorListener v = new ErrorListener() {",
|
| - " void onError() {",
|
| + " public void onError() {",
|
| " foo();",
|
| " hasErrors = true;",
|
| " }",
|
| @@ -227,7 +227,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " void onError();",
|
| "}",
|
| "class Test {",
|
| - " bool hasErrors = false;",
|
| + " bool _hasErrors = false;",
|
| " void foo() {",
|
| " }",
|
| " void main() {",
|
| @@ -239,7 +239,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " ErrorListener_Test_main(this.Test_this);",
|
| " void onError() {",
|
| " Test_this.foo();",
|
| - " Test_this.hasErrors = true;",
|
| + " Test_this._hasErrors = true;",
|
| " }",
|
| "}"),
|
| getFormattedSource(unit));
|
| @@ -252,7 +252,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Main {",
|
| - " static void foo() {}",
|
| + " public static void foo() {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -261,7 +261,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Second {",
|
| - " static void bar() {",
|
| + " public static void bar() {",
|
| " Main.foo();",
|
| " }",
|
| "}",
|
| @@ -291,11 +291,11 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class A {",
|
| " public static class B {",
|
| - " B() {}",
|
| + " public B() {}",
|
| " }",
|
| - " void test1(B p) {}",
|
| - " void test2(A.B p) {}",
|
| - " void test3() {",
|
| + " public void test1(B p) {}",
|
| + " public void test2(A.B p) {}",
|
| + " public void test3() {",
|
| " new B();",
|
| " new A.B();",
|
| " }",
|
| @@ -328,7 +328,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| toString(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class S {",
|
| - " void outerMethod() {}",
|
| + " public void outerMethod() {}",
|
| "}"));
|
| setFileLines(
|
| "test/A.java",
|
| @@ -337,11 +337,11 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "public class A extends S {",
|
| " public class B {",
|
| " public B() {}",
|
| - " void test() {",
|
| + " public void test() {",
|
| " outerMethod();",
|
| " }",
|
| " }",
|
| - " B test2() {",
|
| + " public B test2() {",
|
| " return new B();",
|
| " }",
|
| "}"));
|
| @@ -376,18 +376,18 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class A {",
|
| " public class B {",
|
| - " void test() {",
|
| + " public void test() {",
|
| " A.this.outerField = 5;",
|
| " A.this.outerMethod();",
|
| " test3(A.this);",
|
| " }",
|
| " }",
|
| " int outerField;",
|
| - " void outerMethod() {}",
|
| - " B test2() {",
|
| + " public void outerMethod() {}",
|
| + " public B test2() {",
|
| " return new B();",
|
| " }",
|
| - " void test3(A) {",
|
| + " public void test3(A) {",
|
| " }",
|
| "}"));
|
| Context context = new Context();
|
| @@ -398,7 +398,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| assertEquals(
|
| toString(
|
| "class A {",
|
| - " int outerField = 0;",
|
| + " int _outerField = 0;",
|
| " void outerMethod() {",
|
| " }",
|
| " A_B test2() => new A_B(this);",
|
| @@ -409,7 +409,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " final A A_this;",
|
| " A_B(this.A_this);",
|
| " void test() {",
|
| - " A_this.outerField = 5;",
|
| + " A_this._outerField = 5;",
|
| " A_this.outerMethod();",
|
| " A_this.test3(A_this);",
|
| " }",
|
| @@ -424,11 +424,11 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class A {",
|
| " public class B {",
|
| - " void foo() {}",
|
| + " public void foo() {}",
|
| " }",
|
| - " void test(final B p) {",
|
| + " public void test(final B p) {",
|
| " return new Object() {",
|
| - " void main() {",
|
| + " public void main() {",
|
| " p.foo();",
|
| " }",
|
| " };",
|
| @@ -507,8 +507,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "class A {",
|
| "}",
|
| "class A_B {",
|
| - " static int ZERO = 0;",
|
| - " int getValue() => ZERO + 1;",
|
| + " static int _ZERO = 0;",
|
| + " int getValue() => _ZERO + 1;",
|
| "}"),
|
| getFormattedSource(unit));
|
| }
|
| @@ -521,8 +521,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "public class A {",
|
| " public interface B {",
|
| " }",
|
| - " void test1(B p) {}",
|
| - " A.B test2() {",
|
| + " public void test1(B p) {}",
|
| + " public A.B test2() {",
|
| " return new A.B() {};",
|
| " }",
|
| "}"));
|
| @@ -553,8 +553,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "public class A {",
|
| " public class B {",
|
| " }",
|
| - " void test1(B p) {}",
|
| - " A.B test2() {",
|
| + " public void test1(B p) {}",
|
| + " public A.B test2() {",
|
| " return new A.B() {};",
|
| " }",
|
| "}"));
|
| @@ -585,12 +585,12 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "public class A {",
|
| " public class B {",
|
| " public B(int p) {}",
|
| - " void test() {",
|
| + " public void test() {",
|
| " outerMethod();",
|
| " }",
|
| " }",
|
| - " void outerMethod() {}",
|
| - " B test2() {",
|
| + " public void outerMethod() {}",
|
| + " public B test2() {",
|
| " return new B(42);",
|
| " }",
|
| "}"));
|
| @@ -623,8 +623,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class A {",
|
| - " int foo;",
|
| - " static void foo() {}",
|
| + " public int foo;",
|
| + " public static void foo() {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -633,7 +633,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class B {",
|
| - " static void bar() {",
|
| + " public static void bar() {",
|
| " print(A.foo);",
|
| " }",
|
| "}",
|
| @@ -665,8 +665,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class A {",
|
| - " static void foo() {}",
|
| - " static void foo(int p) {}",
|
| + " public static void foo() {}",
|
| + " public static void foo(int p) {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -675,7 +675,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class B {",
|
| - " static void bar() {",
|
| + " public static void bar() {",
|
| " A.foo(42);",
|
| " }",
|
| "}",
|
| @@ -708,16 +708,16 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Test() {",
|
| + " public Test() {",
|
| " print(0);",
|
| " }",
|
| - " Test(int p) {",
|
| + " public Test(int p) {",
|
| " print(1);",
|
| " }",
|
| - " Test(double p) {",
|
| + " public Test(double p) {",
|
| " print(2);",
|
| " }",
|
| - " static void main() {",
|
| + " public static void main() {",
|
| " new Test();",
|
| " new Test(2);",
|
| " new Test(3.0);",
|
| @@ -760,16 +760,16 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Test() {",
|
| + " public Test() {",
|
| " print(0);",
|
| " }",
|
| - " Test(int p) {",
|
| + " public Test(int p) {",
|
| " print(1);",
|
| " }",
|
| - " Test(double p) {",
|
| + " public Test(double p) {",
|
| " print(2);",
|
| " }",
|
| - " static void main() {",
|
| + " public static void main() {",
|
| " new Test();",
|
| " new Test(2);",
|
| " new Test(3.0);",
|
| @@ -808,13 +808,13 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test<T> {",
|
| - " Test() {",
|
| + " public Test() {",
|
| " print(0);",
|
| " }",
|
| - " Test(int p) {",
|
| + " public Test(int p) {",
|
| " print(1);",
|
| " }",
|
| - " static void main() {",
|
| + " public static void main() {",
|
| " new Test<String>();",
|
| " new Test<String>(2);",
|
| " }",
|
| @@ -848,14 +848,14 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " boolean booleanF;",
|
| - " byte byteF;",
|
| - " char charF;",
|
| - " short shortF;",
|
| - " int intF;",
|
| - " long longF;",
|
| - " float floatF;",
|
| - " double doubleF;",
|
| + " public boolean booleanF;",
|
| + " public byte byteF;",
|
| + " public char charF;",
|
| + " public short shortF;",
|
| + " public int intF;",
|
| + " public long longF;",
|
| + " public float floatF;",
|
| + " public double doubleF;",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -885,7 +885,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "package test;",
|
| "public enum Test {",
|
| " EOF(5) {",
|
| - " void foo() {",
|
| + " public void foo() {",
|
| " print(2);",
|
| " }",
|
| " }, DEF;",
|
| @@ -893,7 +893,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " }",
|
| " private Test(int p) {",
|
| " }",
|
| - " void foo() {",
|
| + " public void foo() {",
|
| " print(1);",
|
| " }",
|
| "}"));
|
| @@ -1018,7 +1018,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| toString(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class A {",
|
| - " boolean testA(Class a, Class b) {",
|
| + " public boolean testA(Class a, Class b) {",
|
| " return a == b;",
|
| " }",
|
| "}"));
|
| @@ -1039,12 +1039,12 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static void main(String [] vars) {",
|
| + " public static void main(String [] vars) {",
|
| " for (String var: vars) {",
|
| " print(var);",
|
| " }",
|
| " }",
|
| - " static void print(String p) {}",
|
| + " public static void print(String p) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -1072,9 +1072,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " void in() {}",
|
| - " void with() {}",
|
| - " void with(int p) {}",
|
| + " public void in() {}",
|
| + " public void with() {}",
|
| + " public void with(int p) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -1101,13 +1101,13 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static void main() {",
|
| + " public static void main() {",
|
| " int in = 1;",
|
| " int with = 2;",
|
| " print(in);",
|
| " print(with);",
|
| " }",
|
| - " static void print(int p) {}",
|
| + " public static void print(int p) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -1138,7 +1138,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "import java.util.List;",
|
| "public class Test<T> {",
|
| " private List<T> elements;",
|
| - " void foo() {",
|
| + " public void foo() {",
|
| " elements.add(null);",
|
| " }",
|
| "}",
|
| @@ -1184,8 +1184,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| assertEquals(
|
| toString(
|
| "class Test {",
|
| - " int value2 = 0;",
|
| - " int value() => value2;",
|
| + " int _value = 0;",
|
| + " int value() => _value;",
|
| " void bar() {",
|
| " value();",
|
| " }",
|
| @@ -1236,10 +1236,10 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static void foo() {}",
|
| - " static void foo(int p) {}",
|
| - " static void foo(double p) {}",
|
| - " static void bar() {",
|
| + " public static void foo() {}",
|
| + " public static void foo(int p) {}",
|
| + " public static void foo(double p) {}",
|
| + " public static void bar() {",
|
| " foo(42);",
|
| " }",
|
| "}",
|
| @@ -1274,7 +1274,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static boolean equals(int a, int b) {",
|
| + " public static boolean equals(int a, int b) {",
|
| " return a < b;",
|
| " }",
|
| " public boolean equals(Object o) {",
|
| @@ -1302,9 +1302,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " void foo() {}",
|
| - " void foo(int p) {}",
|
| - " void foo(double p) {}",
|
| + " public void foo() {}",
|
| + " public void foo(int p) {}",
|
| + " public void foo(double p) {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -1313,9 +1313,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test2 extends Test {",
|
| - " void foo() {}",
|
| - " void foo(int p) {}",
|
| - " void foo(double p) {}",
|
| + " public void foo() {}",
|
| + " public void foo(int p) {}",
|
| + " public void foo(double p) {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -1324,9 +1324,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test3 extends Test2 {",
|
| - " void foo() {}",
|
| - " void foo(int p) {}",
|
| - " void foo(double p) {}",
|
| + " public void foo() {}",
|
| + " public void foo(int p) {}",
|
| + " public void foo(double p) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -1369,7 +1369,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " <E> E void foo(E p) {",
|
| + " <E> public E void foo(E p) {",
|
| " return null;",
|
| " }",
|
| "}",
|
| @@ -1380,10 +1380,10 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test2 extends Test {",
|
| - " int foo(int p) {",
|
| + " public int foo(int p) {",
|
| " return 0;",
|
| " }",
|
| - " void main() {",
|
| + " public void main() {",
|
| " foo(this);",
|
| " foo(42);",
|
| " }",
|
| @@ -1415,7 +1415,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Super {",
|
| - " static int add(int a, int b) {return a + b;}",
|
| + " public static int add(int a, int b) {return a + b;}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -1424,8 +1424,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Sub extends Super {",
|
| - " int add(int a) {return add(a, 2);}",
|
| - " void main() {",
|
| + " public int add(int a) {return add(a, 2);}",
|
| + " public void main() {",
|
| " add(1, 2);",
|
| " add(3);",
|
| " }",
|
| @@ -1467,9 +1467,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "package test;",
|
| "import static test.A.ZERO;",
|
| "public class B {",
|
| - " int myInstanceField;",
|
| - " static int myStaticField;",
|
| - " void main() {",
|
| + " public int myInstanceField;",
|
| + " public static int myStaticField;",
|
| + " public void main() {",
|
| " print(A.ZERO);",
|
| " print(ZERO);",
|
| " this.myInstanceField = 1;",
|
| @@ -1480,7 +1480,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| " myInstanceField = 1 + 2 + 3 + ZERO;",
|
| " myStaticField = 3;",
|
| " }",
|
| - " int main2() {",
|
| + " public int main2() {",
|
| " return ZERO;",
|
| " }",
|
| "}",
|
| @@ -1531,7 +1531,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "import static test.A.zero;",
|
| "public class B {",
|
| " public static int one() {return 1;}",
|
| - " void main() {",
|
| + " public void main() {",
|
| " print(A.zero());",
|
| " print(zero());",
|
| " print(one());",
|
| @@ -1568,7 +1568,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " void main() {",
|
| + " public void main() {",
|
| " Object res;",
|
| " res = new boolean[5];",
|
| " res = new byte[5];",
|
| @@ -1612,8 +1612,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int element;",
|
| - " void main() {",
|
| + " public int element;",
|
| + " public void main() {",
|
| " int v = this.element;",
|
| " int element = 42;",
|
| " }",
|
| @@ -1642,9 +1642,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int test;",
|
| + " private int test;",
|
| " int getTest() { return test; }",
|
| - " void main() {",
|
| + " public void main() {",
|
| " try {",
|
| " } catch (Exception test) {",
|
| " int v = getTest();",
|
| @@ -1679,9 +1679,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int test;",
|
| - " int getTest() { return test; }",
|
| - " void main(int test) {",
|
| + " private int test;",
|
| + " public int getTest() { return test; }",
|
| + " public void main(int test) {",
|
| " int v = getTest();",
|
| " int element = 42;",
|
| " }",
|
| @@ -1712,8 +1712,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int element;",
|
| - " void main() {",
|
| + " public int element;",
|
| + " public void main() {",
|
| " int v = element;",
|
| " int element = 42;",
|
| " }",
|
| @@ -1742,8 +1742,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " void element() {}",
|
| - " void main() {",
|
| + " public void element() {}",
|
| + " public void main() {",
|
| " element();",
|
| " int element = 42;",
|
| " }",
|
| @@ -1773,8 +1773,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static void element() {}",
|
| - " void main() {",
|
| + " public static void element() {}",
|
| + " public void main() {",
|
| " element();",
|
| " int element = 42;",
|
| " }",
|
| @@ -1797,6 +1797,55 @@ public class SemanticTest extends AbstractSemanticTest {
|
| getFormattedSource(unit));
|
| }
|
|
|
| + public void test_private_field() throws Exception {
|
| + setFileLines(
|
| + "test/Test.java",
|
| + toString(
|
| + "// filler filler filler filler filler filler filler filler filler filler",
|
| + "public class A {",
|
| + " private int field = 42;",
|
| + " public int foo() {",
|
| + " return field;",
|
| + " }",
|
| + "}"));
|
| + Context context = new Context();
|
| + context.addSourceFolder(tmpFolder);
|
| + context.addSourceFiles(tmpFolder);
|
| + // do translate
|
| + CompilationUnit unit = context.translate();
|
| + assertEquals(toString(//
|
| + "class A {",
|
| + " int _field = 42;",
|
| + " int foo() => _field;",
|
| + "}"), getFormattedSource(unit));
|
| + }
|
| +
|
| + public void test_private_method() throws Exception {
|
| + setFileLines(
|
| + "test/Test.java",
|
| + toString(
|
| + "// filler filler filler filler filler filler filler filler filler filler",
|
| + "public class A {",
|
| + " private void test() {}",
|
| + " private void foo() {",
|
| + " test();",
|
| + " }",
|
| + "}"));
|
| + Context context = new Context();
|
| + context.addSourceFolder(tmpFolder);
|
| + context.addSourceFiles(tmpFolder);
|
| + // do translate
|
| + CompilationUnit unit = context.translate();
|
| + assertEquals(toString(//
|
| + "class A {",
|
| + " void _test() {",
|
| + " }",
|
| + " void _foo() {",
|
| + " _test();",
|
| + " }",
|
| + "}"), getFormattedSource(unit));
|
| + }
|
| +
|
| public void test_redirectingConstructorInvocation() throws Exception {
|
| setFileLines(
|
| "test/Test.java",
|
| @@ -1838,7 +1887,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class B {",
|
| - " void main(A p) {",
|
| + " public void main(A p) {",
|
| " switch (p) {",
|
| " case ONE:",
|
| " print(1);",
|
| @@ -1925,7 +1974,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class A {",
|
| - " void test(int p) {}",
|
| + " public void test(int p) {}",
|
| "}",
|
| ""));
|
| setFileLines(
|
| @@ -1934,7 +1983,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class B extends A {",
|
| - " void test() {",
|
| + " public void test() {",
|
| " print(1);",
|
| " super.test(2);",
|
| " print(3);",
|
| @@ -1968,7 +2017,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Object foo = this;",
|
| + " public Object foo = this;",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -2001,7 +2050,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Object foo = this;",
|
| + " public Object foo = this;",
|
| " public Test(int p) {",
|
| " super(p);",
|
| " }",
|
| @@ -2032,8 +2081,8 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Object foo = this;",
|
| - " Object bar = this;",
|
| + " public Object foo = this;",
|
| + " public Object bar = this;",
|
| " public Test() {",
|
| " print(1);",
|
| " }",
|
| @@ -2071,7 +2120,7 @@ public class SemanticTest extends AbstractSemanticTest {
|
| toString(
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "public class Test {",
|
| - " void main() {",
|
| + " public void main() {",
|
| " try {",
|
| " } catch (Throwable e) {",
|
| " }",
|
| @@ -2133,9 +2182,9 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class A {",
|
| - " void test(int errorCode, Object ...args) {",
|
| + " public void test(int errorCode, Object ...args) {",
|
| " }",
|
| - " void main() {",
|
| + " public void main() {",
|
| " test(-1);",
|
| " test(-1, 2, 3.0);",
|
| " }",
|
| @@ -2164,10 +2213,10 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class A {",
|
| - " String[] EMPTY = {};",
|
| - " void test(String ...args) {",
|
| + " public String[] EMPTY = {};",
|
| + " public void test(String ...args) {",
|
| " }",
|
| - " void main() {",
|
| + " public void main() {",
|
| " test(EMPTY);",
|
| " }",
|
| "}"));
|
| @@ -2195,12 +2244,12 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " Test(String o, int ...args) {",
|
| + " public Test(String o, int ...args) {",
|
| " }",
|
| - " Test(int ...args) {",
|
| + " public Test(int ...args) {",
|
| " this(null, args);",
|
| " }",
|
| - " void main(int ...args) {",
|
| + " public void main(int ...args) {",
|
| " new Test(null, 1, 2, 3);",
|
| " new Test(1, 2, 3);",
|
| " new Test(null, args);",
|
| @@ -2267,17 +2316,17 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int foo() {return 42;}",
|
| - " int bar;",
|
| - " static void mainA() {",
|
| + " public int foo() {return 42;}",
|
| + " public int bar;",
|
| + " public static void mainA() {",
|
| " int foo = this.foo();",
|
| " process(foo);",
|
| " }",
|
| - " static void mainB() {",
|
| + " public static void mainB() {",
|
| " int bar = this.bar;",
|
| " process(bar);",
|
| " }",
|
| - " void process(int x) {}",
|
| + " public void process(int x) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -2310,16 +2359,16 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " static int foo() {return 42;}",
|
| - " static void barA() {",
|
| + " public static int foo() {return 42;}",
|
| + " public static void barA() {",
|
| " int foo = foo();",
|
| " baz(foo);",
|
| " }",
|
| - " static void barB() {",
|
| + " public static void barB() {",
|
| " int foo = foo();",
|
| " baz(foo);",
|
| " }",
|
| - " static void baz(int p) {}",
|
| + " public static void baz(int p) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
| @@ -2351,12 +2400,12 @@ public class SemanticTest extends AbstractSemanticTest {
|
| "// filler filler filler filler filler filler filler filler filler filler",
|
| "package test;",
|
| "public class Test {",
|
| - " int getFoo() {return 42;}",
|
| - " static void main() {",
|
| + " public int getFoo() {return 42;}",
|
| + " public static void main() {",
|
| " int foo = getFoo();",
|
| " process(foo);",
|
| " }",
|
| - " void process(int x) {}",
|
| + " public void process(int x) {}",
|
| "}",
|
| ""));
|
| Context context = new Context();
|
|
|