From 26cd6dddc10c884ad4b88e105d53886cf3600e67 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 12 Aug 2011 17:54:25 +0000 Subject: [PATCH] 239649 and primitives no longer all resolved by default --- .../systemtest/ajc1612/Ajc1612Tests.java | 83 ++++++++ .../aspectj/systemtest/ajc1612/ajc1612.xml | 192 ++++++++++++++++++ .../tools/AjdeInteractionTestbed.java | 18 +- .../MultiProjTestCompilerConfiguration.java | 10 +- .../tools/MultiProjTestMessageHandler.java | 2 +- 5 files changed, 290 insertions(+), 15 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java index c0907c43b..de4cc474d 100644 --- a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java @@ -27,6 +27,89 @@ public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // runTest("anno copying"); // } + // public void testDoubleITDF() throws Exception { + // runTest("double itdf"); + // } + + public void testThisAspectInstance_239649_1() throws Exception { + // simple case + runTest("thisAspectInstance - 1"); + } + + public void testThisAspectInstance_239649_2() throws Exception { + // before advice toggling on/off through if called method + runTest("thisAspectInstance - 2"); + } + + public void testThisAspectInstance_239649_3() throws Exception { + // after advice toggling on/off through if called method + runTest("thisAspectInstance - 3"); + } + + public void testThisAspectInstance_239649_4() throws Exception { + // before advice, also using thisJoinPointStaticPart + runTest("thisAspectInstance - 4"); + } + + public void testThisAspectInstance_239649_5() throws Exception { + // before advice, also using thisJoinPoint + runTest("thisAspectInstance - 5"); + } + + public void testThisAspectInstance_239649_6() throws Exception { + // before advice, also using thisEnclosingJoinPointStaticPart + runTest("thisAspectInstance - 6"); + } + + public void testThisAspectInstance_239649_7() throws Exception { + // before advice, also using thisJoinPoint and thisJoinPointStaticPart + runTest("thisAspectInstance - 7"); + } + + public void testThisAspectInstance_239649_8() throws Exception { + // before advice, also using abstract aspects + runTest("thisAspectInstance - 8"); + } + + public void testThisAspectInstance_239649_9() throws Exception { + // before advice, also using abstract aspects 2 + runTest("thisAspectInstance - 9"); + } + + public void testThisAspectInstance_239649_10() throws Exception { + // aspects in a package + runTest("thisAspectInstance - 10"); + } + + public void testThisAspectInstance_239649_11() throws Exception { + // non-singleton aspect - should be an error for now + runTest("thisAspectInstance - 11"); + } + + public void testThisAspectInstance_239649_12() throws Exception { + // arg binding and tjpsp + runTest("thisAspectInstance - 12"); + } + + public void testThisAspectInstance_239649_13() throws Exception { + // pass instance + runTest("thisAspectInstance - 13"); + } + + public void testThisAspectInstance_239649_14() throws Exception { + // multiple ifs + runTest("thisAspectInstance - 14"); + } + + public void testThisAspectInstance_239649_15() throws Exception { + // abstract aspects + runTest("thisAspectInstance - 15"); + } + + public void testVerifyPerthis() throws Exception { + runTest("verify perthis"); + } + public void testRangeForLocalVariables_353936() throws ClassNotFoundException { runTest("local variable tables"); JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), "X"); diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml index c06b0218a..898eb8a25 100644 --- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml +++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml @@ -2,6 +2,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java index 0428f2b69..80d7a8d4d 100644 --- a/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java +++ b/tests/src/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java @@ -252,8 +252,8 @@ public class AjdeInteractionTestbed extends TestCase { private void addXmlConfigFilesToBuild(String pname, AjCompiler compiler) { File projectBase = new File(sandboxDir, pname); ICompilerConfiguration icc = compiler.getCompilerConfiguration(); - List currentXmlFiles = icc.getProjectXmlConfigFiles(); - List collector = new ArrayList(); + List currentXmlFiles = icc.getProjectXmlConfigFiles(); + List collector = new ArrayList(); collectUpXmlFiles(projectBase, projectBase, collector); boolean changed = false; for (int i = 0; i < collector.size(); i++) { @@ -271,7 +271,7 @@ public class AjdeInteractionTestbed extends TestCase { } } - private void collectUpFiles(File location, File base, List collectionPoint) { + private void collectUpFiles(File location, File base, List collectionPoint) { String contents[] = location.list(); if (contents == null) { return; @@ -296,7 +296,7 @@ public class AjdeInteractionTestbed extends TestCase { } } - private void collectUpXmlFiles(File location, File base, List collectionPoint) { + private void collectUpXmlFiles(File location, File base, List collectionPoint) { String contents[] = location.list(); if (contents == null) { return; @@ -400,14 +400,14 @@ public class AjdeInteractionTestbed extends TestCase { public void printBuildReport(String projectName) { System.out.println("\n====== BUILD REPORT (Project " + projectName + ") ==========="); System.out.println("Build took: " + getTimeTakenForBuild(projectName) + "ms"); - List compiled = getCompiledFiles(projectName); + List compiled = getCompiledFiles(projectName); System.out.println("Compiled: " + compiled.size() + " files"); - for (Iterator iter = compiled.iterator(); iter.hasNext();) { + for (Iterator iter = compiled.iterator(); iter.hasNext();) { System.out.println(" :" + iter.next()); } - List woven = getWovenClasses(projectName); + List woven = getWovenClasses(projectName); System.out.println("Wove: " + woven.size() + " files"); - for (Iterator iter = woven.iterator(); iter.hasNext();) { + for (Iterator iter = woven.iterator(); iter.hasNext();) { System.out.println(" :" + iter.next()); } if (wasFullBuild()) { @@ -497,7 +497,7 @@ public class AjdeInteractionTestbed extends TestCase { public static boolean informedAboutKindOfBuild; public static boolean fullBuildOccurred; - public static List detectedDeletions = new ArrayList(); + public static List detectedDeletions = new ArrayList(); public static StringBuffer decisions = new StringBuffer(); public static void reset() { diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java index 87e19fca2..803d5e7f6 100644 --- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java +++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java @@ -35,7 +35,7 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio private IOutputLocationManager outputLocationManager = null; private List dependants; private Map javaOptionsMap; - private Set inpath; + private Set inpath; private String encoding = null; private String outjar; private String nonstandardoptions; @@ -83,17 +83,17 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio return cp; } - public Set getInpath() { + public Set getInpath() { log("ICompilerConfiguration.getInPath()"); return inpath; } - public Map getJavaOptionsMap() { + public Map getJavaOptionsMap() { log("ICompilerConfiguration.getJavaOptionsMap()"); if (javaOptionsMap != null && !javaOptionsMap.isEmpty()) return javaOptionsMap; - Hashtable ht = new Hashtable(); + Hashtable ht = new Hashtable(); ht.put("org.eclipse.jdt.core.compiler.compliance", "1.5"); ht.put("org.eclipse.jdt.core.compiler.codegen.targetPlatform", "1.5"); ht.put("org.eclipse.jdt.core.compiler.source", "1.5"); @@ -155,7 +155,7 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio this.changed |= ICompilerConfiguration.ASPECTPATH_CHANGED; } - public void setInpath(Set inpath) { + public void setInpath(Set inpath) { this.inpath = inpath; this.changed |= ICompilerConfiguration.INPATH_CHANGED; } diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java index 5acf83108..26afbf882 100644 --- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java +++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjTestMessageHandler.java @@ -112,7 +112,7 @@ public class MultiProjTestMessageHandler implements IBuildMessageHandler { return weavingMessages; } - public List/* IMessage */getCompilerErrors() { + public List getCompilerErrors() { return compilerErrors; } -- 2.39.5