From: Andy Clement Date: Wed, 10 Oct 2018 19:56:00 +0000 (-0700) Subject: Reverse default - behave like 1.5 (support annotations) by default X-Git-Tag: V1_9_2RC3~16 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46a1172aac0b24ccbcb38083ff66d8e8e4ff2d17;p=aspectj.git Reverse default - behave like 1.5 (support annotations) by default --- diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java index 448618c11..66488fa8c 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java @@ -815,33 +815,17 @@ public class BuildArgParser extends Main { } else if (arg.equals("-timers")) { buildConfig.setTiming(true); // swallow - it is dealt with in Main.runMain() - } else if (arg.equals("-1.5")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-1.5"); - // this would enable the '-source 1.5' to do the same as '-1.5' but doesnt sound quite right as - // as an option right now as it doesnt mean we support 1.5 source code - people will get confused... - } else if (arg.equals("-1.6")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-1.6"); - } else if (arg.equals("-1.7")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-1.7"); - } else if (arg.equals("-1.8")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-1.8"); - } else if (arg.equals("-1.9")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-1.9"); - } else if (arg.equals("-10")) { - buildConfig.setBehaveInJava5Way(true); - unparsedArgs.add("-10"); + } else if (arg.equals("-1.3")) { + buildConfig.setBehaveInJava5Way(false); + unparsedArgs.add("-1.3"); + } else if (arg.equals("-1.4")) { + buildConfig.setBehaveInJava5Way(false); + unparsedArgs.add("-1.4"); } else if (arg.equals("-source")) { if (args.size() > nextArgIndex) { String level = args.get(nextArgIndex).getValue(); - if (level.equals("1.5") || level.equals("5") || level.equals("1.6") || level.equals("6") || level.equals("1.7") - || level.equals("7") || level.equals("8") || level.equals("1.8") - || level.equals("9") || level.equals("1.9") || level.equals("10")) { - buildConfig.setBehaveInJava5Way(true); + if (level.equals("1.3") || level.equals("1.4")) { + buildConfig.setBehaveInJava5Way(false); } unparsedArgs.add("-source"); unparsedArgs.add(level); diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java index a7be9ec6e..cdf534b54 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java @@ -73,7 +73,7 @@ public class AjCompilerOptions extends CompilerOptions { public String xOptionalJoinpoints = null; // If true - autoboxing behaves differently ... - public boolean behaveInJava5Way = false; + public boolean behaveInJava5Way = true; public boolean timing = false; @@ -117,6 +117,7 @@ public class AjCompilerOptions extends CompilerOptions { set(settings); } + @Override public Map getMap() { Map map = super.getMap(); // now add AspectJ additional options @@ -148,6 +149,7 @@ public class AjCompilerOptions extends CompilerOptions { return map; } + @Override public void set(Map optionsMap) { super.set(optionsMap); Object optionValue; @@ -282,6 +284,7 @@ public class AjCompilerOptions extends CompilerOptions { super.warningThreshold.set(CompilerOptions.SwallowedExceptionInCatchBlock); } + @Override public String toString() { StringBuffer buf = new StringBuffer(super.toString()); // now add AspectJ additional options diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java index 34b0222bc..c0d796753 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/DeclareParents.java @@ -227,17 +227,17 @@ public class DeclareParents extends AjcTestCase { CompilationResult result = null; // Execute: "ajc -showWeaveInfo" - String[] sourceCompileCommandLine = new String[classes.length + aspects.length + 1]; + String[] sourceCompileCommandLine = new String[classes.length + aspects.length + 2]; System.arraycopy(classes, 0, sourceCompileCommandLine, 0, classes.length); System.arraycopy(aspects, 0, sourceCompileCommandLine, classes.length, aspects.length); - String[] extraOption = new String[] { "-showWeaveInfo" }; - System.arraycopy(extraOption, 0, sourceCompileCommandLine, classes.length + aspects.length, 1); + String[] extraOption = new String[] { "-showWeaveInfo", "-1.4"}; + System.arraycopy(extraOption, 0, sourceCompileCommandLine, classes.length + aspects.length, 2); result = ajc(testBase, sourceCompileCommandLine); if (!expectErrors) assertTrue("errors? \n" + result.getErrorMessages(), !result.hasErrorMessages()); - List sourceWeaveMessages = getWeaveMessages(result); + List sourceWeaveMessages = getWeaveMessages(result); int sourceWeaveMessagesCount = sourceWeaveMessages.size(); - List sourceErrorMessages = result.getErrorMessages(); + List sourceErrorMessages = result.getErrorMessages(); int sourceErrorMessagesCount = sourceErrorMessages.size(); if (verbose) { @@ -258,15 +258,15 @@ public class DeclareParents extends AjcTestCase { assertTrue("Should get no errors for this compile, but got: " + result.getErrorMessages().size(), result.getErrorMessages() .size() == 0); // Execute: "ajc -inpath classes -showWeaveInfo -d classes2 -aspectpath aspects.jar" - result = ajc(testBase, new String[] { "-inpath", "classes", "-showWeaveInfo", "-d", "classes2", "-aspectpath", + result = ajc(testBase, new String[] { "-inpath", "classes", "-showWeaveInfo", "-1.4", "-d", "classes2", "-aspectpath", "aspects.jar" }); if (!expectErrors) assertTrue("unexpected errors? \n" + result.getErrorMessages(), !result.hasErrorMessages()); - List binaryWeaveMessages = getWeaveMessages(result); + List binaryWeaveMessages = getWeaveMessages(result); int binaryWeaveMessagesCount = binaryWeaveMessages.size(); - List binaryErrorMessages = result.getErrorMessages(); + List binaryErrorMessages = result.getErrorMessages(); int binaryErrorMessagesCount = binaryErrorMessages.size(); if (verbose) { @@ -281,11 +281,11 @@ public class DeclareParents extends AjcTestCase { // /////////////////////////////////////////////////////////////////////////// // Check the error messages are comparable (allow for differing orderings) if (compareErrors) { - for (Iterator iter = binaryErrorMessages.iterator(); iter.hasNext();) { - IMessage binaryMessage = (IMessage) iter.next(); + for (Iterator iter = binaryErrorMessages.iterator(); iter.hasNext();) { + IMessage binaryMessage = iter.next(); IMessage correctSourceMessage = null; - for (Iterator iterator = sourceErrorMessages.iterator(); iterator.hasNext() && correctSourceMessage == null;) { - IMessage sourceMessage = (IMessage) iterator.next(); + for (Iterator iterator = sourceErrorMessages.iterator(); iterator.hasNext() && correctSourceMessage == null;) { + IMessage sourceMessage = iterator.next(); if (sourceMessage.getMessage().equals(binaryMessage.getMessage())) { correctSourceMessage = sourceMessage; @@ -298,8 +298,8 @@ public class DeclareParents extends AjcTestCase { sourceErrorMessages.remove(correctSourceMessage); } if (sourceErrorMessages.size() > 0) { - for (Iterator iter = sourceErrorMessages.iterator(); iter.hasNext();) { - IMessage srcMsg = (IMessage) iter.next(); + for (Iterator iter = sourceErrorMessages.iterator(); iter.hasNext();) { + IMessage srcMsg = iter.next(); System.err.println("This error message from source compilation '" + srcMsg + "' didn't occur during binary weaving."); } @@ -316,8 +316,8 @@ public class DeclareParents extends AjcTestCase { // Check weaving messages are comparable for (int i = 0; i < sourceWeaveMessages.size(); i++) { - IMessage m1 = (IMessage) sourceWeaveMessages.get(i); - IMessage m2 = (IMessage) binaryWeaveMessages.get(i); + IMessage m1 = sourceWeaveMessages.get(i); + IMessage m2 = binaryWeaveMessages.get(i); String s1 = m1.getDetails(); String s2 = m2.getDetails(); @@ -355,17 +355,18 @@ public class DeclareParents extends AjcTestCase { return ret; } - private List getWeaveMessages(CompilationResult result) { - List infoMessages = result.getInfoMessages(); - List weaveMessages = new ArrayList(); - for (Iterator iter = infoMessages.iterator(); iter.hasNext();) { - IMessage element = (IMessage) iter.next(); + private List getWeaveMessages(CompilationResult result) { + List infoMessages = result.getInfoMessages(); + List weaveMessages = new ArrayList<>(); + for (IMessage element: infoMessages) {//Iterator iter = infoMessages.iterator(); iter.hasNext();) { +// IMessage element = (IMessage) iter.next(); if (element.getKind() == IMessage.WEAVEINFO) weaveMessages.add(element); } return weaveMessages; } + @Override protected void setUp() throws Exception { super.setUp(); baseDir = new File("../org.aspectj.ajdt.core/testdata", PROJECT_DIR); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java index 8101dc1fd..a9ee51fe9 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java @@ -14,16 +14,15 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import org.aspectj.bridge.IMessage; import org.aspectj.tools.ajc.AjcTestCase; import org.aspectj.tools.ajc.CompilationResult; -import org.aspectj.util.LangUtil; public class JavadocTest extends AjcTestCase { public static final String PROJECT_DIR = "javadoc"; private File baseDir; + @Override protected void setUp() throws Exception { super.setUp(); baseDir = new File("../org.aspectj.ajdt.core/testdata", PROJECT_DIR); @@ -36,7 +35,7 @@ public class JavadocTest extends AjcTestCase { * */ public void testMissingJavadoc() { - String[] args = new String[] { "World.java", "-warn:allJavadoc" }; + String[] args = new String[] { "World.java", "-warn:allJavadoc", "-1.4" }; List warningMessages = new ArrayList(); // These warnings are against public textX() methods declared in the World.java diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java index 1563a57bb..2d678e140 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java @@ -39,7 +39,7 @@ public class PerformanceTestCase extends CommandTestCase { // into an error so that we can use checkCompiles() ability to check errors occur. // Pass -proceedOnError to ensure even though we get that message, we still get the class file on disk String sandboxName = getSandboxName(); - checkCompile("src1/LazyTjp.aj", new String[] {"-Xlint:error","-proceedOnError"}, new int[] {96}, sandboxName); + checkCompile("src1/LazyTjp.aj", new String[] {"-Xlint:error","-proceedOnError", "-1.4"}, new int[] {96}, sandboxName); runMain("LazyTjp"); } diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java index c4be26936..fc841c5a8 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java @@ -16,9 +16,6 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - import org.aspectj.ajdt.StreamPrintWriter; import org.aspectj.ajdt.ajc.AjdtAjcTests; import org.aspectj.ajdt.ajc.BuildArgParser; @@ -27,6 +24,9 @@ import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageWriter; import org.aspectj.tools.ajc.Ajc; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + public class AjBuildManagerTest extends TestCase { private final StreamPrintWriter outputWriter = new StreamPrintWriter(new PrintWriter(System.out)); @@ -62,7 +62,7 @@ public class AjBuildManagerTest extends TestCase { String javaClassPath = System.getProperty("java.class.path"); System.out.println(javaClassPath); String sandboxName = Ajc.createEmptySandbox().getAbsolutePath(); - AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-classpath", javaClassPath, + AjBuildConfig buildConfig = parser.genBuildConfig(new String[] { "-d", sandboxName, "-1.4", "-classpath", javaClassPath, AjdtAjcTests.TESTDATA_PATH + "/src1/A.java", // EajcModuleTests.TESTDATA_PATH + "/src1/Hello.java", }); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java index 6fe4b7f52..32e8fd329 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/OutjarTest.java @@ -30,6 +30,7 @@ public class OutjarTest extends AjcTestCase { * Make copies of JARs used for -injars/-inpath and -aspectpath because so * they are not overwritten when a test fails. */ + @Override protected void setUp() throws Exception { super.setUp(); baseDir = new File("../org.aspectj.ajdt.core/testdata",PROJECT_DIR); @@ -109,7 +110,7 @@ public class OutjarTest extends AjcTestCase { * Expected result = Compile fails with error message. */ public void testOutjarDeletedOnError () { - String[] args = new String[] {"-aspectpath", aspectjarName, "-injars", injarName, "-outjar", outjarName}; + String[] args = new String[] {"-aspectpath", aspectjarName, "-injars", injarName, "-outjar", outjarName,"-1.4"}; Message error = new Message(WeaverMessages.format(WeaverMessages.CANT_FIND_TYPE_INTERFACES,"jar1.Parent")); MessageSpec spec = new MessageSpec(null,newMessageList(error)); CompilationResult result = ajc(baseDir,args); diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java index 01e331523..1265e4502 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/CompilationResult.java @@ -114,7 +114,7 @@ public class CompilationResult { * though. * @see org.aspectj.tools.ajc.AjcTestCase */ - public List /*IMessage*/ getInfoMessages() { return infoMessages; } + public List getInfoMessages() { return infoMessages; } /** * The error messages produced by the compiler. The list * entries are the IMessage objects created during the @@ -152,6 +152,7 @@ public class CompilationResult { * Returns string containing message count summary, list of messages * by type, and the actual ajc compilation command that was issued. */ + @Override public String toString() { StringBuffer buff = new StringBuffer(); buff.append("AspectJ Compilation Result:\n"); diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java index ae7de7137..efaae5c25 100644 --- a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java +++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjcHarnessTestsUsingJUnit.java @@ -14,7 +14,8 @@ package org.aspectj.testing.drivers; import org.aspectj.ajdt.internal.core.builder.AjState; -import junit.framework.*; +import junit.framework.TestCase; +import junit.framework.TestSuite; /* * Run harness tests as JUnit test suites. @@ -45,17 +46,13 @@ public class AjcHarnessTestsUsingJUnit extends TestCase { super(name); } - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ + @Override protected void setUp() throws Exception { super.setUp(); AjState.FORCE_INCREMENTAL_DURING_TESTING = true; } - /* (non-Javadoc) - * @see junit.framework.TestCase#tearDown() - */ + @Override protected void tearDown() throws Exception { super.tearDown(); AjState.FORCE_INCREMENTAL_DURING_TESTING = false; diff --git a/tests/ajcHarnessTests.xml b/tests/ajcHarnessTests.xml index 31b04a66e..4a031b682 100644 --- a/tests/ajcHarnessTests.xml +++ b/tests/ajcHarnessTests.xml @@ -180,10 +180,10 @@ keywords="purejava"> + outjar="main.zip" options="-1.4"/> + files="main.zip" options="-1.4"/> @@ -608,15 +608,15 @@ - - + + - - + + diff --git a/tests/bugs192/11flags/A.java b/tests/bugs192/11flags/A.java new file mode 100644 index 000000000..02d6e88f0 --- /dev/null +++ b/tests/bugs192/11flags/A.java @@ -0,0 +1,13 @@ +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +@interface B {} + +public class A { + @B + public void foo() {} +} + +aspect X { + before(): execution(@B * foo(..)) {} +} diff --git a/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml b/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml index e93b9b150..56ee8f6e4 100644 --- a/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml @@ -4,45 +4,45 @@ - + - + - + - + - + - + - + @@ -65,326 +65,326 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -408,41 +408,41 @@ - + - + - + - + - + - + @@ -457,74 +457,74 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -537,135 +537,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -685,263 +685,263 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -949,20 +949,20 @@ - + - + - + @@ -977,55 +977,55 @@ - + - + - + - + - + - + - + - + @@ -1036,54 +1036,54 @@ - + - - + - + - + - + - + - + @@ -1091,109 +1091,109 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1204,21 +1204,21 @@ - + - + - + @@ -1227,14 +1227,14 @@ - + - @@ -1242,49 +1242,49 @@ - + - + - + - + - + - + - + @@ -1292,14 +1292,14 @@ - + - + @@ -1307,7 +1307,7 @@ - + @@ -1316,7 +1316,7 @@ - + @@ -1325,41 +1325,41 @@ - + - + - + - + - + - + @@ -1368,14 +1368,14 @@ - + - + @@ -1384,14 +1384,14 @@ - + - + @@ -1400,7 +1400,7 @@ title="concrete aspect unable to access abstract package-private pointcut in parent for overriding" keywords="from-resolved_10x" comment="XXX getting error - confirm line numbers"> - + @@ -1420,42 +1420,42 @@ - + - + - + - + - + - + @@ -1463,63 +1463,63 @@ - + - + - + - + - + - + - + - + - + @@ -1530,14 +1530,14 @@ - + - + @@ -1545,27 +1545,27 @@ - + - + - + - + @@ -1583,41 +1583,41 @@ - + - + - + - + - + - + @@ -1625,7 +1625,7 @@ - + @@ -1640,35 +1640,35 @@ - + - + - + - + - + @@ -1676,62 +1676,62 @@ - + - + - + - + - + - + - + - + - + @@ -1753,35 +1753,35 @@ - + - + - + - + - + @@ -1789,7 +1789,7 @@ - + @@ -1798,59 +1798,59 @@ - + - + - + - + - + - + - + - + - + @@ -1859,14 +1859,14 @@ - + - + @@ -1875,7 +1875,7 @@ - + @@ -1883,40 +1883,40 @@ - + - + - + - + - + - + @@ -1924,28 +1924,28 @@ - + - + - + - + @@ -1954,20 +1954,20 @@ title="Compiling java.lang.Object with ajc yields non-verifying bytecode" keywords="from-resolved_105" comment="XXX weak/bad test"> - + - + - + @@ -1975,27 +1975,27 @@ - + - + - + - + diff --git a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml index e16c31ab1..02b422bb8 100644 --- a/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml @@ -204,7 +204,7 @@ - + @@ -535,7 +535,7 @@ - + @@ -543,7 +543,7 @@ - + @@ -810,7 +810,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml index 80c234fda..4b51a98dd 100644 --- a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml @@ -75,7 +75,7 @@ - + @@ -244,31 +244,31 @@ - + - + - + - + - + - + - + @@ -383,7 +383,7 @@ - + @@ -459,7 +459,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml index 0c408a0e9..1d65dc3e1 100644 --- a/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml @@ -74,13 +74,13 @@ - + - + @@ -464,7 +464,7 @@ - + @@ -474,7 +474,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index d0da94ec9..9eda00b0c 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -214,7 +214,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -315,7 +315,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -473,8 +473,8 @@ - - + + @@ -1038,7 +1038,7 @@ - + @@ -1355,7 +1355,7 @@ - + @@ -2546,7 +2546,7 @@ - + @@ -2555,7 +2555,7 @@ - + @@ -6261,7 +6261,7 @@ - + @@ -6292,7 +6292,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml index e9617dba0..0dcdbf142 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ltw/ltw-tests.xml @@ -1,704 +1,670 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index 978e6b607..c7a917688 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -439,7 +439,7 @@ - + @@ -550,9 +550,9 @@ - - - + + + diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml index 9b6ed3270..c4300e9c7 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml +++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml @@ -29,7 +29,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -365,14 +365,14 @@ - + - + @@ -550,7 +550,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -740,8 +740,8 @@ files="HelloWorld.java" > - - + + @@ -787,8 +787,8 @@ keywords="aop.xml"> - - + + diff --git a/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml b/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml index 2ba1b993b..215240fe4 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml +++ b/tests/src/org/aspectj/systemtest/ajc153/jdtlikehandleprovider.xml @@ -12,7 +12,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml index b01d26957..3b00c8d15 100644 --- a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml index 0f1b58af3..abc3e058e 100644 --- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml +++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml @@ -274,7 +274,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index 1c857eb82..de0c20a89 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -12,13 +12,13 @@ package org.aspectj.systemtest.ajc1611; import java.io.File; -import junit.framework.Test; - import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.systemtest.ajc150.GenericsTests; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml index db5fd041c..beb922924 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml +++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml @@ -57,19 +57,19 @@ - + - + - + - + diff --git a/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml b/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml index 2ee09c456..456fb412f 100644 --- a/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml +++ b/tests/src/org/aspectj/systemtest/ajc174/ajc174.xml @@ -117,7 +117,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -191,7 +191,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java b/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java index 84e0f9d39..148e3030d 100644 --- a/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc192/Ajc192Tests.java @@ -24,6 +24,10 @@ import junit.framework.Test; */ public class Ajc192Tests extends XMLBasedAjcTestCase { + public void test11Flags() throws Exception { + runTest("11flags"); + } + public void testNestmates() throws Exception { runTest("nestmates"); JavaClass outer = getClassFrom(ajc.getSandboxDirectory(), "Outer"); diff --git a/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml b/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml index eb846e7cf..304d522aa 100644 --- a/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml +++ b/tests/src/org/aspectj/systemtest/ajc192/ajc192.xml @@ -2,12 +2,17 @@ + + + + + + - diff --git a/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml b/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml index 014a7e64c..b47682f51 100644 --- a/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml +++ b/tests/src/org/aspectj/systemtest/base/baseTests-tests.xml @@ -210,7 +210,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/design/designtest.xml b/tests/src/org/aspectj/systemtest/design/designtest.xml index d3b70d9ec..21be1943c 100644 --- a/tests/src/org/aspectj/systemtest/design/designtest.xml +++ b/tests/src/org/aspectj/systemtest/design/designtest.xml @@ -13,7 +13,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml index 48a6183ff..659abff47 100644 --- a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml +++ b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml @@ -374,7 +374,7 @@ pr="90806" keywords="incremental-test" title="NPE in genHandleIdentifier"> - + diff --git a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml index 71e706209..ae9e6be31 100644 --- a/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml +++ b/tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml @@ -75,7 +75,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml index 52531e59b..9b0837dbe 100644 --- a/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml +++ b/tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml @@ -127,7 +127,7 @@ - + @@ -395,7 +395,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml index 1fafc783e..d6346ceac 100644 --- a/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml +++ b/tests/src/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml @@ -57,7 +57,7 @@ pr="41181"> - + diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml index 42b61823c..8a6409183 100644 --- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml +++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml @@ -65,7 +65,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml b/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml index 30ef5dea4..4bbf23841 100644 --- a/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml +++ b/tests/src/org/aspectj/systemtest/xlint/xlint-tests.xml @@ -184,7 +184,7 @@ - +