pr173729: test and fixes committed. Modify the bcel delegate at compile time alongsi...

diff --git a/tests/multiIncremental/PR173729/base/AbstractMonitor.java b/tests/multiIncremental/PR173729/base/AbstractMonitor.java
new file mode 100644 (file)
index 0000000..3bda571
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/AbstractMonitor.java
@@ -0,0 +1,3 @@
+public abstract aspect AbstractMonitor extends AbstractMonitorControl {
+
+}

diff --git a/tests/multiIncremental/PR173729/base/AbstractMonitorClass.java b/tests/multiIncremental/PR173729/base/AbstractMonitorClass.java
new file mode 100644 (file)
index 0000000..144732e
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/AbstractMonitorClass.java
@@ -0,0 +1,3 @@
+public abstract class AbstractMonitorClass {
+
+}
\ No newline at end of file

diff --git a/tests/multiIncremental/PR173729/base/AbstractMonitorControl.aj b/tests/multiIncremental/PR173729/base/AbstractMonitorControl.aj
new file mode 100644 (file)
index 0000000..4916d87
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/AbstractMonitorControl.aj
@@ -0,0 +1,4 @@
+
+public abstract aspect AbstractMonitorControl extends AbstractMonitorClass {
+
+}
\ No newline at end of file

diff --git a/tests/multiIncremental/PR173729/base/EagerlyRegisteredManagedBean.java b/tests/multiIncremental/PR173729/base/EagerlyRegisteredManagedBean.java
new file mode 100644 (file)
index 0000000..eaad256
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/EagerlyRegisteredManagedBean.java
@@ -0,0 +1,3 @@
+
+public interface EagerlyRegisteredManagedBean extends JmxManagement.ManagedBean {
+}

diff --git a/tests/multiIncremental/PR173729/base/JdbcMonitor.java b/tests/multiIncremental/PR173729/base/JdbcMonitor.java
new file mode 100644 (file)
index 0000000..78d3cb2
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/JdbcMonitor.java
@@ -0,0 +1,7 @@
+public aspect JdbcMonitor extends AbstractMonitor  {
+   int i =1;
+   public void m() {
+           
+          
+   }
+}
\ No newline at end of file

diff --git a/tests/multiIncremental/PR173729/base/JmxManagement.aj b/tests/multiIncremental/PR173729/base/JmxManagement.aj
new file mode 100644 (file)
index 0000000..3b656e0
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/JmxManagement.aj
@@ -0,0 +1,5 @@
+public aspect JmxManagement {
+   public interface ManagedBean {
+        Class getManagementInterface();
+   }
+}
\ No newline at end of file

diff --git a/tests/multiIncremental/PR173729/base/MonitorJmxManagement.aj b/tests/multiIncremental/PR173729/base/MonitorJmxManagement.aj
new file mode 100644 (file)
index 0000000..8fff7da
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/MonitorJmxManagement.aj
@@ -0,0 +1,11 @@
+public aspect MonitorJmxManagement {
+    public interface RequestMonitorMBean extends EagerlyRegisteredManagedBean,
+RequestMonitorManagementInterface {}
+
+    declare parents: AbstractMonitor implements RequestMonitorMBean;     
+
+    public Class RequestMonitorMBean.getManagementInterface() {
+        return RequestMonitorManagementInterface.class;
+    }    
+
+}

diff --git a/tests/multiIncremental/PR173729/base/RequestMonitorManagementInterface.java b/tests/multiIncremental/PR173729/base/RequestMonitorManagementInterface.java
new file mode 100644 (file)
index 0000000..b4b311d
--- /dev/null
+++ b/tests/multiIncremental/PR173729/base/RequestMonitorManagementInterface.java
@@ -0,0 +1,4 @@
+
+public interface RequestMonitorManagementInterface {
+
+}

diff --git a/tests/multiIncremental/PR173729/inc1/JdbcMonitor.java b/tests/multiIncremental/PR173729/inc1/JdbcMonitor.java
new file mode 100644 (file)
index 0000000..79de4d3
--- /dev/null
+++ b/tests/multiIncremental/PR173729/inc1/JdbcMonitor.java
@@ -0,0 +1,8 @@
+public aspect JdbcMonitor extends AbstractMonitor  {
+   int i =1;
+   public void m() {
+           
+
+          
+   }
+}

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 808d39f7cac70ee9e12e76c7e05638aba3691cfd..d6c3bb85cf413be5101aeae77f3f232808e1099c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -149,6 +149,14 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
                }
        }
        
+       public void testIncrementalItdsWithMultipleAspects_pr173729() {
+               initialiseProject("PR173729");
+               build("PR173729");
+               checkWasFullBuild();
+               alter("PR173729","inc1");
+               build("PR173729");
+               checkWasntFullBuild();
+       }
        
        // Compile a single simple project
        public void testTheBasics() {