diff options
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java | 6 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java index d2b09def2..fe3e463b2 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java @@ -671,8 +671,10 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc /** init only on initial batch compile? no file-specific options */ private void initBcelWorld(IMessageHandler handler) throws IOException { - List cp = buildConfig.getBootclasspath(); - cp.addAll(buildConfig.getClasspath()); + List cp = + buildConfig.getFullClasspath(); // pr145693 + //buildConfig.getBootclasspath(); + //cp.addAll(buildConfig.getClasspath()); BcelWorld bcelWorld = new BcelWorld(cp, handler, null); bcelWorld.setBehaveInJava5Way(buildConfig.getBehaveInJava5Way()); bcelWorld.setAddSerialVerUID(buildConfig.isAddSerialVerUID()); diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java index 18b1f86e0..7bdb942eb 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -22,18 +22,19 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // public void testArgnamesAndJavac_pr148381() { runTest("argNames and javac");} // public void testCFlowXMLAspectLTW_pr149096() { runTest("cflow xml concrete aspect"); } public void testIllegalStateException_pr148737() { runTest("illegalstateexception for non generic type");} - public void testAtajInheritance_pr149305_1() { runTest("ataj inheritance - 1");} - public void testAtajInheritance_pr149305_2() { runTest("ataj inheritance - 2");} - public void testAtajInheritance_pr149305_3() { runTest("ataj inheritance - 3");} + public void testAtajInheritance_pr149305_1() { runTest("ataj inheritance - 1");} + public void testAtajInheritance_pr149305_2() { runTest("ataj inheritance - 2");} + public void testAtajInheritance_pr149305_3() { runTest("ataj inheritance - 3");} public void testVerificationFailureForAspectOf_pr148693() { runTest("verification problem"); // build the code Utils.verifyClass(ajc,"mypackage.MyAspect"); // verify it <<< BRAND NEW VERIFY UTILITY FOR EVERYONE TO TRY ;) } - public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");} - public void testVerifyErrNoTypeCflowField_pr145693_1() { runTest("verifyErrNoTypeCflowField"); } -// public void testVerifyErrInpathNoTypeCflowField_pr145693_2() { runTest("verifyErrInpathNoTypeCflowField"); } -// public void testCpathNoTypeCflowField_pr145693_3() { runTest("cpathNoTypeCflowField"); } - + public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");} + public void testVerifyErrNoTypeCflowField_pr145693_1() { runTest("verifyErrNoTypeCflowField"); } + public void testVerifyErrInpathNoTypeCflowField_pr145693_2() { runTest("verifyErrInpathNoTypeCflowField"); } + public void testCpathNoTypeCflowField_pr145693_3() { runTest("cpathNoTypeCflowField"); } + public void testVisibilityProblem_pr149071() { runTest("visiblity problem");} + //public void testAdviceNotWovenAspectPath_pr147841() { runTest("advice not woven on aspectpath");} ///////////////////////////////////////// public static Test suite() { |