test/tools/sjavac/SJavac.java
Print this page
@@ -93,19 +93,19 @@
void initialCompile() throws Exception {
System.out.println("\nInitial compile of gensrc.");
System.out.println("----------------------------");
populate(gensrc,
- "alfa/AINT.java",
- "package alfa; public interface AINT { void aint(); }",
+ "alfa/omega/AINT.java",
+ "package alfa.omega; public interface AINT { void aint(); }",
- "alfa/A.java",
- "package alfa; public class A implements AINT { "+
+ "alfa/omega/A.java",
+ "package alfa.omega; public class A implements AINT { "+
"public final static int DEFINITION = 17; public void aint() { } }",
- "alfa/AA.java",
- "package alfa;"+
+ "alfa/omega/AA.java",
+ "package alfa.omega;"+
"// A package private class, not contributing to the public api.\n"+
"class AA {"+
" // A properly nested static inner class.\n"+
" static class AAA { }\n"+
" // A properly nested inner class.\n"+
@@ -125,11 +125,11 @@
"beta/BINT.java",
"package beta;public interface BINT { void foo(); }",
"beta/B.java",
- "package beta; import alfa.A; public class B {"+
+ "package beta; import alfa.omega.A; public class B {"+
"private int b() { return A.DEFINITION; } native void foo(); }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
previous_bin_state = collectState(bin);
@@ -149,20 +149,20 @@
void incrementalCompileDroppingClasses() throws Exception {
System.out.println("\nTesting that deleting AA.java deletes all");
System.out.println("generated inner class as well as AA.class");
System.out.println("-----------------------------------------");
- removeFrom(gensrc, "alfa/AA.java");
+ removeFrom(gensrc, "alfa/omega/AA.java");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenRemoved(previous_bin_state, new_bin_state,
- "bin/alfa/AA$1.class",
- "bin/alfa/AA$AAAA.class",
- "bin/alfa/AA$AAA.class",
- "bin/alfa/AAAAA.class",
- "bin/alfa/AA.class");
+ "bin/alfa/omega/AA$1.class",
+ "bin/alfa/omega/AA$AAAA.class",
+ "bin/alfa/omega/AA$AAA.class",
+ "bin/alfa/omega/AAAAA.class",
+ "bin/alfa/omega/AA.class");
previous_bin_state = new_bin_state;
Map<String,Long> new_headers_state = collectState(headers);
verifyEqual(previous_headers_state, new_headers_state);
}
@@ -173,21 +173,21 @@
System.out.println("not only of alfa, but also beta.");
System.out.println("But check that the generated native header was not updated!");
System.out.println("Since we did not modify the native api of B.");
System.out.println("-------------------------------------------------------------");
- populate(gensrc,"alfa/A.java",
- "package alfa; public class A implements AINT { "+
+ populate(gensrc,"alfa/omega/A.java",
+ "package alfa.omega; public class A implements AINT { "+
"public final static int DEFINITION = 18; public void aint() { } private void foo() { } }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
Map<String,Long> new_bin_state = collectState(bin);
verifyNewerFiles(previous_bin_state, new_bin_state,
- "bin/alfa/A.class",
- "bin/alfa/AINT.class",
+ "bin/alfa/omega/A.class",
+ "bin/alfa/omega/AINT.class",
"bin/beta/B.class",
"bin/beta/BINT.class",
"bin/javac_state");
previous_bin_state = new_bin_state;
@@ -200,11 +200,11 @@
System.out.println("ie it has no longer any methods!");
System.out.println("Verify that beta_B.h is removed!");
System.out.println("---------------------------------------------------------");
populate(gensrc,"beta/B.java",
- "package beta; import alfa.A; public class B {"+
+ "package beta; import alfa.omega.A; public class B {"+
"private int b() { return A.DEFINITION; } }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
Map<String,Long> new_bin_state = collectState(bin);
@@ -224,11 +224,11 @@
System.out.println("\nNow update the B.java file with a final static annotated with @Native.");
System.out.println("Verify that beta_B.h is added again!");
System.out.println("------------------------------------------------------------------------");
populate(gensrc,"beta/B.java",
- "package beta; import alfa.A; public class B {"+
+ "package beta; import alfa.omega.A; public class B {"+
"private int b() { return A.DEFINITION; } "+
"@java.lang.annotation.Native final static int alfa = 42; }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
@@ -250,11 +250,11 @@
" annotated with @Native.");
System.out.println("Verify that beta_B.h is rewritten again!");
System.out.println("-------------------------------------------------------------------");
populate(gensrc,"beta/B.java",
- "package beta; import alfa.A; public class B {"+
+ "package beta; import alfa.omega.A; public class B {"+
"private int b() { return A.DEFINITION; } "+
"@java.lang.annotation.Native final static int alfa = 43; }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false", "--log=debug");
@@ -280,12 +280,12 @@
delete(gensrc);
delete(gensrc2);
delete(bin);
previous_bin_state = collectState(bin);
- populate(gensrc,"alfa/A.java",
- "package alfa; import beta.B; import gamma.C; public class A { B b; C c; }",
+ populate(gensrc,"alfa/omega/A.java",
+ "package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }",
"beta/B.java",
"package beta; public class B { broken",
"gamma/C.java",
"package gamma; public class C { }");
@@ -295,11 +295,11 @@
compile("-x", "beta", "gensrc", "gensrc2", "-d", "bin", "-h", "headers", "-j", "1",
"--server:portfile=testserver,background=false");
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
- "bin/alfa/A.class",
+ "bin/alfa/omega/A.class",
"bin/beta/B.class",
"bin/gamma/C.class",
"bin/javac_state");
System.out.println("----- Compile with exluded beta went well!");
@@ -323,12 +323,12 @@
delete(gensrc2);
delete(gensrc3);
delete(bin);
previous_bin_state = collectState(bin);
- populate(gensrc,"alfa/A.java",
- "package alfa; import beta.B; import gamma.C; public class A { B b; C c; }");
+ populate(gensrc,"alfa/omega/A.java",
+ "package alfa.omega; import beta.B; import gamma.C; public class A { B b; C c; }");
populate(gensrc2,"beta/B.java",
"package beta; public class B { broken",
"gamma/C.java",
"package gamma; public class C { }");
populate(gensrc3, "beta/B.java",
@@ -339,11 +339,11 @@
"--server:portfile=testserver,background=false");
System.out.println("The first compile went well!");
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
- "bin/alfa/A.class",
+ "bin/alfa/omega/A.class",
"bin/javac_state");
System.out.println("----- Compile with exluded beta went well!");
delete(bin);
compileExpectFailure("gensrc", "-sourcepath", "gensrc2", "-sourcepath", "gensrc3",
@@ -363,22 +363,22 @@
delete(gensrc2);
delete(gensrc3);
delete(bin);
previous_bin_state = collectState(bin);
- populate(gensrc,"alfa/A.java",
- "package alfa; public class A { beta.B b; }",
+ populate(gensrc,"alfa/omega/A.java",
+ "package alfa.omega; public class A { beta.B b; }",
"beta/B.java",
"package beta; public class B { gamma.C c; }",
"gamma/C.java",
- "package gamma; public class C { alfa.A a; }");
+ "package gamma; public class C { alfa.omega.A a; }");
compile("gensrc", "-d", "bin", "-h", "headers", "-j", "3",
"--server:portfile=testserver,background=false","--log=debug");
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
- "bin/alfa/A.class",
+ "bin/alfa/omega/A.class",
"bin/beta/B.class",
"bin/gamma/C.class",
"bin/javac_state");
delete(bin);
}
@@ -394,21 +394,21 @@
delete(gensrc);
delete(bin);
previous_bin_state = collectState(bin);
populate(gensrc,
- "alfa/A.java",
- "package alfa; public class A { beta.B b; }",
+ "alfa/omega/A.java",
+ "package alfa.omega; public class A { beta.B b; }",
"beta/B.java",
"package beta; public class B { }");
- compile("-x", "beta", "-src", "gensrc", "-x", "alfa", "-sourcepath", "gensrc",
+ compile("-x", "beta", "-src", "gensrc", "-x", "alfa/omega", "-sourcepath", "gensrc",
"-d", "bin", "--server:portfile=testserver,background=false");
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
- "bin/alfa/A.class",
+ "bin/alfa/omega/A.class",
"bin/javac_state");
}
void removeFrom(Path dir, String... args) throws IOException {
for (String filename : args) {