diff options
author | Andy Clement <aclement@pivotal.io> | 2016-12-16 16:32:49 -0800 |
---|---|---|
committer | Andy Clement <aclement@pivotal.io> | 2016-12-16 16:32:49 -0800 |
commit | 4a07d09f36126bc829204644536ed29b864cef46 (patch) | |
tree | 912a55c33287c01246b084db824c1ba8f6cc2599 /testing | |
parent | 4243d0e9edb48b03746657a8e419944faf3c62a2 (diff) | |
download | aspectj-4a07d09f36126bc829204644536ed29b864cef46.tar.gz aspectj-4a07d09f36126bc829204644536ed29b864cef46.zip |
reduced min Java version to 1.6
Diffstat (limited to 'testing')
-rw-r--r-- | testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java index 6705a5847..18b9233dc 100644 --- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java +++ b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java @@ -24,10 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Stack; -import junit.extensions.TestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.digester.Digester; import org.aspectj.apache.bcel.classfile.Attribute; import org.aspectj.apache.bcel.classfile.JavaClass; @@ -39,6 +35,12 @@ import org.aspectj.apache.bcel.util.SyntheticRepository; import org.aspectj.tools.ajc.AjcTestCase; import org.aspectj.tools.ajc.CompilationResult; import org.aspectj.util.FileUtil; +import org.aspectj.weaver.ResolvedMember; +import org.aspectj.weaver.ResolvedType; + +import junit.extensions.TestSetup; +import junit.framework.Test; +import junit.framework.TestSuite; /** * Root class for all Test suites that are based on an AspectJ XML test suite file. Extends AjcTestCase allowing a mix of @@ -463,5 +465,23 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase { return new File(getClass().getResource(resourceName).getFile()); } + protected Method findMethod(JavaClass jc, String string) { + for (Method m : jc.getMethods()) { + if (m.getName().equals(string)) { + return m; + } + } + return null; + } + + protected ResolvedMember findMethod(ResolvedType outerType, String string) { + for (ResolvedMember method: outerType.getDeclaredMethods()) { + if (method.getName().equals(string)) { + return method; + } + } + return null; + } + } |