minor tweaks to better handle J9

diff --git a/lib/bcel/bcel-src.zip b/lib/bcel/bcel-src.zip
index 3c34a94dc4752c444ec1c59254ef07368e51d4bf..ea100efe9524fd3add3ef464686e22ce3cf50163 100644 (file)
Binary files a/lib/bcel/bcel-src.zip and b/lib/bcel/bcel-src.zip differ

diff --git a/lib/bcel/bcel-verifier-src.zip b/lib/bcel/bcel-verifier-src.zip
index e3f91ee827c2618003017640d0e5c75d1d422c36..0d7815d2ee2a4ea4cc69bc9672906e81d3eaaa1a 100644 (file)
Binary files a/lib/bcel/bcel-verifier-src.zip and b/lib/bcel/bcel-verifier-src.zip differ

diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar
index c3d035753b3c19752fc15554252091284d015f88..b4945eaa230c16ac277e035ff30ad24627006b25 100644 (file)
Binary files a/lib/bcel/bcel-verifier.jar and b/lib/bcel/bcel-verifier.jar differ

diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar
index e7bcdb90b1aebe59126dfe8728d63816c922711b..770bc8f6a5b938aedd9d9da4c20d67cde80db821 100644 (file)
Binary files a/lib/bcel/bcel.jar and b/lib/bcel/bcel.jar differ

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
index 8679f787932e3e39b73f8cee7cc776078006ec1d..dc40100bc2831159c29724fa3e890ac798780333 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java
@@ -59,11 +59,6 @@ public class AsmBuilderTest extends TestCase {
                        public boolean ignoreOptionalProblems() {
                                return false;
                        }
-
-                       @Override
-                       public char[] module() {
-                               return null;
-                       }
                        
                };
                TypeDeclaration local = new TypeDeclaration(new CompilationResult(cu, 0, 0, 0));

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index 5b3c795d4c5695b572ca96c6f232e312d76399dc..8928678c8ffce5a45f92b6389f082afc5a860581 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -12,17 +12,14 @@ package org.aspectj.systemtest.ajc151;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintWriter;
 
-import junit.framework.Test;
-
-import org.aspectj.ajdt.internal.core.builder.AsmHierarchyBuilder;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 import org.aspectj.systemtest.ajc150.GenericsTests;
 import org.aspectj.testing.XMLBasedAjcTestCase;
-import org.aspectj.weaver.UnresolvedType.TypeKind;
+
+import junit.framework.Test;
 
 public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index d0ced61799f011d6c3573c7e5afbabdbddba099e..eef4632140fd107d7558c335bfe84b6579f244fa 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -367,7 +367,7 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                IHierarchy top = AsmManager.lastActiveStructureModel.getHierarchy();
                IProgramElement ipe = top.findElementForLabel(top.getRoot(), IProgramElement.Kind.METHOD, ipeLabel);
                assertNotNull("Couldn't find '" + ipeLabel + "' element in the tree", ipe);
-               List l = ipe.getParameterSignatures();
+               List<char[]> l = ipe.getParameterSignatures();
                boolean eq = CharOperation.equals(((char[]) l.get(0)), expectedParm.toCharArray());
                assertTrue("expected parameter to be '" + expectedParm + "' but found '" + new String(((char[]) l.get(0))) + "'", eq);
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
index 7a025d7969cd467f6583e76091620ca6526380ed..ebba76303e4ad1a683e7eac0c96c83292827bbc7 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
@@ -275,7 +275,7 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
                // Should be 'rounded down' when transforming it into a MethodGen, new position will be '2'
                // This next line will go BANG with an NPE if we don't correctly round the start pc down to 2
-               MethodGen toTransform = new MethodGen(oneWeWant, "A", cp, true);
+               new MethodGen(oneWeWant, "A", cp, true);
        }
 
        public void testGenericAspectGenericPointcut_pr174449() {

diff --git a/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java b/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java
index 26fc7c78d2b6925e94165beb491bbf98bc805ae6..d2375625ba8e0625ac61299af1962f9b4ec1cc2f 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java
@@ -21,6 +21,10 @@ import junit.framework.Test;
  */
 public class Ajc190Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testFunnySignature() {
+               runTest("funny signature with method reference");
+       }
+       
        // Weave a module with code that isn't in a module
        public void testWeaveModule() throws Exception {
                runTest("weave module");

diff --git a/tests/src/org/aspectj/systemtest/ajc190/ajc190.xml b/tests/src/org/aspectj/systemtest/ajc190/ajc190.xml
index bbe04073d5ce465de009675261a67696acf10833..a270116e3c99b81b601dea385ed444fe5a19ee1d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc190/ajc190.xml
+++ b/tests/src/org/aspectj/systemtest/ajc190/ajc190.xml
@@ -2,6 +2,10 @@
 
 <suite>
 
+  <ajc-test dir="bugs190/520135" title="funny signature with method reference">
+    <compile files="FailsApectJ.java" options="-1.8"/>
+  </ajc-test>
+
   <ajc-test dir="bugs190/modules" title="weave module">
     <compile files="aspect1/Azpect1.java" inpath="module1/module-one.jar" outjar="runner.jar" options="-1.8"/>
     <java classpath="runner.jar" class="a.b.c.Code"/>