fix and tests for Bugzilla Bug 41123

	  	Weaving failure when using injars

5 files changed, 54 insertions, 0 deletions

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 1a73d9990..5fa1ab82d 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6667,4 +6667,40 @@
 			</compile>
 		</ajc-test>
 		
+		
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (no jars)">
+		<compile
+			files="lib/ExecutionMonitor.aj,model/BusObj.java,model/MonitorBusObj.java">
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on aspectpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			aspectpath="lib.jar">
+		</compile>
+	</ajc-test>
+
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (on classpath)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java"
+			classpath="lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
+	
+	<ajc-test dir="bugs/moreInterfaceLibrary"
+		pr="41123"
+		title="Weaving failure when using injars (actual injars)">
+		<compile
+			files="model/BusObj.java,model/MonitorBusObj.java,lib.jar">
+		    <message kind="error" line="3"/>
+		</compile>
+	</ajc-test>
 </suite>
diff --git a/tests/bugs/moreInterfaceLibrary/lib.jar b/tests/bugs/moreInterfaceLibrary/lib.jar
new file mode 100644
index 000000000..0c6f6c26e
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/lib.jar
diff --git a/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj b/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj
new file mode 100644
index 000000000..ec2314d14
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/lib/ExecutionMonitor.aj
@@ -0,0 +1,6 @@
+package lib;

+

+public aspect ExecutionMonitor {

+    public interface MonitoredItem {}

+    private void MonitoredItem.record(String eventType, String eventName) {}

+}   
\ No newline at end of file
diff --git a/tests/bugs/moreInterfaceLibrary/model/BusObj.java b/tests/bugs/moreInterfaceLibrary/model/BusObj.java
new file mode 100644
index 000000000..90efbd79d
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/model/BusObj.java
@@ -0,0 +1,5 @@
+package model;
+
+public class BusObj {
+
+}
diff --git a/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java b/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java
new file mode 100644
index 000000000..2d5224004
--- /dev/null
+++ b/tests/bugs/moreInterfaceLibrary/model/MonitorBusObj.java
@@ -0,0 +1,7 @@
+package model;
+
+import lib.ExecutionMonitor;
+
+public aspect MonitorBusObj {
+	declare parents: BusObj implements ExecutionMonitor.MonitoredItem;
+}
\ No newline at end of file