From 565f37b1970268234d9a823e2631ba3ed3e03037 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Tue, 15 Aug 2023 08:58:14 +0700 Subject: Move 1.9.20 bug regression tests to the correct spots Originally, I had intended to release a minor 1.9.19.1 release to fix some bugs. But then, Java 20 support was implemented and merged, so the next release will be 1.9.20. Therefore, I moved some bug regression tests to the 1.9.20 suite. Relates to #254. Signed-off-by: Alexander Kriegisch --- .../github_162/InterfaceWithInnerClass.java | 32 --- .../SwitchCaseWith_Integer_MAX_VALUE.java | 20 -- .../github_20/ParenthesisedAJKeywords.java | 33 ---- tests/bugs1919/github_214/Application.java | 11 -- tests/bugs1919/github_214/FirstAspect.java | 11 -- tests/bugs1919/github_214/MarkerOne.java | 1 - tests/bugs1919/github_214/MarkerTwo.java | 1 - tests/bugs1919/github_214/SecondAspect.java | 12 -- tests/bugs1919/github_24/ExactlyMatchingAspect.aj | 25 --- tests/bugs1919/github_24/FuzzilyMatchingAspect.aj | 39 ---- tests/bugs1919/github_24/MaybeMissingClass.java | 40 ---- .../github_162/InterfaceWithInnerClass.java | 32 +++ .../SwitchCaseWith_Integer_MAX_VALUE.java | 20 ++ .../github_20/ParenthesisedAJKeywords.java | 33 ++++ tests/bugs1920/github_214/Application.java | 11 ++ tests/bugs1920/github_214/FirstAspect.java | 11 ++ tests/bugs1920/github_214/MarkerOne.java | 1 + tests/bugs1920/github_214/MarkerTwo.java | 1 + tests/bugs1920/github_214/SecondAspect.java | 12 ++ tests/bugs1920/github_24/ExactlyMatchingAspect.aj | 25 +++ tests/bugs1920/github_24/FuzzilyMatchingAspect.aj | 39 ++++ tests/bugs1920/github_24/MaybeMissingClass.java | 40 ++++ .../aspectj/systemtest/ajc1919/Bugs1919Tests.java | 32 --- .../aspectj/systemtest/ajc1920/Bugs1920Tests.java | 32 +++ .../org/aspectj/systemtest/ajc1919/ajc1919.xml | 215 --------------------- .../org/aspectj/systemtest/ajc1920/ajc1920.xml | 215 +++++++++++++++++++++ 26 files changed, 472 insertions(+), 472 deletions(-) delete mode 100644 tests/bugs1919/github_162/InterfaceWithInnerClass.java delete mode 100644 tests/bugs1919/github_190/SwitchCaseWith_Integer_MAX_VALUE.java delete mode 100644 tests/bugs1919/github_20/ParenthesisedAJKeywords.java delete mode 100644 tests/bugs1919/github_214/Application.java delete mode 100644 tests/bugs1919/github_214/FirstAspect.java delete mode 100644 tests/bugs1919/github_214/MarkerOne.java delete mode 100644 tests/bugs1919/github_214/MarkerTwo.java delete mode 100644 tests/bugs1919/github_214/SecondAspect.java delete mode 100644 tests/bugs1919/github_24/ExactlyMatchingAspect.aj delete mode 100644 tests/bugs1919/github_24/FuzzilyMatchingAspect.aj delete mode 100644 tests/bugs1919/github_24/MaybeMissingClass.java create mode 100644 tests/bugs1920/github_162/InterfaceWithInnerClass.java create mode 100644 tests/bugs1920/github_190/SwitchCaseWith_Integer_MAX_VALUE.java create mode 100644 tests/bugs1920/github_20/ParenthesisedAJKeywords.java create mode 100644 tests/bugs1920/github_214/Application.java create mode 100644 tests/bugs1920/github_214/FirstAspect.java create mode 100644 tests/bugs1920/github_214/MarkerOne.java create mode 100644 tests/bugs1920/github_214/MarkerTwo.java create mode 100644 tests/bugs1920/github_214/SecondAspect.java create mode 100644 tests/bugs1920/github_24/ExactlyMatchingAspect.aj create mode 100644 tests/bugs1920/github_24/FuzzilyMatchingAspect.aj create mode 100644 tests/bugs1920/github_24/MaybeMissingClass.java (limited to 'tests') diff --git a/tests/bugs1919/github_162/InterfaceWithInnerClass.java b/tests/bugs1919/github_162/InterfaceWithInnerClass.java deleted file mode 100644 index f26975cc0..000000000 --- a/tests/bugs1919/github_162/InterfaceWithInnerClass.java +++ /dev/null @@ -1,32 +0,0 @@ -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.JoinPoint; - -/** - * https://github.com/eclipse/org.aspectj/issues/162 - */ -public interface InterfaceWithInnerClass { - public class ImplicitlyStatic { - public int getNumber() { - return 11; - } - - public static void main(String[] args) { - System.out.println(new ImplicitlyStatic().getNumber()); - } - } - - /*static*/ aspect MyAspect { - before() : execution(* main(..)) { - System.out.println(thisJoinPoint); - } - } - - @Aspect - /*static*/ class MyAnnotationAspect { - @Before("execution(* getNumber(..))") - public void myAdvice(JoinPoint thisJoinPoint){ - System.out.println(thisJoinPoint); - } - } -} diff --git a/tests/bugs1919/github_190/SwitchCaseWith_Integer_MAX_VALUE.java b/tests/bugs1919/github_190/SwitchCaseWith_Integer_MAX_VALUE.java deleted file mode 100644 index d083fe60f..000000000 --- a/tests/bugs1919/github_190/SwitchCaseWith_Integer_MAX_VALUE.java +++ /dev/null @@ -1,20 +0,0 @@ -public class SwitchCaseWith_Integer_MAX_VALUE { - public static void main(String[] args) { - System.out.println(switchTest(Integer.MAX_VALUE)); - } - - static String switchTest(int i) { - switch (i) { - case Integer.MAX_VALUE: - return "CASE_1"; - default: - return ""; - } - } -} - -aspect MyAspect { - before() : execution(* switchTest(*)) { - System.out.println(thisJoinPoint); - } -} diff --git a/tests/bugs1919/github_20/ParenthesisedAJKeywords.java b/tests/bugs1919/github_20/ParenthesisedAJKeywords.java deleted file mode 100644 index 1ba013c57..000000000 --- a/tests/bugs1919/github_20/ParenthesisedAJKeywords.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * https://github.com/eclipse/org.aspectj/issues/20 - */ -public class ParenthesisedAJKeywords { - public static void main(String[] args) { - boolean before = true; - int after = 11; - String around = "around"; - boolean aspect = true; - int pointcut = 22; - String declare = "declare"; - String privileged = "privileged"; - - if ((before)) { - System.out.println(foo((before))); - switch ((after)) { - default: System.out.println("after"); - } - System.out.println((around)); - System.out.println(!(aspect) ? "no aspect" : "aspect"); - switch ((pointcut)) { - case 22: System.out.println("pointcut"); break; - default: System.out.println("xxx"); - } - System.out.println((declare)); - System.out.println((privileged)); - } - } - - public static String foo(boolean before) { - return (before) ? "before" : "after"; - } -} diff --git a/tests/bugs1919/github_214/Application.java b/tests/bugs1919/github_214/Application.java deleted file mode 100644 index 5401e0875..000000000 --- a/tests/bugs1919/github_214/Application.java +++ /dev/null @@ -1,11 +0,0 @@ -public class Application { - @MarkerTwo - @MarkerOne - public void greet(String name) { - System.out.println("Hello " + name + "!"); - } - - public static void main(String[] args) { - new Application().greet("world"); - } -} diff --git a/tests/bugs1919/github_214/FirstAspect.java b/tests/bugs1919/github_214/FirstAspect.java deleted file mode 100644 index 274e3a122..000000000 --- a/tests/bugs1919/github_214/FirstAspect.java +++ /dev/null @@ -1,11 +0,0 @@ -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; - -@Aspect -public class FirstAspect { - @Before("execution(@MarkerOne * *(..))") - public void beforeAdvice(JoinPoint joinPoint){ - System.out.println("FirstAspect: " + joinPoint); - } -} diff --git a/tests/bugs1919/github_214/MarkerOne.java b/tests/bugs1919/github_214/MarkerOne.java deleted file mode 100644 index c59c42afc..000000000 --- a/tests/bugs1919/github_214/MarkerOne.java +++ /dev/null @@ -1 +0,0 @@ -public @interface MarkerOne { } diff --git a/tests/bugs1919/github_214/MarkerTwo.java b/tests/bugs1919/github_214/MarkerTwo.java deleted file mode 100644 index 213851d93..000000000 --- a/tests/bugs1919/github_214/MarkerTwo.java +++ /dev/null @@ -1 +0,0 @@ -public @interface MarkerTwo { } diff --git a/tests/bugs1919/github_214/SecondAspect.java b/tests/bugs1919/github_214/SecondAspect.java deleted file mode 100644 index a4cc1bdb2..000000000 --- a/tests/bugs1919/github_214/SecondAspect.java +++ /dev/null @@ -1,12 +0,0 @@ -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; - -@Aspect -public class SecondAspect { - @Around("execution(@MarkerTwo * *(..))") - public Object around(ProceedingJoinPoint joinPoint) throws Throwable { - System.out.println("SecondAspect: " + joinPoint); - return joinPoint.proceed(); - } -} diff --git a/tests/bugs1919/github_24/ExactlyMatchingAspect.aj b/tests/bugs1919/github_24/ExactlyMatchingAspect.aj deleted file mode 100644 index a884d00fc..000000000 --- a/tests/bugs1919/github_24/ExactlyMatchingAspect.aj +++ /dev/null @@ -1,25 +0,0 @@ -public aspect ExactlyMatchingAspect { - after() : execution(public MaybeMissingClass MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } - - after() : execution(public MaybeMissingClass[] MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } - - after() : execution(public MaybeMissingClass[][] MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } - - after() : execution(public int MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } - - after() : execution(public int[] MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } - - after() : execution(public int[][] MaybeMissingClass.*()) { - System.out.println(thisJoinPoint); - } -} diff --git a/tests/bugs1919/github_24/FuzzilyMatchingAspect.aj b/tests/bugs1919/github_24/FuzzilyMatchingAspect.aj deleted file mode 100644 index b40c13c62..000000000 --- a/tests/bugs1919/github_24/FuzzilyMatchingAspect.aj +++ /dev/null @@ -1,39 +0,0 @@ -public aspect FuzzilyMatchingAspect { - - pointcut returnRefTypeSimpleOrArray() : execution(public MaybeMissing* MaybeMissing*.*()); - pointcut return1DimRefTypeArray() : execution(public MaybeMissing*[] MaybeMissing*.*()); - pointcut return2DimRefTypeArray() : execution(public MaybeMissing*[][] MaybeMissing*.*()); - - // Return type 'MaybeMissing*' also matches array types due to the '*' at the end. - // Therefore, explicitly exclude array pointcuts in order to only match the method returning the simple type. - after() : returnRefTypeSimpleOrArray() && !return1DimRefTypeArray() && !return2DimRefTypeArray() { - System.out.println(thisJoinPoint); - } - - after() : return1DimRefTypeArray() { - System.out.println(thisJoinPoint); - } - - after() : return2DimRefTypeArray() { - System.out.println(thisJoinPoint); - } - - pointcut returnPrimitiveTypeSimpleOrArray() : execution(public in* MaybeMissing*.*()); - pointcut return1DimPrimitiveTypeArray() : execution(public in*[] MaybeMissing*.*()); - pointcut return2DimPrimitiveTypeArray() : execution(public in*[][] MaybeMissing*.*()); - - // Return type 'in*' also matches array types due to the '*' at the end. - // Therefore, explicitly exclude array pointcuts in order to only match the method returning the simple type. - after() : returnPrimitiveTypeSimpleOrArray() && !return1DimPrimitiveTypeArray() && !return2DimPrimitiveTypeArray() { - System.out.println(thisJoinPoint); - } - - after() : return1DimPrimitiveTypeArray() { - System.out.println(thisJoinPoint); - } - - after() : return2DimPrimitiveTypeArray() { - System.out.println(thisJoinPoint); - } - -} diff --git a/tests/bugs1919/github_24/MaybeMissingClass.java b/tests/bugs1919/github_24/MaybeMissingClass.java deleted file mode 100644 index 17952583b..000000000 --- a/tests/bugs1919/github_24/MaybeMissingClass.java +++ /dev/null @@ -1,40 +0,0 @@ -public class MaybeMissingClass { - public static void main(String[] args) { - f1(); - f2(); - f3(); - f4(); - f5(); - f6(); - } - - public static MaybeMissingClass f1() { - System.out.println("MaybeMissingClass.f1"); - return null; - } - - public static MaybeMissingClass[] f2() { - System.out.println("MaybeMissingClass.f2"); - return null; - } - - public static MaybeMissingClass[][] f3() { - System.out.println("MaybeMissingClass.f3"); - return null; - } - - public static int f4() { - System.out.println("MaybeMissingClass.f4"); - return 0; - } - - public static int[] f5() { - System.out.println("MaybeMissingClass.f5"); - return new int[2]; - } - - public static int[][] f6() { - System.out.println("MaybeMissingClass.f6"); - return new int[2][2]; - } -} diff --git a/tests/bugs1920/github_162/InterfaceWithInnerClass.java b/tests/bugs1920/github_162/InterfaceWithInnerClass.java new file mode 100644 index 000000000..f26975cc0 --- /dev/null +++ b/tests/bugs1920/github_162/InterfaceWithInnerClass.java @@ -0,0 +1,32 @@ +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.JoinPoint; + +/** + * https://github.com/eclipse/org.aspectj/issues/162 + */ +public interface InterfaceWithInnerClass { + public class ImplicitlyStatic { + public int getNumber() { + return 11; + } + + public static void main(String[] args) { + System.out.println(new ImplicitlyStatic().getNumber()); + } + } + + /*static*/ aspect MyAspect { + before() : execution(* main(..)) { + System.out.println(thisJoinPoint); + } + } + + @Aspect + /*static*/ class MyAnnotationAspect { + @Before("execution(* getNumber(..))") + public void myAdvice(JoinPoint thisJoinPoint){ + System.out.println(thisJoinPoint); + } + } +} diff --git a/tests/bugs1920/github_190/SwitchCaseWith_Integer_MAX_VALUE.java b/tests/bugs1920/github_190/SwitchCaseWith_Integer_MAX_VALUE.java new file mode 100644 index 000000000..d083fe60f --- /dev/null +++ b/tests/bugs1920/github_190/SwitchCaseWith_Integer_MAX_VALUE.java @@ -0,0 +1,20 @@ +public class SwitchCaseWith_Integer_MAX_VALUE { + public static void main(String[] args) { + System.out.println(switchTest(Integer.MAX_VALUE)); + } + + static String switchTest(int i) { + switch (i) { + case Integer.MAX_VALUE: + return "CASE_1"; + default: + return ""; + } + } +} + +aspect MyAspect { + before() : execution(* switchTest(*)) { + System.out.println(thisJoinPoint); + } +} diff --git a/tests/bugs1920/github_20/ParenthesisedAJKeywords.java b/tests/bugs1920/github_20/ParenthesisedAJKeywords.java new file mode 100644 index 000000000..1ba013c57 --- /dev/null +++ b/tests/bugs1920/github_20/ParenthesisedAJKeywords.java @@ -0,0 +1,33 @@ +/** + * https://github.com/eclipse/org.aspectj/issues/20 + */ +public class ParenthesisedAJKeywords { + public static void main(String[] args) { + boolean before = true; + int after = 11; + String around = "around"; + boolean aspect = true; + int pointcut = 22; + String declare = "declare"; + String privileged = "privileged"; + + if ((before)) { + System.out.println(foo((before))); + switch ((after)) { + default: System.out.println("after"); + } + System.out.println((around)); + System.out.println(!(aspect) ? "no aspect" : "aspect"); + switch ((pointcut)) { + case 22: System.out.println("pointcut"); break; + default: System.out.println("xxx"); + } + System.out.println((declare)); + System.out.println((privileged)); + } + } + + public static String foo(boolean before) { + return (before) ? "before" : "after"; + } +} diff --git a/tests/bugs1920/github_214/Application.java b/tests/bugs1920/github_214/Application.java new file mode 100644 index 000000000..5401e0875 --- /dev/null +++ b/tests/bugs1920/github_214/Application.java @@ -0,0 +1,11 @@ +public class Application { + @MarkerTwo + @MarkerOne + public void greet(String name) { + System.out.println("Hello " + name + "!"); + } + + public static void main(String[] args) { + new Application().greet("world"); + } +} diff --git a/tests/bugs1920/github_214/FirstAspect.java b/tests/bugs1920/github_214/FirstAspect.java new file mode 100644 index 000000000..274e3a122 --- /dev/null +++ b/tests/bugs1920/github_214/FirstAspect.java @@ -0,0 +1,11 @@ +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; + +@Aspect +public class FirstAspect { + @Before("execution(@MarkerOne * *(..))") + public void beforeAdvice(JoinPoint joinPoint){ + System.out.println("FirstAspect: " + joinPoint); + } +} diff --git a/tests/bugs1920/github_214/MarkerOne.java b/tests/bugs1920/github_214/MarkerOne.java new file mode 100644 index 000000000..c59c42afc --- /dev/null +++ b/tests/bugs1920/github_214/MarkerOne.java @@ -0,0 +1 @@ +public @interface MarkerOne { } diff --git a/tests/bugs1920/github_214/MarkerTwo.java b/tests/bugs1920/github_214/MarkerTwo.java new file mode 100644 index 000000000..213851d93 --- /dev/null +++ b/tests/bugs1920/github_214/MarkerTwo.java @@ -0,0 +1 @@ +public @interface MarkerTwo { } diff --git a/tests/bugs1920/github_214/SecondAspect.java b/tests/bugs1920/github_214/SecondAspect.java new file mode 100644 index 000000000..a4cc1bdb2 --- /dev/null +++ b/tests/bugs1920/github_214/SecondAspect.java @@ -0,0 +1,12 @@ +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; + +@Aspect +public class SecondAspect { + @Around("execution(@MarkerTwo * *(..))") + public Object around(ProceedingJoinPoint joinPoint) throws Throwable { + System.out.println("SecondAspect: " + joinPoint); + return joinPoint.proceed(); + } +} diff --git a/tests/bugs1920/github_24/ExactlyMatchingAspect.aj b/tests/bugs1920/github_24/ExactlyMatchingAspect.aj new file mode 100644 index 000000000..a884d00fc --- /dev/null +++ b/tests/bugs1920/github_24/ExactlyMatchingAspect.aj @@ -0,0 +1,25 @@ +public aspect ExactlyMatchingAspect { + after() : execution(public MaybeMissingClass MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } + + after() : execution(public MaybeMissingClass[] MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } + + after() : execution(public MaybeMissingClass[][] MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } + + after() : execution(public int MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } + + after() : execution(public int[] MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } + + after() : execution(public int[][] MaybeMissingClass.*()) { + System.out.println(thisJoinPoint); + } +} diff --git a/tests/bugs1920/github_24/FuzzilyMatchingAspect.aj b/tests/bugs1920/github_24/FuzzilyMatchingAspect.aj new file mode 100644 index 000000000..b40c13c62 --- /dev/null +++ b/tests/bugs1920/github_24/FuzzilyMatchingAspect.aj @@ -0,0 +1,39 @@ +public aspect FuzzilyMatchingAspect { + + pointcut returnRefTypeSimpleOrArray() : execution(public MaybeMissing* MaybeMissing*.*()); + pointcut return1DimRefTypeArray() : execution(public MaybeMissing*[] MaybeMissing*.*()); + pointcut return2DimRefTypeArray() : execution(public MaybeMissing*[][] MaybeMissing*.*()); + + // Return type 'MaybeMissing*' also matches array types due to the '*' at the end. + // Therefore, explicitly exclude array pointcuts in order to only match the method returning the simple type. + after() : returnRefTypeSimpleOrArray() && !return1DimRefTypeArray() && !return2DimRefTypeArray() { + System.out.println(thisJoinPoint); + } + + after() : return1DimRefTypeArray() { + System.out.println(thisJoinPoint); + } + + after() : return2DimRefTypeArray() { + System.out.println(thisJoinPoint); + } + + pointcut returnPrimitiveTypeSimpleOrArray() : execution(public in* MaybeMissing*.*()); + pointcut return1DimPrimitiveTypeArray() : execution(public in*[] MaybeMissing*.*()); + pointcut return2DimPrimitiveTypeArray() : execution(public in*[][] MaybeMissing*.*()); + + // Return type 'in*' also matches array types due to the '*' at the end. + // Therefore, explicitly exclude array pointcuts in order to only match the method returning the simple type. + after() : returnPrimitiveTypeSimpleOrArray() && !return1DimPrimitiveTypeArray() && !return2DimPrimitiveTypeArray() { + System.out.println(thisJoinPoint); + } + + after() : return1DimPrimitiveTypeArray() { + System.out.println(thisJoinPoint); + } + + after() : return2DimPrimitiveTypeArray() { + System.out.println(thisJoinPoint); + } + +} diff --git a/tests/bugs1920/github_24/MaybeMissingClass.java b/tests/bugs1920/github_24/MaybeMissingClass.java new file mode 100644 index 000000000..17952583b --- /dev/null +++ b/tests/bugs1920/github_24/MaybeMissingClass.java @@ -0,0 +1,40 @@ +public class MaybeMissingClass { + public static void main(String[] args) { + f1(); + f2(); + f3(); + f4(); + f5(); + f6(); + } + + public static MaybeMissingClass f1() { + System.out.println("MaybeMissingClass.f1"); + return null; + } + + public static MaybeMissingClass[] f2() { + System.out.println("MaybeMissingClass.f2"); + return null; + } + + public static MaybeMissingClass[][] f3() { + System.out.println("MaybeMissingClass.f3"); + return null; + } + + public static int f4() { + System.out.println("MaybeMissingClass.f4"); + return 0; + } + + public static int[] f5() { + System.out.println("MaybeMissingClass.f5"); + return new int[2]; + } + + public static int[][] f6() { + System.out.println("MaybeMissingClass.f6"); + return new int[2][2]; + } +} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1919/Bugs1919Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1919/Bugs1919Tests.java index ba4f99ade..3c921f51a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1919/Bugs1919Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1919/Bugs1919Tests.java @@ -19,38 +19,6 @@ public class Bugs1919Tests extends XMLBasedAjcTestCase { runTest("declare annotation with SOURCE retention"); } - public void testSwitchWith_Integer_MAX_VALUE() { - runTest("switch with Integer.MAX_VALUE case"); - } - - public void testParenthesisedExpressionWithAjKeyword() { - runTest("parenthesised expression with AspectJ keyword"); - } - - public void testInterfaceInnerAspectImplicitlyStatic() { - runTest("inner aspect of interface is implicitly static"); - } - - public void testExactArrayTypeMatchCompiledTogether() { - runTest("exact array type matching, aspect compiled together with target class"); - } - - public void testExactArrayTypeMatchCompiledSeparately() { - runTest("exact array type matching, aspect compiled separately from target class"); - } - - public void testFuzzyArrayTypeMatchCompiledTogether() { - runTest("fuzzy array type matching, aspect compiled together with target class"); - } - - public void testFuzzyArrayTypeMatchCompiledSeparately() { - runTest("fuzzy array type matching, aspect compiled separately from target class"); - } - - public void test_GitHub_214() { - runTest("ArrayIndexOutOfBoundsException with Xlint unorderedAdviceAtShadow=warning"); - } - public static Test suite() { return XMLBasedAjcTestCase.loadSuite(Bugs1919Tests.class); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java index 593fdb198..574f1b7aa 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java @@ -15,6 +15,38 @@ import org.aspectj.testing.XMLBasedAjcTestCase; */ public class Bugs1920Tests extends XMLBasedAjcTestCase { + public void testSwitchWith_Integer_MAX_VALUE() { + runTest("switch with Integer.MAX_VALUE case"); + } + + public void testParenthesisedExpressionWithAjKeyword() { + runTest("parenthesised expression with AspectJ keyword"); + } + + public void testInterfaceInnerAspectImplicitlyStatic() { + runTest("inner aspect of interface is implicitly static"); + } + + public void testExactArrayTypeMatchCompiledTogether() { + runTest("exact array type matching, aspect compiled together with target class"); + } + + public void testExactArrayTypeMatchCompiledSeparately() { + runTest("exact array type matching, aspect compiled separately from target class"); + } + + public void testFuzzyArrayTypeMatchCompiledTogether() { + runTest("fuzzy array type matching, aspect compiled together with target class"); + } + + public void testFuzzyArrayTypeMatchCompiledSeparately() { + runTest("fuzzy array type matching, aspect compiled separately from target class"); + } + + public void test_GitHub_214() { + runTest("ArrayIndexOutOfBoundsException with Xlint unorderedAdviceAtShadow=warning"); + } + /** * Add correct annotations to multiple ITD methods with the same name and same number of arguments, i.e. copy the * annotations correctly from the aspect into the target class instead of falsely always copying the annotations (if diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml index f8bccce64..dd3f2b1a2 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml @@ -172,219 +172,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml index ed301b4f3..402f50a2f 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml @@ -176,6 +176,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3