From 27f14f4d6ffa6bf5cc79fec29fbddf9274a6ad5f Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 2 Mar 2024 09:08:48 +0100
Subject: [PATCH] Add Bugs1921Tests::testGitHub_285

This is an additional reproducer for regression bug #285.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 tests/bugs1921/github_285/Unwoven.java        |  5 +++++
 tests/bugs1921/github_285/aop.xml             |  5 +++++
 .../systemtest/ajc1921/Bugs1921Tests.java     |  4 ++++
 .../aspectj/systemtest/ajc1921/ajc1921.xml    | 21 +++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 tests/bugs1921/github_285/Unwoven.java
 create mode 100644 tests/bugs1921/github_285/aop.xml

diff --git a/tests/bugs1921/github_285/Unwoven.java b/tests/bugs1921/github_285/Unwoven.java
new file mode 100644
index 000000000..131cbec84
--- /dev/null
+++ b/tests/bugs1921/github_285/Unwoven.java
@@ -0,0 +1,5 @@
+public class Unwoven {
+  public static void main(String[] args) {
+    System.out.println("Hello world");
+  }
+}
diff --git a/tests/bugs1921/github_285/aop.xml b/tests/bugs1921/github_285/aop.xml
new file mode 100644
index 000000000..05837da42
--- /dev/null
+++ b/tests/bugs1921/github_285/aop.xml
@@ -0,0 +1,5 @@
+<aspectj>
+  <weaver>
+    <include within="*"/>
+  </weaver>
+</aspectj>
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java
index a9dbeb5bb..40459ba8d 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc1921/Bugs1921Tests.java
@@ -19,6 +19,10 @@ public class Bugs1921Tests extends XMLBasedAjcTestCase {
     runTest("same class woven concurrently in parallel-capable classloader");
   }
 
+  public void testGitHub_285() {
+    runTest("shared cache negative test");
+  }
+
   public static Test suite() {
     return XMLBasedAjcTestCase.loadSuite(Bugs1921Tests.class);
   }
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml
index d5d4c1c69..975fa1c6c 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml
@@ -372,4 +372,25 @@
 		<ant file="ant.xml" target="same class woven concurrently in parallel-capable classloader" verbose="true"/>
 	</ajc-test>
 
+	<!--
+		https://github.com/eclipse-aspectj/aspectj/issues/285, AspectJ 1.9.21.2
+
+		See also org.aspectj.systemtest.ajc171.NewFeatures::testSharedCache. This is a quasi negative test missing back in
+		1.7.2 when the shared cache was introduced.
+	-->
+	<ajc-test dir="bugs1921/github_285" title="shared cache negative test">
+		<compile files="Unwoven.java" options="-1.5"/>
+		<run class="Unwoven" ltw="aop.xml" usefullltw="true"
+			vmargs="-Daj.weaving.cache.enabled=true -Daj.weaving.cache.dir=./ -Daj.weaving.cache.impl=shared">
+			<stdout>
+				<line text="Hello world"/>
+			</stdout>
+			<!--
+				Nothing should be printed on stderr, especially no fatal NPE with message
+				'Cannot read the array length because "b" is null' and subsequent ajcore.*.txt
+			-->
+			<stderr/>
+		</run>
+	</ajc-test>
+
 </suite>
-- 
2.39.5