aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2023-01-09 17:53:30 +0100
committerAlexander Kriegisch <Alexander@Kriegisch.name>2023-01-15 14:41:51 +0100
commit9198f15f9bef7becb7dbce7c1a73e1e04b60cd18 (patch)
treee1a34862b679bdd3b7e3ccd254fd76a4bb8b607e /tests/src
parentbe60722eab5c7f95d55df6f16baf41eaba671d85 (diff)
downloadaspectj-9198f15f9bef7becb7dbce7c1a73e1e04b60cd18.tar.gz
aspectj-9198f15f9bef7becb7dbce7c1a73e1e04b60cd18.zip
Expand regression tests for GitHub bug #24
More test cases were added for - multi-dimensional arrays, - primitive type arrays. Relates to https://github.com/eclipse/org.aspectj/issues/24. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml69
1 files changed, 56 insertions, 13 deletions
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 67c0b6328..15f5d18d6 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml
@@ -229,8 +229,12 @@
<ajc-test dir="bugs1919/github_24" vm="1.5" title="exact array type matching, aspect compiled together with target class">
<compile files="ExactlyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo">
<!-- Even before the bugfix, in this case weaving worked as expected -->
- <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())'"/>
- <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())'"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/>
+ <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/>
+ <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/>
</compile>
<run class="MaybeMissingClass">
<stdout>
@@ -238,6 +242,14 @@
<line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/>
<line text="MaybeMissingClass.f2"/>
<line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <line text="MaybeMissingClass.f3"/>
+ <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <line text="MaybeMissingClass.f4"/>
+ <line text="execution(int MaybeMissingClass.f4())"/>
+ <line text="MaybeMissingClass.f5"/>
+ <line text="execution(int[] MaybeMissingClass.f5())"/>
+ <line text="MaybeMissingClass.f6"/>
+ <line text="execution(int[][] MaybeMissingClass.f6())"/>
</stdout>
</run>
</ajc-test>
@@ -249,16 +261,16 @@
<ajc-test dir="bugs1919/github_24" vm="1.5" title="exact array type matching, aspect compiled separately from target class">
<compile files="ExactlyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar">
<message kind="warning" text="no match for this type name: MaybeMissingClass [Xlint:invalidAbsoluteTypeName]"/>
- <message kind="warning" text="no match for this type name: MaybeMissingClass [Xlint:invalidAbsoluteTypeName]"/>
- <message kind="warning" text="no match for this type name: MaybeMissingClass [Xlint:invalidAbsoluteTypeName]"/>
- <message kind="warning" text="no match for this type name: MaybeMissingClass [Xlint:invalidAbsoluteTypeName]"/>
- <message kind="warning" text="advice defined in ExactlyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/>
<message kind="warning" text="advice defined in ExactlyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/>
</compile>
<compile files="MaybeMissingClass.java" options="-1.5 -showWeaveInfo" aspectpath="aspect.jar">
<!-- Before the bugfix, f1 would be woven twice, f2 not at all-->
- <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())'"/>
- <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())'"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/>
+ <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/>
+ <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/>
</compile>
<run class="MaybeMissingClass" classpath="aspect.jar">
<stdout>
@@ -266,6 +278,14 @@
<line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/>
<line text="MaybeMissingClass.f2"/>
<line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <line text="MaybeMissingClass.f3"/>
+ <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <line text="MaybeMissingClass.f4"/>
+ <line text="execution(int MaybeMissingClass.f4())"/>
+ <line text="MaybeMissingClass.f5"/>
+ <line text="execution(int[] MaybeMissingClass.f5())"/>
+ <line text="MaybeMissingClass.f6"/>
+ <line text="execution(int[][] MaybeMissingClass.f6())"/>
</stdout>
</run>
</ajc-test>
@@ -277,8 +297,12 @@
<ajc-test dir="bugs1919/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled together with target class">
<compile files="FuzzilyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo">
<!-- Before the bugfix, both f1 and f2 would be woven twice -->
- <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())'"/>
- <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())'"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/>
+ <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/>
+ <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/>
</compile>
<run class="MaybeMissingClass">
<stdout>
@@ -286,6 +310,14 @@
<line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/>
<line text="MaybeMissingClass.f2"/>
<line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <line text="MaybeMissingClass.f3"/>
+ <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <line text="MaybeMissingClass.f4"/>
+ <line text="execution(int MaybeMissingClass.f4())"/>
+ <line text="MaybeMissingClass.f5"/>
+ <line text="execution(int[] MaybeMissingClass.f5())"/>
+ <line text="MaybeMissingClass.f6"/>
+ <line text="execution(int[][] MaybeMissingClass.f6())"/>
</stdout>
</run>
</ajc-test>
@@ -297,12 +329,15 @@
<ajc-test dir="bugs1919/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled separately from target class">
<compile files="FuzzilyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar">
<message kind="warning" text="advice defined in FuzzilyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/>
- <message kind="warning" text="advice defined in FuzzilyMatchingAspect has not been applied [Xlint:adviceDidNotMatch]"/>
</compile>
<compile files="MaybeMissingClass.java" options="-1.5 -showWeaveInfo" aspectpath="aspect.jar">
<!-- Before the bugfix, both f1 and f2 would be woven twice -->
- <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())'"/>
- <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())'"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass MaybeMissingClass.f1())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <message kind="weave" text="method-execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <message kind="weave" text="method-execution(int MaybeMissingClass.f4())"/>
+ <message kind="weave" text="method-execution(int[] MaybeMissingClass.f5())"/>
+ <message kind="weave" text="method-execution(int[][] MaybeMissingClass.f6())"/>
</compile>
<run class="MaybeMissingClass" classpath="aspect.jar">
<stdout>
@@ -310,6 +345,14 @@
<line text="execution(MaybeMissingClass MaybeMissingClass.f1())"/>
<line text="MaybeMissingClass.f2"/>
<line text="execution(MaybeMissingClass[] MaybeMissingClass.f2())"/>
+ <line text="MaybeMissingClass.f3"/>
+ <line text="execution(MaybeMissingClass[][] MaybeMissingClass.f3())"/>
+ <line text="MaybeMissingClass.f4"/>
+ <line text="execution(int MaybeMissingClass.f4())"/>
+ <line text="MaybeMissingClass.f5"/>
+ <line text="execution(int[] MaybeMissingClass.f5())"/>
+ <line text="MaybeMissingClass.f6"/>
+ <line text="execution(int[][] MaybeMissingClass.f6())"/>
</stdout>
</run>
</ajc-test>