296040: method dispatch problem with google collections

diff --git a/tests/bugs167/pr296040/ErrorClass.java b/tests/bugs167/pr296040/ErrorClass.java
new file mode 100644 (file)
index 0000000..35f7e3c
--- /dev/null
+++ b/tests/bugs167/pr296040/ErrorClass.java
@@ -0,0 +1,17 @@
+import java.util.Set;
+import java.util.Map.Entry;
+
+import com.google.common.collect.TreeMultimap;
+
+public class ErrorClass {
+
+    public void useGoogleCollections() {
+        TreeMultimap<String, String> countResult = TreeMultimap.create();
+        Set<Entry<String, String>> entries = countResult.entries();
+        System.out.println(entries.size());
+    }
+
+    public static void main(String[] args) {
+               new ErrorClass().useGoogleCollections();
+       }
+}
\ No newline at end of file

diff --git a/tests/bugs167/pr296040/gc10rc4.jar b/tests/bugs167/pr296040/gc10rc4.jar
new file mode 100644 (file)
index 0000000..f2386fe
Binary files /dev/null and b/tests/bugs167/pr296040/gc10rc4.jar differ

diff --git a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
index 2b79abd49ff1570133a2b62c0bd2b66dcd01b8b2..1443624736cce1397b9d0ae4aef83c359559cbc2 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
@@ -18,6 +18,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testBrokenGeneratedCode_296040() {
+               runTest("broken generated code");
+       }
+       
        public void testHierarchyBuilderNPE_pr293457() {
                runTest("hierarchy builder npe");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
index be134a2f0025848cf0e5ab5dfc4f2f9a7531bd46..d71b90dc9490852ce0ca152cecb67a0feac9d7e0 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
+++ b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
@@ -2,6 +2,11 @@
 
 <suite>
 
+  <ajc-test dir="bugs167/pr296040" title="broken generated code">
+     <compile files="ErrorClass.java" options="-1.5" classpath="gc10rc4.jar"/>
+     <run class="ErrorClass"/>
+  </ajc-test>
+  
   <ajc-test dir="bugs167/pr293457" title="hierarchy builder npe">
      <compile files="com/citi/gdos/smart/applib/service/cache/CachingIntroduction.aj org/springmodules/cache/annotations/Cacheable.java" options="-1.5 -emacssym">
      <message kind="warning" text="no match for this type name: Setter"/>