diff options
| author | Lars Grefer <eclipse@larsgrefer.de> | 2020-08-13 23:21:11 +0200 |
|---|---|---|
| committer | Lars Grefer <eclipse@larsgrefer.de> | 2020-08-13 23:21:11 +0200 |
| commit | d7ba05ce26dd8f72c1d0695ece2cb03d035e3cf9 (patch) | |
| tree | b0ca80a1154a73ca8ed1d5d4cf175c2682af6fce /org.aspectj.matcher/src/test/java/org | |
| parent | 4f027bd94fe71756894f13a4a82123eda4f28b98 (diff) | |
| download | aspectj-d7ba05ce26dd8f72c1d0695ece2cb03d035e3cf9.tar.gz aspectj-d7ba05ce26dd8f72c1d0695ece2cb03d035e3cf9.zip | |
Remove checks for old Java Versions
Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>
Diffstat (limited to 'org.aspectj.matcher/src/test/java/org')
| -rw-r--r-- | org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java | 17 | ||||
| -rw-r--r-- | org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java | 3 |
2 files changed, 4 insertions, 16 deletions
diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java index b60cad835..623af002f 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java @@ -115,17 +115,10 @@ public class ArgsTestCase extends TestCase { Method oneIntM = A.class.getMethod("anInt", new Class[] { int.class }); Method oneIntegerM = A.class.getMethod("anInteger", new Class[] { Integer.class }); - if (LangUtil.is15VMOrGreater()) { - checkMatches(oneInt.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); - checkMatches(oneInt.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); - checkMatches(oneInteger.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); - checkMatches(oneInteger.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); - } else { - checkMatches(oneInt.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); - checkNoMatch(oneInt.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); - checkNoMatch(oneInteger.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); - checkMatches(oneInteger.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); - } + checkMatches(oneInt.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); + checkMatches(oneInt.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); + checkMatches(oneInteger.matchesMethodExecution(oneIntM), new A(), new A(), new Object[] {5}); + checkMatches(oneInteger.matchesMethodExecution(oneIntegerM), new A(), new A(), new Object[] {5}); } catch (Exception ex) { fail("Unexpected exception " + ex); @@ -173,8 +166,6 @@ public class ArgsTestCase extends TestCase { /** this condition can occur on the build machine only, and is way too complex to fix right now... */ private boolean needToSkipPointcutParserTests() { - if (!LangUtil.is15VMOrGreater()) - return false; try { Class.forName("org.aspectj.weaver.reflect.Java15ReflectionBasedReferenceTypeDelegate", false, this.getClass() .getClassLoader());// ReflectionBasedReferenceTypeDelegate.class.getClassLoader()); diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java index 6c8d70be8..b52146849 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java @@ -38,9 +38,6 @@ public class ThisOrTargetTestCase extends TestCase { /** this condition can occur on the build machine only, and is way too complex to fix right now... */ private boolean needToSkipPointcutParserTests() { - if (!LangUtil.is15VMOrGreater()) { - return false; - } try { Class.forName("org.aspectj.weaver.reflect.Java15ReflectionBasedReferenceTypeDelegate", false, this.getClass() .getClassLoader());// ReflectionBasedReferenceTypeDelegate.class.getClassLoader()); |