diff options
| -rw-r--r-- | lib/bcel/bcel-src.zip | bin | 331349 -> 340260 bytes | |||
| -rw-r--r-- | lib/bcel/bcel-verifier-src.zip | bin | 183333 -> 183443 bytes | |||
| -rw-r--r-- | lib/bcel/bcel-verifier.jar | bin | 161637 -> 161944 bytes | |||
| -rw-r--r-- | lib/bcel/bcel.jar | bin | 298851 -> 307371 bytes | |||
| -rw-r--r-- | org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AsmBuilderTest.java | 5 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java | 7 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java | 2 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java | 2 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java | 4 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc190/ajc190.xml | 4 |
10 files changed, 12 insertions, 12 deletions
diff --git a/lib/bcel/bcel-src.zip b/lib/bcel/bcel-src.zip Binary files differindex 3c34a94dc..ea100efe9 100644 --- a/lib/bcel/bcel-src.zip +++ b/lib/bcel/bcel-src.zip diff --git a/lib/bcel/bcel-verifier-src.zip b/lib/bcel/bcel-verifier-src.zip Binary files differindex e3f91ee82..0d7815d2e 100644 --- a/lib/bcel/bcel-verifier-src.zip +++ b/lib/bcel/bcel-verifier-src.zip diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar Binary files differindex c3d035753..b4945eaa2 100644 --- a/lib/bcel/bcel-verifier.jar +++ b/lib/bcel/bcel-verifier.jar diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar Binary files differindex e7bcdb90b..770bc8f6a 100644 --- a/lib/bcel/bcel.jar +++ b/lib/bcel/bcel.jar 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 8679f7879..dc40100bc 100644 --- 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 5b3c795d4..8928678c8 100644 --- 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 d0ced6179..eef463214 100644 --- 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 7a025d796..ebba76303 100644 --- 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 26fc7c78d..d2375625b 100644 --- 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 bbe04073d..a270116e3 100644 --- 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"/> |