aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2023-10-05 11:24:28 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2023-10-05 11:25:01 +0700
commit99f426e351b62310ce3c31348594b106a4bf624e (patch)
treeba16b304a9fa948a4fc544f31944686c9a530962
parent39c5da6eb973ce31ad90c30c1b4156988d6b9bf8 (diff)
downloadaspectj-99f426e351b62310ce3c31348594b106a4bf624e.tar.gz
aspectj-99f426e351b62310ce3c31348594b106a4bf624e.zip
Move some 1.9.20.1 bug tests to correct directory
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
-rw-r--r--tests/bugs1920/github_257/NegatedTypeAspect.aj (renamed from tests/bugs1921/gh_257/NegatedTypeAspect.aj)0
-rw-r--r--tests/bugs1920/github_spring_27761/JpaRepositoryDump.java (renamed from tests/bugs1921/gh_spring_27761/JpaRepositoryDump.java)0
-rw-r--r--tests/bugs1920/github_spring_27761/RepositoryAspect.aj (renamed from tests/bugs1921/gh_spring_27761/RepositoryAspect.aj)0
-rw-r--r--tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java3
-rw-r--r--tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml11
5 files changed, 9 insertions, 5 deletions
diff --git a/tests/bugs1921/gh_257/NegatedTypeAspect.aj b/tests/bugs1920/github_257/NegatedTypeAspect.aj
index 8bb6a18b3..8bb6a18b3 100644
--- a/tests/bugs1921/gh_257/NegatedTypeAspect.aj
+++ b/tests/bugs1920/github_257/NegatedTypeAspect.aj
diff --git a/tests/bugs1921/gh_spring_27761/JpaRepositoryDump.java b/tests/bugs1920/github_spring_27761/JpaRepositoryDump.java
index b70330bff..b70330bff 100644
--- a/tests/bugs1921/gh_spring_27761/JpaRepositoryDump.java
+++ b/tests/bugs1920/github_spring_27761/JpaRepositoryDump.java
diff --git a/tests/bugs1921/gh_spring_27761/RepositoryAspect.aj b/tests/bugs1920/github_spring_27761/RepositoryAspect.aj
index b938d754c..b938d754c 100644
--- a/tests/bugs1921/gh_spring_27761/RepositoryAspect.aj
+++ b/tests/bugs1920/github_spring_27761/RepositoryAspect.aj
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 b1942f11b..a87230f90 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc1920/Bugs1920Tests.java
@@ -70,7 +70,8 @@ public class Bugs1920Tests extends XMLBasedAjcTestCase {
/**
* If one generic method overrides another one with a narrower return type, avoid matching bridge methods.
* <p>
- * See <a href="https://github.com/spring-projects/spring-framework/issues/27761">Spring GitHub issue 27761</a>.
+ * See <a href="https://github.com/spring-projects/spring-framework/issues/27761">Spring GitHub issue 27761</a>,
+ * <a href="https://github.com/eclipse-aspectj/aspectj/issues/257">AspectJ GitHub issue 257</a>.
* <p>
* This test uses an ASM-modified class file reproducing the problem seen in Spring in plain AspectJ. Before the
* bugfix, it fails with <b>"advice defined in RepositoryAspect has not been applied [Xlint:adviceDidNotMatch]".</b>
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 1d25a176a..98a255088 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
@@ -418,8 +418,11 @@
</run>
</ajc-test>
- <!-- https://github.com/spring-projects/spring-framework/issues/27761 -->
- <ajc-test dir="bugs1921/gh_spring_27761" vm="8" title="do not match bridge methods">
+ <!--
+ https://github.com/spring-projects/spring-framework/issues/27761, AspectJ 1.9.20.1
+ https://github.com/eclipse-aspectj/aspectj/issues/257
+ -->
+ <ajc-test dir="bugs1920/github_spring_27761" vm="8" title="do not match bridge methods">
<!-- (1) Use ASM to generate JpaRepository class with reordered methods -->
<compile files="JpaRepositoryDump.java" options="-8"/>
<run class="JpaRepositoryDump" options="$sandbox"/>
@@ -434,8 +437,8 @@
</run>
</ajc-test>
- <!-- https://github.com/eclipse-aspectj/aspectj/issues/257 -->
- <ajc-test dir="bugs1921/gh_257" vm="8" title="handle negated type patterns correctly">
+ <!-- https://github.com/eclipse-aspectj/aspectj/issues/257, AspectJ 1.9.20.1 -->
+ <ajc-test dir="bugs1920/github_257" vm="8" title="handle negated type patterns correctly">
<compile files="NegatedTypeAspect.aj" options="-8"/>
<run class="NegatedTypeAspect">
<stdout>