259279: test and fix: bridge pipeline

diff --git a/tests/bugs163/pr259279/Aspect.java b/tests/bugs163/pr259279/Aspect.java
new file mode 100644 (file)
index 0000000..9c6d898
--- /dev/null
+++ b/tests/bugs163/pr259279/Aspect.java
@@ -0,0 +1 @@
+public aspect Aspect pertypewithin(*){}

diff --git a/tests/bugs163/pr259279/GenericService.java b/tests/bugs163/pr259279/GenericService.java
new file mode 100644 (file)
index 0000000..6fdd7a4
--- /dev/null
+++ b/tests/bugs163/pr259279/GenericService.java
@@ -0,0 +1,4 @@
+public interface GenericService<T extends SomeInterface> {
+       public void doStuff(T t);
+}
+

diff --git a/tests/bugs163/pr259279/GenericServiceImpl.java b/tests/bugs163/pr259279/GenericServiceImpl.java
new file mode 100644 (file)
index 0000000..3b38bb4
--- /dev/null
+++ b/tests/bugs163/pr259279/GenericServiceImpl.java
@@ -0,0 +1,5 @@
+public class GenericServiceImpl<T extends SomeInterface> implements
+GenericService<T> {
+       public void doStuff(T t) {}
+}
+

diff --git a/tests/bugs163/pr259279/Main.java b/tests/bugs163/pr259279/Main.java
new file mode 100644 (file)
index 0000000..bcda99e
--- /dev/null
+++ b/tests/bugs163/pr259279/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+       public static void main(String[] args) {
+               new SomeServiceImpl();
+       }
+}
+

diff --git a/tests/bugs163/pr259279/SomeInterface.java b/tests/bugs163/pr259279/SomeInterface.java
new file mode 100644 (file)
index 0000000..b1039b8
--- /dev/null
+++ b/tests/bugs163/pr259279/SomeInterface.java
@@ -0,0 +1,2 @@
+public interface SomeInterface {}
+

diff --git a/tests/bugs163/pr259279/SomeServiceImpl.java b/tests/bugs163/pr259279/SomeServiceImpl.java
new file mode 100644 (file)
index 0000000..96ac4e4
--- /dev/null
+++ b/tests/bugs163/pr259279/SomeServiceImpl.java
@@ -0,0 +1,6 @@
+public class SomeServiceImpl extends GenericServiceImpl<SomeInterface> {
+       @Override
+       public void doStuff(SomeInterface someInterface) {
+       }
+}
+

diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index a6c3900f4be3cdbc2d182b1828ff646902c1cfb1..e45c448eede249e3202a23c8fb31f8d84bed2fc4 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -31,6 +31,14 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        // runTest("itd anonymous inner class in wrong package");
        // }
 
+       public void testOrderingRepetitive_pr259279() {
+               runTest("ordering repetitive method");
+       }
+
+       public void testOrderingRepetitive_pr259279_2() {
+               runTest("ordering repetitive method - 2");
+       }
+
        public void testExtendingASI_pr252722() {
                runTest("extending AbstractSecurityInterceptor");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index cf8c9cf61472c81f3cc8a9aa96e31d8f0b75919d..211b8b22e53b7337a2a4001bc10944248f79e583 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -2,6 +2,17 @@
 
 <suite>
     
+    
+    <ajc-test dir="bugs163/pr259279" title="ordering repetitive method">
+         <compile files="SomeServiceImpl.java SomeInterface.java Main.java GenericService.java GenericServiceImpl.java Aspect.java" options="-1.5"/>
+         <run class="Main"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs163/pr259279" title="ordering repetitive method - 2">
+         <compile files="GenericServiceImpl.java SomeServiceImpl.java SomeInterface.java Main.java GenericService.java Aspect.java" options="-1.5"/>
+         <run class="Main"/>
+    </ajc-test>
+    
     <ajc-test dir="bugs163/pr258653" title="getNode">
          <compile files="staticinit.java" options="-1.5 -emacssym"/>
     </ajc-test>