additional incremental tests : bugs 54622, 54621

43 files changed, 529 insertions, 0 deletions

diff --git a/tests/incrementalju/injarTests/classAdded/MyJar.jar b/tests/incrementalju/injarTests/classAdded/MyJar.jar
new file mode 100644
index 000000000..9e4f835e5
--- /dev/null
+++ b/tests/incrementalju/injarTests/classAdded/MyJar.jar
diff --git a/tests/incrementalju/injarTests/classAdded/changes/MyJar.20.jar b/tests/incrementalju/injarTests/classAdded/changes/MyJar.20.jar
new file mode 100644
index 000000000..21464053b
--- /dev/null
+++ b/tests/incrementalju/injarTests/classAdded/changes/MyJar.20.jar
diff --git a/tests/incrementalju/injarTests/classAdded/src/World.java b/tests/incrementalju/injarTests/classAdded/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/injarTests/classAdded/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/injarTests/classRemoved/MyJar.jar b/tests/incrementalju/injarTests/classRemoved/MyJar.jar
new file mode 100644
index 000000000..21464053b
--- /dev/null
+++ b/tests/incrementalju/injarTests/classRemoved/MyJar.jar
diff --git a/tests/incrementalju/injarTests/classRemoved/changes/MyJar.20.jar b/tests/incrementalju/injarTests/classRemoved/changes/MyJar.20.jar
new file mode 100644
index 000000000..9e4f835e5
--- /dev/null
+++ b/tests/incrementalju/injarTests/classRemoved/changes/MyJar.20.jar
diff --git a/tests/incrementalju/injarTests/classRemoved/src/World.java b/tests/incrementalju/injarTests/classRemoved/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/injarTests/classRemoved/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/injarTests/src/Hello.class b/tests/incrementalju/injarTests/src/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/Hello.class
diff --git a/tests/incrementalju/injarTests/src/Hello.java b/tests/incrementalju/injarTests/src/Hello.java
new file mode 100644
index 000000000..8d1638709
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/Hello.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello.class that is placed in indir for these resource tests.
+ */
+public class Hello {
+	
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/incrementalju/injarTests/src/Hello2.class b/tests/incrementalju/injarTests/src/Hello2.class
new file mode 100644
index 000000000..eb516c60a
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/Hello2.class
diff --git a/tests/incrementalju/injarTests/src/Hello2.java b/tests/incrementalju/injarTests/src/Hello2.java
new file mode 100644
index 000000000..c174af938
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/Hello2.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello2.class that is placed in MyJar.jar for these tests.
+ */
+public class Hello2 {
+	
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/incrementalju/injarTests/src/HelloHello2.jar b/tests/incrementalju/injarTests/src/HelloHello2.jar
new file mode 100644
index 000000000..21464053b
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/HelloHello2.jar
diff --git a/tests/incrementalju/injarTests/src/HelloOnly.jar b/tests/incrementalju/injarTests/src/HelloOnly.jar
new file mode 100644
index 000000000..9e4f835e5
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/HelloOnly.jar
diff --git a/tests/incrementalju/injarTests/src/MyJar.jar b/tests/incrementalju/injarTests/src/MyJar.jar
new file mode 100644
index 000000000..2b909601c
--- /dev/null
+++ b/tests/incrementalju/injarTests/src/MyJar.jar
diff --git a/tests/incrementalju/inpathDirTests/classAdded/changes/Hello2.20.class b/tests/incrementalju/inpathDirTests/classAdded/changes/Hello2.20.class
new file mode 100644
index 000000000..eb516c60a
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classAdded/changes/Hello2.20.class
diff --git a/tests/incrementalju/inpathDirTests/classAdded/indir/Hello.class b/tests/incrementalju/inpathDirTests/classAdded/indir/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classAdded/indir/Hello.class
diff --git a/tests/incrementalju/inpathDirTests/classAdded/src/World.java b/tests/incrementalju/inpathDirTests/classAdded/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classAdded/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello.class b/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello.class
diff --git a/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello2.class b/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello2.class
new file mode 100644
index 000000000..eb516c60a
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classRemoved/indir/Hello2.class
diff --git a/tests/incrementalju/inpathDirTests/classRemoved/src/World.java b/tests/incrementalju/inpathDirTests/classRemoved/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classRemoved/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/inpathDirTests/classUpdated/changes/Hello.20.class b/tests/incrementalju/inpathDirTests/classUpdated/changes/Hello.20.class
new file mode 100644
index 000000000..323393169
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classUpdated/changes/Hello.20.class
diff --git a/tests/incrementalju/inpathDirTests/classUpdated/indir/Hello.class b/tests/incrementalju/inpathDirTests/classUpdated/indir/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classUpdated/indir/Hello.class
diff --git a/tests/incrementalju/inpathDirTests/classUpdated/src/World.java b/tests/incrementalju/inpathDirTests/classUpdated/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/classUpdated/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/inpathDirTests/src/Hello.20.class b/tests/incrementalju/inpathDirTests/src/Hello.20.class
new file mode 100644
index 000000000..323393169
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello.20.class
diff --git a/tests/incrementalju/inpathDirTests/src/Hello.20.java b/tests/incrementalju/inpathDirTests/src/Hello.20.java
new file mode 100644
index 000000000..f4ebfd724
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello.20.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello.class that is placed in indir for these resource tests.
+ */
+public class Hello {
+	
+	public static void main(String[] args) {
+		System.out.println("updated hello");
+	}
+	
+}
diff --git a/tests/incrementalju/inpathDirTests/src/Hello.class b/tests/incrementalju/inpathDirTests/src/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello.class
diff --git a/tests/incrementalju/inpathDirTests/src/Hello.java b/tests/incrementalju/inpathDirTests/src/Hello.java
new file mode 100644
index 000000000..8d1638709
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello.class that is placed in indir for these resource tests.
+ */
+public class Hello {
+	
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/incrementalju/inpathDirTests/src/Hello2.class b/tests/incrementalju/inpathDirTests/src/Hello2.class
new file mode 100644
index 000000000..eb516c60a
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello2.class
diff --git a/tests/incrementalju/inpathDirTests/src/Hello2.java b/tests/incrementalju/inpathDirTests/src/Hello2.java
new file mode 100644
index 000000000..c174af938
--- /dev/null
+++ b/tests/incrementalju/inpathDirTests/src/Hello2.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello2.class that is placed in MyJar.jar for these tests.
+ */
+public class Hello2 {
+	
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/resourceAdded/MyJar.jar b/tests/incrementalju/resourceTests/resourceAdded/MyJar.jar
new file mode 100644
index 000000000..2b909601c
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceAdded/MyJar.jar
diff --git a/tests/incrementalju/resourceTests/resourceAdded/changes/AResourceFile.txt b/tests/incrementalju/resourceTests/resourceAdded/changes/AResourceFile.txt
new file mode 100644
index 000000000..271f1c4dd
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceAdded/changes/AResourceFile.txt
@@ -0,0 +1 @@
+Here is some text...
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/resourceAdded/changes/MyJar.20.jar b/tests/incrementalju/resourceTests/resourceAdded/changes/MyJar.20.jar
new file mode 100644
index 000000000..ff932e32d
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceAdded/changes/MyJar.20.jar
diff --git a/tests/incrementalju/resourceTests/resourceAdded/indir/Hello.class b/tests/incrementalju/resourceTests/resourceAdded/indir/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceAdded/indir/Hello.class
diff --git a/tests/incrementalju/resourceTests/resourceAdded/src/World.java b/tests/incrementalju/resourceTests/resourceAdded/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceAdded/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/resourceRemoved/MyJar.jar b/tests/incrementalju/resourceTests/resourceRemoved/MyJar.jar
new file mode 100644
index 000000000..ff932e32d
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceRemoved/MyJar.jar
diff --git a/tests/incrementalju/resourceTests/resourceRemoved/changes/AResourceFile.txt b/tests/incrementalju/resourceTests/resourceRemoved/changes/AResourceFile.txt
new file mode 100644
index 000000000..271f1c4dd
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceRemoved/changes/AResourceFile.txt
@@ -0,0 +1 @@
+Here is some text...
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/resourceRemoved/changes/MyJar.20.jar b/tests/incrementalju/resourceTests/resourceRemoved/changes/MyJar.20.jar
new file mode 100644
index 000000000..2b909601c
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceRemoved/changes/MyJar.20.jar
diff --git a/tests/incrementalju/resourceTests/resourceRemoved/src/World.java b/tests/incrementalju/resourceTests/resourceRemoved/src/World.java
new file mode 100644
index 000000000..a5d23f10d
--- /dev/null
+++ b/tests/incrementalju/resourceTests/resourceRemoved/src/World.java
@@ -0,0 +1,19 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+
+public aspect World {
+	
+	after() returning : execution(* Hello.*(..)) {
+	    System.out.println("World");
+	}
+}
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/src/AResourceFile.txt b/tests/incrementalju/resourceTests/src/AResourceFile.txt
new file mode 100644
index 000000000..271f1c4dd
--- /dev/null
+++ b/tests/incrementalju/resourceTests/src/AResourceFile.txt
@@ -0,0 +1 @@
+Here is some text...
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/src/Hello.class b/tests/incrementalju/resourceTests/src/Hello.class
new file mode 100644
index 000000000..dd227ecb9
--- /dev/null
+++ b/tests/incrementalju/resourceTests/src/Hello.class
diff --git a/tests/incrementalju/resourceTests/src/Hello.java b/tests/incrementalju/resourceTests/src/Hello.java
new file mode 100644
index 000000000..8d1638709
--- /dev/null
+++ b/tests/incrementalju/resourceTests/src/Hello.java
@@ -0,0 +1,22 @@
+/* *******************************************************************
+ * Copyright (c) 2004 IBM Corporation
+ * All rights reserved. 
+ * This program and the accompanying materials are made available 
+ * under the terms of the Common Public License v1.0 
+ * which accompanies this distribution and is available at 
+ * http://www.eclipse.org/legal/cpl-v10.html 
+ *  
+ * Contributors: 
+ *     Adrian Colyer, 
+ * ******************************************************************/
+
+/**
+ * Used to generate Hello.class that is placed in indir for these resource tests.
+ */
+public class Hello {
+	
+	public static void main(String[] args) {
+		System.out.println("hello");
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/incrementalju/resourceTests/src/MyJar.jar b/tests/incrementalju/resourceTests/src/MyJar.jar
new file mode 100644
index 000000000..2b909601c
--- /dev/null
+++ b/tests/incrementalju/resourceTests/src/MyJar.jar
diff --git a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
index fd7c1fa5e..abefc41f3 100644
--- a/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -138,7 +138,94 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
     copyFileAndDoIncrementalBuild("changes/Aspect.20.java","src/Aspect.java",messageSpec);
     run("Main");
   }
+  
+  public void testIncrementalResourceAdditionToInPath() throws Exception {
+      runTest("incremental with addition of resource to inpath directory");
+      RunResult result = run("Hello");
+      assertTrue("Should have been advised",result.getStdOut().indexOf("World") != -1);
+      nextIncrement(false);
+      assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists());
+      copyFileAndDoIncrementalBuild("changes/AResourceFile.txt", "indir/AResourceFile.txt");
+      // resources are *NOT* copied from inpath directories
+      assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists());
+  }
+  
+  public void testAdditionOfResourceToInJar() throws Exception {
+      runTest("incremental with addition of resource to inpath jar");
+      nextIncrement(true);
+      assertFalse("Resource file should not exist yet",new File(ajc.getSandboxDirectory(),"AResourceFile.txt").exists());
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      // resources *are* copied from inpath jars
+      assertAdded("AResourceFile.txt");      
+  }
+
+  public void testRemovalOfResourceFromInJar() throws Exception {
+      runTest("incremental with removal of resource from inpath jar");
+      nextIncrement(true);
+      assertAdded("AResourceFile.txt");
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      // resources *are* copied from inpath jars
+      assertDeleted("AResourceFile.txt");      
+  }
+  
+  public void testAdditionOfClassToInPathJar() throws Exception {
+      runTest("incremental with addition of class to inpath jar");
+      nextIncrement(true);
+      assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      assertAdded("Hello2.class");      
+  }
 
+  public void testRemovalOfClassFromInPathJar() throws Exception {
+      runTest("incremental with removal of class from inpath jar");
+      nextIncrement(true);
+      assertAdded("Hello2.class");
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      assertDeleted("Hello2.class");      
+  }
+  
+  public void testAdditionOfClassToInJarJar() throws Exception {
+      runTest("incremental with addition of class to injar jar");
+      nextIncrement(true);
+      assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      assertAdded("Hello2.class");      
+  }
+
+  public void testRemovalOfClassFromInJarJar() throws Exception {
+      runTest("incremental with removal of class from injar jar");
+      nextIncrement(true);
+      assertAdded("Hello2.class");
+      copyFileAndDoIncrementalBuild("changes/MyJar.20.jar", "MyJar.jar");
+      assertDeleted("Hello2.class");      
+  }
+  
+  public void testAdditionOfClassToInPathDir() throws Exception {
+      runTest("incremental with addition of class to inpath dir");
+      nextIncrement(true);
+      assertFalse("Hello2.class should not exist yet",new File(ajc.getSandboxDirectory(),"Hello2.class").exists());
+      copyFileAndDoIncrementalBuild("changes/Hello2.20.class", "indir/Hello2.class");
+      assertAdded("Hello2.class");      
+  }
+
+  public void testRemovalOfClassFromInPathDir() throws Exception {
+      runTest("incremental with removal of class from inpath dir");
+      nextIncrement(true);
+      assertAdded("Hello2.class");
+      deleteFileAndDoIncrementalBuild("indir/Hello2.class");
+      assertDeleted("Hello2.class");      
+  }
+   
+  public void testUpdateOfClassInInPathDir() throws Exception {
+      runTest("incremental with update of class in inpath dir");
+      nextIncrement(true);
+      RunResult before = run("Hello");
+      assertTrue("Should say hello",before.getStdOut().startsWith("hello"));
+      copyFileAndDoIncrementalBuild("changes/Hello.20.class", "indir/Hello.class");
+      RunResult after = run("Hello");
+      assertTrue("Should say updated hello",after.getStdOut().startsWith("updated hello"));
+  }
+  
   private long nextIncrement(boolean doWait) {
   	long time = System.currentTimeMillis();
   	if (doWait) {
diff --git a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
index f2f72c9f0..d24c5428b 100644
--- a/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
+++ b/tests/src/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
@@ -195,3 +195,177 @@
         -->
     </ajc-test>
 	
+	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
+    	pr="54622"
+		title="incremental with addition of resource to inpath directory">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="indir">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
+    	pr="54622"
+		title="incremental with addition of resource to inpath jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes added="AResourceFile.txt"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	<ajc-test dir="incrementalju/resourceTests/resourceRemoved"
+    	pr="54622"
+		title="incremental with removal of resource from inpath jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes removed="AResourceFile.txt"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	 <ajc-test dir="incrementalju/injarTests/classAdded"
+    	pr="54621"
+		title="incremental with addition of class to inpath jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes added="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	<ajc-test dir="incrementalju/injarTests/classRemoved"
+    	pr="54621"
+		title="incremental with removal of class from inpath jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes removed="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+   <ajc-test dir="incrementalju/injarTests/classAdded"
+    	pr="54621"
+		title="incremental with addition of class to injar jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental,-injars,MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes added="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	<ajc-test dir="incrementalju/injarTests/classRemoved"
+    	pr="54621"
+		title="incremental with removal of class from injar jar">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental,-injars,MyJar.jar"
+			inpath="MyJar.jar">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes removed="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+
+	 <ajc-test dir="incrementalju/inpathDirTests/classAdded"
+    	pr="54621"
+		title="incremental with addition of class to inpath dir">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="indir">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes added="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+
+	<ajc-test dir="incrementalju/inpathDirTests/classRemoved"
+    	pr="54621"
+		title="incremental with removal of class from inpath dir">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="indir">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+            <dir-changes removed="Hello2"/>
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
+
+	 <ajc-test dir="incrementalju/inpathDirTests/classUpdated"
+    	pr="54621"
+		title="incremental with update of class in inpath dir">
+        <compile 
+			staging="true" 
+			sourceroots="src"
+			options="-incremental"
+			inpath="indir">
+       	</compile>
+        <!--
+        <inc-compile tag="20">
+        </inc-compile>
+        <run class="Main"/>
+        -->
+    </ajc-test>
\ No newline at end of file