From 1386abb444d0f2e5dccb22c511f3063a569a4701 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 3 Feb 2011 00:03:02 +0000
Subject: [PATCH] 336136

---
 tests/bugs1611/pr336136/Country_Roo_Op4j.java | 13 +++++++++
 .../bugs1611/pr336136/Country_Roo_Op4j2.java  | 13 +++++++++
 .../systemtest/ajc1611/Ajc1611Tests.java      |  8 +++++
 .../aspectj/systemtest/ajc1611/ajc1611.xml    | 29 +++++++++++++++++++
 4 files changed, 63 insertions(+)
 create mode 100644 tests/bugs1611/pr336136/Country_Roo_Op4j.java
 create mode 100644 tests/bugs1611/pr336136/Country_Roo_Op4j2.java

diff --git a/tests/bugs1611/pr336136/Country_Roo_Op4j.java b/tests/bugs1611/pr336136/Country_Roo_Op4j.java
new file mode 100644
index 000000000..57bd6981c
--- /dev/null
+++ b/tests/bugs1611/pr336136/Country_Roo_Op4j.java
@@ -0,0 +1,13 @@
+import com.foo.op4j.Country;
+import java.lang.Object;
+import org.javaruntype.type.Types;
+import org.op4j.functions.Function;
+import org.op4j.functions.Get;
+
+privileged aspect Country_Roo_Op4j {
+
+   public static class Country.Keys {
+
+       public static final Function COUNTRY = null;
+   }
+}
diff --git a/tests/bugs1611/pr336136/Country_Roo_Op4j2.java b/tests/bugs1611/pr336136/Country_Roo_Op4j2.java
new file mode 100644
index 000000000..047f4b5f1
--- /dev/null
+++ b/tests/bugs1611/pr336136/Country_Roo_Op4j2.java
@@ -0,0 +1,13 @@
+import com.foo.op4j.Country;
+import java.lang.Object;
+import org.javaruntype.type.Types;
+import org.op4j.functions.Function;
+import org.op4j.functions.Get;
+
+privileged aspect Country_Roo_Op4j2 {
+
+   public static class Country.Keys {
+
+       public static final Function<Object, Country> COUNTRY = Get.attrOf(Types.forClass(Country.class),"country");
+   }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index 4929b6cdd..064220b46 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -21,6 +21,14 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  */
 public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testITIT_336136() {
+		runTest("itit");
+	}
+
+	public void testITIT_336136_2() {
+		runTest("itit - 2");
+	}
+
 	public void testDeserialization_335682() {
 		runTest("pr335682");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
index a40d87eed..97c68923f 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -2,6 +2,35 @@
 
 <suite>
 
+  <ajc-test dir="bugs1611/pr336136" title="itit">
+    <compile files="Country_Roo_Op4j.java">
+    <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
+    <message kind="error" text="The import org.javaruntype cannot be resolved" line="3"/>
+    <message kind="error" text="The import org.op4j cannot be resolved" line="4"/>
+    <message kind="error" text="The import org.op4j cannot be resolved" line="5"/>
+    <message kind="error" text="Country cannot be resolved to a type" line="9"/>
+    <message kind="error" text="Function cannot be resolved to a type" line="11"/>
+    <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j$Keys"/>
+    </compile>"
+  </ajc-test>
+  
+  
+  <ajc-test dir="bugs1611/pr336136" title="itit - 2">
+    <compile files="Country_Roo_Op4j2.java" options="-1.5">
+    <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
+    <message kind="error" text="The import org.javaruntype cannot be resolved" line="3"/>
+    <message kind="error" text="The import org.op4j cannot be resolved" line="4"/>
+    <message kind="error" text="The import org.op4j cannot be resolved" line="5"/>
+    <message kind="error" text="Country cannot be resolved to a type" line="9"/>
+    <message kind="error" text="Country cannot be resolved to a type" line="11"/>
+    <message kind="error" text="Function cannot be resolved to a type" line="11"/>
+    <message kind="error" text="Get cannot be resolved" line="11"/>
+    <message kind="error" text="Types cannot be resolved" line="11"/>
+    <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j2$Keys"/>
+    </compile>"
+  </ajc-test>
+  
+
   <ajc-test dir="bugs1611/pr335682" title="pr335682">
     <compile inpath="foo.jar" outjar="bar.jar"/>
   </ajc-test>
-- 
2.39.5