summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2009-11-26 23:20:23 +0000
committeraclement <aclement>2009-11-26 23:20:23 +0000
commit80f517ebf71430b6eed15c34a5103d2bf504f5a9 (patch)
treebb270a49205723b6442888818b7dade73297a1a5
parent04ad1337131d249cc42840afea4ed32beeb61512 (diff)
downloadaspectj-80f517ebf71430b6eed15c34a5103d2bf504f5a9.tar.gz
aspectj-80f517ebf71430b6eed15c34a5103d2bf504f5a9.zip
296040: method dispatch problem with google collections
-rw-r--r--tests/bugs167/pr296040/ErrorClass.java17
-rw-r--r--tests/bugs167/pr296040/gc10rc4.jarbin0 -> 589070 bytes
-rw-r--r--tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc167/ajc167.xml5
4 files changed, 26 insertions, 0 deletions
diff --git a/tests/bugs167/pr296040/ErrorClass.java b/tests/bugs167/pr296040/ErrorClass.java
new file mode 100644
index 000000000..35f7e3cf4
--- /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
index 000000000..f2386fe6e
--- /dev/null
+++ b/tests/bugs167/pr296040/gc10rc4.jar
Binary files differ
diff --git a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
index 2b79abd49..144362473 100644
--- 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 be134a2f0..d71b90dc9 100644
--- 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"/>