336158 - testcode

8 files changed, 21 insertions, 0 deletions

diff --git a/tests/multiIncremental/pr336158/base/src/City$Keys.class b/tests/multiIncremental/pr336158/base/src/City$Keys.class
new file mode 100644
index 000000000..3f0052b9e
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/City$Keys.class
diff --git a/tests/multiIncremental/pr336158/base/src/City.class b/tests/multiIncremental/pr336158/base/src/City.class
new file mode 100644
index 000000000..c24cd36f1
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/City.class
diff --git a/tests/multiIncremental/pr336158/base/src/City.java b/tests/multiIncremental/pr336158/base/src/City.java
new file mode 100644
index 000000000..a8d32933a
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/City.java
@@ -0,0 +1,6 @@
+public class City {
+
+    public static void main(String[] args) { 
+        Keys.CITY.get();  // Keys.City cannot be resolved
+    }
+}
diff --git a/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.class b/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.class
new file mode 100644
index 000000000..22e3d47e9
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.class
diff --git a/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.java b/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.java
new file mode 100644
index 000000000..9fbea9252
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/City_Roo_Op4j.java
@@ -0,0 +1,5 @@
+privileged aspect City_Roo_Op4j {
+    public static class City.Keys {
+        public static final Function<Object, City> CITY = null;
+    }
+}
diff --git a/tests/multiIncremental/pr336158/base/src/Function.class b/tests/multiIncremental/pr336158/base/src/Function.class
new file mode 100644
index 000000000..a19801d25
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/Function.class
diff --git a/tests/multiIncremental/pr336158/base/src/Function.java b/tests/multiIncremental/pr336158/base/src/Function.java
new file mode 100644
index 000000000..2e9157cfb
--- /dev/null
+++ b/tests/multiIncremental/pr336158/base/src/Function.java
@@ -0,0 +1 @@
+class Function<A,B> { public void get() {}}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
index 10fd73210..25642f6f3 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/IncrementalCompilationTests.java
@@ -83,6 +83,15 @@ public class IncrementalCompilationTests extends AbstractMultiProjectIncremental
 		assertContains("B.java:4:0::0 Unhandled exception type IOException", getErrorMessages(p).get(0));
 	}
 
+	public void testITIT_336158() throws Exception {
+		String p = "pr336158";
+		initialiseProject(p);
+		build(p);
+		checkWasFullBuild();
+		assertNoErrors(p);
+		checkCompileWeaveCount(p, 3, 4);
+	}
+
 	public void testITIT_336147() throws Exception {
 		String p = "pr336147";
 		initialiseProject(p);