248297: fix

diff --git a/tests/bugs166/pr284297/DomainLogic.java b/tests/bugs166/pr284297/DomainLogic.java
new file mode 100644 (file)
index 0000000..4091f43
--- /dev/null
+++ b/tests/bugs166/pr284297/DomainLogic.java
@@ -0,0 +1 @@
+public class DomainLogic<E, D extends DomainObject<E>> { }

diff --git a/tests/bugs166/pr284297/DomainObject.java b/tests/bugs166/pr284297/DomainObject.java
new file mode 100644 (file)
index 0000000..30fa49f
--- /dev/null
+++ b/tests/bugs166/pr284297/DomainObject.java
@@ -0,0 +1 @@
+public class DomainObject<E> { }

diff --git a/tests/bugs166/pr284297/FancyDomainLogic.java b/tests/bugs166/pr284297/FancyDomainLogic.java
new file mode 100644 (file)
index 0000000..bed6c18
--- /dev/null
+++ b/tests/bugs166/pr284297/FancyDomainLogic.java
@@ -0,0 +1,6 @@
+//@Configurable
+public class FancyDomainLogic<E, D extends DomainObject<E>> extends DomainLogic<E, D> { }
+
+aspect X {
+declare parents: FancyDomainLogic implements java.io.Serializable;
+}

diff --git a/tests/bugs166/pr284297/FancyDomainLogicImpl.java b/tests/bugs166/pr284297/FancyDomainLogicImpl.java
new file mode 100644 (file)
index 0000000..2a93158
--- /dev/null
+++ b/tests/bugs166/pr284297/FancyDomainLogicImpl.java
@@ -0,0 +1 @@
+public class FancyDomainLogicImpl <E, D extends DomainObject<E>> extends FancyDomainLogic<E, D> { }

diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
index bd6283b772479c619190dac3016fc98dfb362cca..6019d7a21458d94c7979ad0f9599d0ef3c7e7643 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
@@ -23,6 +23,10 @@ public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        // runTest("generics bridge");
        // }
 
+       public void testGenericSigProblem_pr284297() {
+               runTest("generic signature problem");
+       }
+
        public void testInterfacesSerializable_pr283229() {
                runTest("interfaces and serializable");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
index 0a7d6a8c0fbfc134d85ee2532f3016a9484f4a9c..6ccf9262e00da257fd762f9f58c52cc2ddbfb91d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
+++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
@@ -2,6 +2,11 @@
 
 <suite>
    
+  <ajc-test dir="bugs166/pr284297" title="generic signature problem">
+     <compile files="DomainLogic.java DomainObject.java FancyDomainLogic.java" options="-1.5" outjar="code.jar"/>
+     <compile files="FancyDomainLogicImpl.java" options="-1.5" classpath="code.jar"/>
+   </ajc-test>
+
    <ajc-test dir="bugs166/pr283229" title="interfaces and serializable">
      <compile files="Foo.java" options="-1.5 -XaddSerialVersionUID"/>
      <run class="Foo">