Upgraded test infra to support building/running modules

3 files changed, 21 insertions, 3 deletions

diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
index 2fd748ff2..86c5fbaf7 100644
--- a/testing/src/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
@@ -378,6 +378,18 @@ class MyCompilerConfig implements ICompilerConfiguration {
 		return null;
 	}
 
+	@Override
+	public String getModulepath() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getModuleSourcepath() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
 
 class MyOutputLocationManager implements IOutputLocationManager {
@@ -417,7 +429,6 @@ class MyOutputLocationManager implements IOutputLocationManager {
 	}
 
 	public int discoverChangesSince(File dir, long buildtime) {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
index 8efad22de..aade35f48 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java
@@ -610,6 +610,9 @@ public class JavaRun implements IAjcRun {
         /** fully-qualified name of the class to run */
         protected String className;
         
+        /** Alternative to classname for specifying what to run modulename/type */
+        protected String module;
+        
         /** minimum required version of Java, if any */
         protected String javaVersion;
         
@@ -669,6 +672,10 @@ public class JavaRun implements IAjcRun {
             this.className = className;
         }
         
+        public void setModule(String module) {
+            this.module = module;
+        }
+
         public void setLTW(String ltw) {
             useLTW = TestUtil.parseBoolean(ltw);
         }
diff --git a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
index 1c295d795..370a9ac91 100644
--- a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
+++ b/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java
@@ -251,8 +251,8 @@ public class AjcSpecXmlReader {
         digester.addSetProperties(compileX + "/file");
         digester.addSetProperties(inccompileX, "classes", "paths");
         digester.addSetProperties(runX, 
-            new String[] { "class", "vm", "skipTester", "fork", "vmargs", "aspectpath"},
-            new String[] { "className", "javaVersion", "skipTester", "fork", "vmArgs", "aspectpath"});
+            new String[] { "class", "vm", "skipTester", "fork", "vmargs", "aspectpath", "module"},
+            new String[] { "className", "javaVersion", "skipTester", "fork", "vmArgs", "aspectpath", "module"});
         digester.addSetProperties(dirchangesX);
         digester.addSetProperties(messageX);
         digester.addSetProperties(messageSrcLocX, "line", "lineAsString");