initial versioninitial_CPL

author: wisberg <wisberg> 2002-12-16 21:46:19 +0000
committer: wisberg <wisberg> 2002-12-16 21:46:19 +0000
commit: 31b7d84b2b4dc4ba29088947d8872027830e8fe4 (patch)
tree: ec64d701df1ee2d84272264b6688032f4a860f6d /testing-drivers
parent: c67cb6056cbd89b1fa95ec6a1813793fa18edf16 (diff)
download: aspectj-31b7d84b2b4dc4ba29088947d8872027830e8fe4.tar.gz
aspectj-31b7d84b2b4dc4ba29088947d8872027830e8fe4.zip
54 files changed, 2835 insertions, 0 deletions
diff --git a/testing-drivers/.classpath b/testing-drivers/.classpath
new file mode 100644
index 000000000..e7dfb2a5f
--- /dev/null
+++ b/testing-drivers/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="src" path="testsrc"/>
+    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="src" path="/bridge"/>
+    <classpathentry kind="src" path="/bcweaver"/>
+    <classpathentry kind="src" path="/testing"/>
+    <classpathentry kind="src" path="/testing-client"/>
+    <classpathentry kind="src" path="/util"/>
+    <classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.zip"/>
+    <classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
+    <classpathentry kind="src" path="/org.aspectj.ajdt.core"/>
+    <classpathentry kind="src" path="/asm"/>
+    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
+    <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testing-drivers/.project b/testing-drivers/.project
new file mode 100644
index 000000000..7a151fc62
--- /dev/null
+++ b/testing-drivers/.project
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>testing-drivers</name>
+	<comment></comment>
+	<projects>
+		<project>asm</project>
+		<project>bcweaver</project>
+		<project>bridge</project>
+		<project>org.aspectj.ajdt.core</project>
+		<project>org.eclipse.jdt.core</project>
+		<project>testing</project>
+		<project>testing-client</project>
+		<project>util</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/testing-drivers/readme-testing-drivers.html b/testing-drivers/readme-testing-drivers.html
new file mode 100644
index 000000000..8ac8fa7fb
--- /dev/null
+++ b/testing-drivers/readme-testing-drivers.html
@@ -0,0 +1,8 @@
+<html>
+<body>
+This project is for integration testing.
+<p>
+It depends on other projects, but requires that 
+they export any required libraries.
+</body>
+</html>
diff --git a/testing-drivers/src/.cvsignore b/testing-drivers/src/.cvsignore
new file mode 100644
index 000000000..a3f0b1b77
--- /dev/null
+++ b/testing-drivers/src/.cvsignore
@@ -0,0 +1 @@
+*.lst
diff --git a/testing-drivers/src/org/aspectj/testing/drivers/Harness.java b/testing-drivers/src/org/aspectj/testing/drivers/Harness.java
new file mode 100644
index 000000000..46e50c8ce
--- /dev/null
+++ b/testing-drivers/src/org/aspectj/testing/drivers/Harness.java
@@ -0,0 +1,1215 @@
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+package org.aspectj.testing.drivers;
+
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHolder;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.testing.harness.bridge.AjcTest;
+import org.aspectj.testing.harness.bridge.AbstractRunSpec;
+import org.aspectj.testing.harness.bridge.CompilerRun;
+import org.aspectj.testing.harness.bridge.FlatSuiteReader;
+import org.aspectj.testing.harness.bridge.IncCompilerRun;
+import org.aspectj.testing.harness.bridge.JavaRun;
+import org.aspectj.testing.harness.bridge.RunSpecIterator;
+import org.aspectj.testing.harness.bridge.Sandbox;
+import org.aspectj.testing.harness.bridge.Validator;
+import org.aspectj.testing.run.IRun;
+import org.aspectj.testing.run.IRunIterator;
+import org.aspectj.testing.run.IRunListener;
+import org.aspectj.testing.run.IRunStatus;
+import org.aspectj.testing.run.IRunValidator;
+import org.aspectj.testing.run.RunListener;
+import org.aspectj.testing.run.RunStatus;
+import org.aspectj.testing.run.RunValidator;
+import org.aspectj.testing.run.Runner;
+import org.aspectj.testing.util.BridgeUtil;
+import org.aspectj.testing.util.RunUtils;
+import org.aspectj.testing.util.StreamsHandler;
+import org.aspectj.testing.xml.AjcSpecXmlReader;
+import org.aspectj.testing.xml.XMLWriter;
+import org.aspectj.util.FileUtil;
+import org.aspectj.util.LangUtil;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+/**
+ * Test harness for running AjcTest.Suite test suites.
+ * This can be easily extended by subclassing.
+ * <ul>
+ * <li>template algorithms for reading arguments, printing syntax,
+ *     reading suites, and reporting results all
+ *     delegate to methods that subclasses can override to support
+ *     additional arguments or different reporting.</li>
+ * <li>implement arbitrary features as IRunListeners</li>
+ * <li>support single-option aliases to any number of single-options </li>
+ * </ul>
+ * See {@link report(IRunStatus, int, int)} for an explanation of test result
+ * categories.
+ */
+public class Harness {
+    /** 
+     * Spaces up to the width that an option should take in the syntax,
+     * including the two-space leader
+     */
+    protected static final String SYNTAX_PAD = "                    "; 
+    private static final String JAVA_VERSION;
+    private static final String ASPECTJ_VERSION;
+    static {
+        String version = "UNKNOWN";
+        try {  version = System.getProperty("java.version", "UNKNOWN"); }
+        catch (Throwable t) {}
+        JAVA_VERSION = version;
+        
+        version = "UNKNOWN";
+        try {
+            Class c = Class.forName("org.aspectj.bridge.Version");
+            version = (String) c.getField("text").get(null);            
+        } catch (Throwable t) {
+            // ignore
+        }
+        ASPECTJ_VERSION = version;
+    }
+    
+    /** factory for the subclass currently anointed as default */
+    public static Harness makeHarness() {
+        return new FeatureHarness();
+    }
+    
+    /** @param args String[] like runMain(String[]) args */
+    public static void main(String[] args) throws Exception {
+        if (LangUtil.isEmpty(args)) {
+            args = new String[] { "-help" };
+        }
+        makeHarness().runMain(args, null);
+    }
+
+    /**
+     * Get known option aliases.
+     * Subclasses may add new aliases, where the key is the alias option,
+     * and the value is a comma-delimited String of target options.
+     * @return Properties with feature aliases or null
+     */
+    protected static Properties getOptionAliases() {
+        if (null == optionAliases) {
+            optionAliases = new Properties();
+            // XXX load from **OptionAliases.properties
+        }
+        return optionAliases;
+    }
+
+    /** aliases key="option" value="option{,option}" */
+    private static Properties optionAliases;
+    
+    /** be extra noisy if true */
+    private boolean verboseHarness;
+    
+    /** be extra quiet if true */
+    private boolean quietHarness;
+
+    /** map of feature names to features */
+    private HashMap features;
+
+	/** if true, do not delete temporary files */
+	private boolean keepTemp;
+
+	/** if true, then log results in report(..) when done */
+	private boolean logResults;
+    
+    protected Harness() {
+        features = new HashMap();
+    }
+
+    
+    /** 
+     * Entry point for a test.
+     * This reads in the arguments, 
+     * creates the test suite(s) from the input file(s),
+     * and for each suite does setup, run, report, and cleanup. 
+     * When arguments are read, any option ending with "-" causes
+     * option variants, a set of args with and another without the
+     * option. See {@link LangUtil.optionVariants(String[])} for 
+     * more details.
+     * @param args the String[] for the test suite - use -help to get options,
+     *         and use "-" suffixes for variants.
+     * @param resultList List for IRunStatus results - ignored if null 
+     */
+    public void runMain(String[] args, List resultList) {
+        LangUtil.throwIaxIfFalse(!LangUtil.isEmpty(args), "empty args");
+        // read arguments
+        final ArrayList globals = new ArrayList();
+        final ArrayList files = new ArrayList();
+        final LinkedList argList = new LinkedList();
+        argList.addAll(Arrays.asList(args));
+        for (int i = 0; i < argList.size(); i++) {
+            String arg = (String) argList.get(i);
+            List aliases = aliasOptions(arg);
+            if (!LangUtil.isEmpty(aliases)) {
+                argList.remove(i);
+                argList.addAll(i, aliases);
+                i--;
+                continue;
+            }
+            if ("-help".equals(arg)) {
+                logln("java " + Harness.class.getName() + " {option|suiteFile}..");
+                printSyntax(getLogStream());
+                return;
+            } else if (isSuiteFile(arg)) {
+                files.add(arg); 
+            } else if (!acceptOption(arg)) {
+                globals.add(arg); 
+            } // else our options absorbed
+        }
+        if (0 == files.size()) {
+            logln("## Error reading arguments: at least 1 suite file required");
+            logln("java " + Harness.class.getName() + " {option|suiteFile}..");
+            printSyntax(getLogStream());
+            return;
+        }
+        String[] globalOptions = (String[]) globals.toArray(new String[0]);
+        String[][] globalOptionVariants = LangUtil.optionVariants(globalOptions);
+        AbstractRunSpec.RT runtime = new AbstractRunSpec.RT();
+        if (verboseHarness) {
+            runtime.setVerbose(true);
+        }
+        
+        // run suites read from each file
+        AjcTest.Suite.Spec spec;
+        for (Iterator iter = files.iterator(); iter.hasNext();) {
+            File suiteFile = new File((String) iter.next());
+            if (!suiteFile.canRead()) {
+                logln("runMain(..) cannot read file: " + suiteFile);
+                continue;
+            }
+            if (null == (spec = readSuite(suiteFile))) {
+                logln("runMain(..) cannot read suite from file: " + suiteFile);
+                continue;
+            }
+
+            MessageHandler holder = new MessageHandler();
+            for (int i = 0; i < globalOptionVariants.length; i++) {
+                runtime.setOptions(globalOptionVariants[i]);
+                holder.init();
+                boolean skip = !spec.adoptParentValues(runtime, holder);                
+                // awful/brittle assumption about number of skips == number of skip messages
+                final List skipList = MessageUtil.getMessages(holder, IMessage.INFO, false, "skip");
+                if (verboseHarness || skip || (0 < skipList.size())) {
+                    final List curArgs = Arrays.asList(globalOptionVariants[i]);
+					logln("runMain(" + suiteFile + ", " + curArgs + ")");
+                    if (verboseHarness) {
+                        String format = "yyyy.MM.dd G 'at' hh:mm:ss a zzz";
+                        SimpleDateFormat formatter = new SimpleDateFormat (format);
+                        String date = formatter.format(new Date());
+                        logln("test date: " + date);
+                        logln("harness features: " + listFeatureNames());
+                        logln("Java version: " + JAVA_VERSION);
+                        logln("AspectJ version: " + ASPECTJ_VERSION);
+                    }
+                    if (!quietHarness && holder.hasAnyMessage(null, true)) {
+                        MessageUtil.print(getLogStream(), holder, "skip - ");
+                        MessageUtil.printMessageCounts(getLogStream(), holder, "skip - ");
+                    }
+                }
+                if (!skip) {
+                    final long startTime = System.currentTimeMillis();
+                    RunResult result = run(spec);
+                    if (null != resultList) {
+                        resultList.add(result);
+                    }
+                    final long elapsed = System.currentTimeMillis() - startTime; 
+                    report(result.status, skipList.size(), result.numIncomplete, elapsed);
+                }
+            }
+		}
+    }   
+    
+    /** Run the test suite specified by the spec */
+    protected RunResult run(AjcTest.Suite.Spec spec) {
+        LangUtil.throwIaxIfNull(spec, "spec");
+        /*
+         * For each run, initialize the runner and validator,
+         * create a new set of IRun{Iterator} tests,
+         * and run them. 
+         * Delete all temp files when done.
+         */
+        Runner runner = new Runner();
+        if (0 != features.size()) {
+            for (Iterator iter = features.entrySet().iterator(); iter.hasNext();) {
+                Feature feature = (Feature) ((Map.Entry) iter.next()).getValue();
+                runner.registerListener(feature.clazz, feature.listener);
+            }
+        }
+        IMessageHolder holder = new MessageHandler();
+        int numIncomplete = 0;
+        RunStatus status = new RunStatus(holder, runner);
+        status.setIdentifier(spec);
+        // validator is used for all setup in entire tree...
+        Validator validator = new Validator(status);
+        validator.lock(this);
+        Sandbox sandbox = null;
+        try {
+            sandbox = new Sandbox(spec.getSuiteDirFile(), validator);
+            IRunIterator tests = spec.makeRunIterator(sandbox, validator);
+            runner.runIterator(tests, status, null);
+            if (tests instanceof RunSpecIterator) {
+                numIncomplete = ((RunSpecIterator) tests).getNumIncomplete();
+            }
+        } finally {
+            validator.unlock(this);
+        	if (!keepTemp) {
+	            validator.deleteTempFiles(verboseHarness);
+        	}
+        }
+        return new RunResult(status, numIncomplete);
+    }
+    
+    /** 
+     * Report the results of a test run after it is completed.
+     * Clients should be able to identify the number of:
+     * <ul>
+     * <li>tests run and passed</li>
+     * <li>tests failed, i.e., run and not passed (fail, error, etc.)</li>
+     * <li>tests incomplete, i.e., test definition read but test run setup failed</li>
+     * <li>tests skipped, i.e., test definition read and found incompatible with
+     *     the current configuration.</li>
+     * <ul>
+     * 
+     * @param status returned from the run
+     * @param numSkipped int tests that were skipped because of 
+     *         configuration incompatibilities
+     * @param numIncomplete int tests that failed during setup,
+     *         usually indicating a test definition or configuration error.
+     * @param msElapsed elapsed time in milliseconds
+     * */
+    protected void report(IRunStatus status, int numSkipped, int numIncomplete, 
+        long msElapsed ) {
+    	if (logResults) {
+            RunUtils.AJCSUITE_PRINTER.printRunStatus(getLogStream(), status);
+        } else if (!quietHarness && (0 < status.numMessages(null, true))) {
+            MessageUtil.print(getLogStream(), status, "");    
+        }
+        
+        logln(BridgeUtil.childString(status, numSkipped, numIncomplete) 
+            + " " + (msElapsed/1000) + " seconds");
+    }
+
+    // --------------- delegate methods
+    protected void logln(String s) {
+        getLogStream().println(s);
+    }
+    
+    protected PrintStream getLogStream() {
+        return System.out;
+    }
+    
+    protected boolean isSuiteFile(String arg) {
+        return ((null != arg) 
+                && (arg.endsWith(".txt") || arg.endsWith(".xml")));
+    }
+    
+    /** 
+     * Get the options that the input option is an alias for.
+     * Subclasses may add options directly to the getFeatureAliases result
+     * or override this.
+     * @return null if the input is not an alias for other options,
+     * or a non-empty List (String) of options that this option is an alias for 
+     */
+    protected List aliasOptions(String option) {
+        Properties aliases = Harness.getOptionAliases();
+        if (null != aliases) {
+            String args = aliases.getProperty(option);
+            if (!LangUtil.isEmpty(args)) {
+                return LangUtil.commaSplit(args);
+            }
+        }
+        return null;
+    }
+
+    /** 
+     * Read and implement any of our options.
+     * Options other than this and suite files will be
+     * passed down as parent options through the test spec hierarchy.
+     * Subclasses override this to implement new options.
+     */
+    protected boolean acceptOption(String option) {
+        boolean result = false;
+        if (LangUtil.isEmpty(option)) {
+            return true; // skip bad input
+        } else if ("-verboseHarness".equals(option)) {
+            verboseHarness = true;
+        } else if ("-quietHarness".equals(option)) {
+            quietHarness = true;
+        } else if ("-keepTemp".equals(option)) {
+            keepTemp = true; 
+        } else if ("-logResults".equals(option)) {
+            logResults = true; 
+        } else {
+	        return false;
+        }
+        return true;    
+    }    
+    
+    /** 
+     * Read a test suite file.
+     * This implementation knows how to read .txt and .xml files
+     * and logs any errors.
+     * Subclasses override this to read new kinds of suites.
+     * @return null if unable to read (logging errors) or AjcTest.Suite.Spec otherwise
+     */
+    protected AjcTest.Suite.Spec readSuite(File suiteFile) {
+        if (null != suiteFile) {
+            String path = suiteFile.getPath();
+            try {
+                if (path.endsWith(".xml")) {
+                    return AjcSpecXmlReader.getReader().readAjcSuite(suiteFile);
+                } else if (path.endsWith(".txt")) {
+                    return FlatSuiteReader.ME.readSuite(suiteFile);
+                } else {
+                    logln("unrecognized extension? " + path);
+                }
+            } catch (IOException e) {
+                e.printStackTrace(getLogStream());
+            }
+        }
+        return null;
+    }
+    
+    /** Add feature to take effect during the next runMain(..) invocation.
+     * @param feature the Feature to add, using feature.name as key.
+     */
+    protected void addFeature(Feature feature) {
+        if (null != feature) {
+            features.put(feature.name, feature);
+        }
+    }
+    
+    /** remove feature by name (same as feature.name) */
+    protected void removeFeature(String name) {
+        if (!LangUtil.isEmpty(name)) {
+            features.remove(name);
+        }
+    }
+    
+    /** @return unmodifiable Set of feature names */
+    protected Set listFeatureNames() {
+        return Collections.unmodifiableSet(features.keySet());
+    }
+
+    /** print detail message for syntax of main(String[]) command-line */
+    protected void printSyntax(PrintStream out) {
+        out.println("  {??}              unrecognized options are used as test spec globals");
+        out.println("  -help             print this help message");
+        out.println("  -verboseHarness   harness components log verbosely");
+        out.println("  -quietHarness     harness components suppress logging");
+        out.println("  -keepTemp         do not delete temporary files");
+        out.println("  -logResults       log results at end, verbosely if fail");
+        out.println("  {suiteFile}.xml.. specify test suite XML file");
+        out.println("  {suiteFile}.txt.. specify test suite .txt file (deprecated)");
+    }
+
+    /** print known aliases at the end of the syntax message */
+    protected void printAliases(PrintStream out) {
+        LangUtil.throwIaxIfNull(out, "out");
+        Properties props = getOptionAliases();
+        if (null == props) {
+            return;
+        }
+        int pdLength = SYNTAX_PAD.length();
+        Set entries = props.entrySet();
+        for (Iterator iter = entries.iterator(); iter.hasNext();) {
+			Map.Entry entry = (Map.Entry) iter.next();
+			String alias = "  " + (String) entry.getKey();
+            int buf = pdLength - alias.length();
+            if (0 < buf) {
+                alias += SYNTAX_PAD.substring(0, buf);
+            } else {
+                alias += " ";
+            }
+            out.println(alias + entry.getValue());
+        }
+    }
+    
+    /** result struct for run(AjcTest.Spec) */
+    public static class RunResult {
+        public final IRunStatus status;
+        public final int numIncomplete;
+        public RunResult(IRunStatus status, int numIncomplete) {
+            this.status = status;
+            this.numIncomplete = numIncomplete;
+        }
+    }
+    /** feature implemented as named IRunIterator/IRun association */
+    public static class Feature {
+        /** never null, always assignable to IRun */
+        public final Class clazz;
+        
+        /** never null */
+        public final IRunListener listener;
+        
+        /** never null or empty */
+        public final String name;
+        
+        /** @throws IllegalArgumentException if any is null/empty or clazz is
+         *           not assignable to IRun
+         */
+        public Feature(String name, Class clazz, IRunListener listener) {
+            LangUtil.throwIaxIfNull(clazz, "class");
+            if (!IRun.class.isAssignableFrom(clazz)
+                && !IRunIterator.class.isAssignableFrom(clazz)) {
+                String s = clazz.getName() + "is not assignable to IRun or IRunIterator";
+                LangUtil.throwIaxIfFalse(false, s);
+            }
+            LangUtil.throwIaxIfNull(listener, "listener");
+            LangUtil.throwIaxIfNull(name, "name");
+            LangUtil.throwIaxIfFalse(0 < name.length(), "empty name");        
+            this.clazz = clazz;
+            this.listener = listener;
+            this.name = name;
+        }
+        
+        /** @return feature name */
+        public String toString() {
+            return name;
+        }
+    }
+}
+
+
+/** 
+ * Harness with features for controlling output
+ * (logging results and hiding streams).
+ * Use -help to get a list of feature options.
+ */
+class FeatureHarness extends Harness {
+
+    private static final String[] ALIASES = new String[] 
+        { "-hideStreams", "-hideCompilerStreams,-hideRunStreams",
+          "-jim", "!eclipse,-logMinFail,-hideStreams",
+          "-loud", "-verboseHarness",
+          "-baseline", "-verboseHarness,-traceTestsMin,-hideStreams,!eclipse"
+        };
+    static {
+        Properties optionAliases = Harness.getOptionAliases();
+        if (null != optionAliases) {
+            for (int i = 1; i < ALIASES.length; i += 2) {
+                optionAliases.put(ALIASES[i-1], ALIASES[i]);
+			}
+        }
+    }
+
+    /** controller for suppressing and sniffing error and output streams. */
+    StreamsHandler streamsHandler; 
+
+    /** facility of hiding-streams may be applied in many features */
+    IRunListener streamHider;
+
+    /** facility of capture/log may be applied in many features */
+    IRunListener captureLogger;
+    
+    /** when making tests, do not run them */
+    TestMaker testMaker;
+    
+    public FeatureHarness() {
+        super();
+        streamsHandler = new StreamsHandler(false, true);
+    }
+    /** override to make tests or run as usual */
+    protected RunResult run(AjcTest.Suite.Spec spec) {
+        if (null != testMaker) {
+            System.out.println("generating rather than running tests...");
+            return testMaker.run(spec);
+        } else {
+            return super.run(spec);
+        }
+    }
+
+    /**
+     * Log via StreamsHandler-designated log stream.
+     * @see org.aspectj.testing.drivers.Harness#log(String)
+	 */
+	protected void logln(String s) {
+        streamsHandler.lnlog(s);
+	}
+
+    /**
+	 * @see org.aspectj.testing.drivers.Harness#getLogStream()
+     * @return StreamsHandler-designated log stream.
+	 */
+	protected PrintStream getLogStream() {
+		return streamsHandler.out;
+	}
+
+
+    /** print detail message for syntax of main(String[]) command-line */
+    protected void printSyntax(PrintStream out) {
+        super.printSyntax(out);
+        out.println("  -progressDots     log . or ! for each AjcTest pass or fail");
+        out.println("  -logFail          log each failed AjcTest");
+        out.println("  -logPass          log each passed AjcTest");
+        out.println("  -logAll           log each AjcTest");
+        out.println("  -logMinFail       log each AjcTest failure with minimal excess data");
+        out.println("  -logMinPass       log each AjcTest success with minimal excess data");
+        out.println("  -logMinAll        log all AjcTest with minimal excess data");
+        out.println("  -logXMLFail       log XML definition for each failed AjcTest");
+        out.println("  -logXMLPass       log XML definition for each passed AjcTest");
+        out.println("  -logXMLAll        log XML definition for each AjcTest");
+        out.println("  -hideRunStreams   hide err/out streams during java runs");
+        out.println("  -hideCompilerStreams   hide err/out streams during compiler runs");
+        out.println("  -traceTests       log pass|fail, /time/memory taken after each test");
+        out.println("  -traceTestsMin    log pass|fail after each test");
+        out.println("  -XmakeTests       create source files/dirs for initial compile run of each test");
+        out.println("  -XlogPublicType   log test XML if \"public type\" in an error message");
+        out.println("  -XlogSourceIn=Y,Z log test XML if Y or Z is in path of any sources");
+        super.printAliases(out);
+    }
+
+    /** Accept a number of logging and output options */
+	protected boolean acceptOption(String option) {
+        if (null == option) {
+            return false;
+        }
+        
+        final StreamsHandler streams = streamsHandler;
+        final IRunValidator validator = RunValidator.NORMAL;
+        final RunUtils.IRunStatusPrinter verbose 
+            = RunUtils.VERBOSE_PRINTER;
+        final RunUtils.IRunStatusPrinter terse 
+            = RunUtils.TERSE_PRINTER;
+        final boolean LOGPASS = true;
+        final boolean LOGFAIL = true;
+        final boolean SKIPPASS = false;
+        final boolean SKIPFAIL = false;
+        final boolean LOGSTREAMS = true;
+        final boolean SKIPSTREAMS = false;
+        
+		Feature feature = null;
+        if (super.acceptOption(option)) {
+            // ok, result returned below
+            
+        } else if ("-XmakeTests".equals(option)) {
+            testMaker = TestMaker.ME;
+        } else if (option.startsWith("-traceTestsMin")) {
+            feature = new Feature(option, AjcTest.class,new TestTraceLogger(streams, false));
+        } else if (option.startsWith("-traceTests")) {
+            feature = new Feature(option, AjcTest.class,new TestTraceLogger(streams, true));
+        } else if (option.startsWith("-logMin")) {
+            feature = new Feature(option, AjcTest.class, 
+                new RunLogger(option, SKIPSTREAMS, streams, validator, terse));
+        } else if (option.startsWith("-logXML")) {
+            feature = new Feature(option, AjcTest.class, 
+                new XmlLogger(option, streams, validator));
+        } else if (option.startsWith("-log")) {
+            feature = new Feature(option, AjcTest.class, 
+                new RunLogger(option, SKIPSTREAMS, streams, validator, verbose));
+        } else if ("-hideRunStreams".equals(option)) {
+            feature = new Feature(option, JavaRun.class, getStreamHider());       
+        } else if ("-hideCompilerStreams".equals(option)) {
+            addFeature(new Feature(option, IncCompilerRun.class, getStreamHider()));   // hmmm    
+            feature = new Feature(option, CompilerRun.class, getStreamHider());       
+        } else if ("-progressDots".equals(option)) {
+            IRunListener listener = new RunListener() {
+				public void runCompleted(IRunStatus run) {
+                    streamsHandler.log((validator.runPassed(run) ? "." : "!"));
+				}
+            };
+            feature = new Feature(option, AjcTest.class, listener);       
+        } else if (option.startsWith("-XlogPublicType")) {
+            String label = option + TestCompleteListener.PASS; // print when validator true
+            feature = new Feature(option, AjcTest.class, 
+                new XmlLogger(label, streams, MessageRunValidator.PUBLIC_TYPE_ERROR));
+        } else if (option.startsWith("-XlogSourceIn")) {
+            String input = option.substring("-XlogSourceIn=".length());
+            LangUtil.throwIaxIfFalse(0 < input.length(), option);
+            String label = "-XlogSourceIn="  + TestCompleteListener.PASS; // print when validator true
+            StringRunner sr = new SubstringRunner(input, false);
+            feature = new Feature(option, AjcTest.class, 
+                new XmlLogger(label, streams, new SourcePathValidator(sr)));
+        } else {
+            return false;
+        }       
+        addFeature(feature);
+        return true;
+	}
+
+    /** lazy construction for shared hider */
+    protected IRunListener getStreamHider() {
+        if (null == streamHider) {
+            streamHider =  new RunListener() {
+                public void runStarting(IRunStatus run) {
+                    streamsHandler.hide();
+                }
+                public void runCompleted(IRunStatus run) {
+                    streamsHandler.show();
+                }
+                public String toString() { return "Harness StreamHider"; }
+            };
+        }
+        return streamHider;
+    }
+}
+
+/** Generate any needed test case files for any test. */
+class TestMaker  {
+    
+    static TestMaker ME = new TestMaker();
+    
+    /** @throws Error if unable to make dir */
+    static void mkdirs(File dir) {
+        if (null != dir && !dir.exists()) {
+            if (!dir.mkdirs()) {
+                throw new Error("unable to make dir: " + dir);
+            }
+        }
+    }
+    static String getFileContents(File baseDir, File file, String label) {
+        String fileName = file.getName();
+        if (fileName.endsWith(".java")) {
+            fileName = fileName.substring(0, fileName.length() - 5);
+        }
+        StringBuffer sb = new StringBuffer();
+        String filePath = file.getParentFile().getAbsolutePath();
+        String dirPath = baseDir.getAbsolutePath();
+        String pack = null;
+        if (filePath.startsWith(dirPath)) {
+            pack = filePath.substring(dirPath.length()).replace('/', '.');
+        }
+        if (!LangUtil.isEmpty(pack)) {
+           sb.append("package " + pack + ";");
+        }
+        final String EOL = "\n"; // XXX find discovered EOL
+        sb.append( EOL 
+            + EOL + "import org.aspectj.testing.Tester;"
+            + EOL + ""
+            + EOL + "/** @testcase " + label + " */"
+            + EOL + "public class " + fileName + " {"
+            + EOL + "\tpublic static void main(String[] args) { "
+            + EOL + "\t\tTester.check(null != args, \"null args\"); "
+            + EOL + "\t}"
+            + EOL + "}"
+            + EOL 
+            );
+            
+        return sb.toString();
+    }
+    
+    /** create a minimal source file for a test */
+    static void createSrcFile(File baseDir, File file, String testName) {
+        if (file.exists()) {
+            return;
+        }
+        String contents = getFileContents(baseDir, file, testName);
+        String error = FileUtil.writeAsString(file, contents);
+        if (null != error) {
+            throw new Error(error);
+        }
+    }
+    
+    /** create an empty arg file for a test */
+    static void createArgFile(File baseDir, File file, String testName) {
+        if (file.exists()) {
+            return;
+        }
+        String contents = "// argfile " + file;
+        String error = FileUtil.writeAsString(file, contents);
+        if (null != error) {
+            throw new Error(error);
+        }
+    }
+	
+    public Harness.RunResult run(AjcTest.Suite.Spec spec) {
+        ArrayList kids = spec.getChildren();
+        for (Iterator iter = kids.iterator(); iter.hasNext();) {
+			makeTest( (AjcTest.Spec) iter.next());			
+		}
+        IRunStatus status = new RunStatus(new MessageHandler(), new Runner());
+        status.start();
+        status.finish(IRunStatus.PASS);
+        return new Harness.RunResult(status, 0);
+    }
+    
+    private void makeTest(AjcTest.Spec spec) {
+        CompilerRun.Spec compileSpec = AjcTest.unwrapCompilerRunSpec(spec);
+        if (null == spec) {
+            throw new Error("null spec");
+        }
+        System.out.println("  generating test files for test: " + spec.getDescription());
+        File dir = spec.getSuiteDir();
+        if (null != dir) {
+            TestMaker.mkdirs(dir);
+        }
+        String offset = spec.getTestDirOffset();
+        if (!LangUtil.isEmpty(offset)) {
+            if (null == dir) {
+                dir = new File(offset);
+            } else {
+                dir = new File(dir.getAbsolutePath() + "/" + offset);
+            }
+        } else if (null == dir) {
+            dir = new File(".");
+        }
+        StringBuffer testName = new StringBuffer();
+        int pr = spec.getBugId();
+        if (0 < pr) {
+            testName.append("PR#" + pr + " ");
+        }
+        
+        testName.append(spec.getDescription());
+        final String label = testName.toString();
+        final File[] srcFiles = FileUtil.getBaseDirFiles(dir, compileSpec.getPathsArray());
+        if (!LangUtil.isEmpty(srcFiles)) {
+            for (int i = 0; i < srcFiles.length; i++) {
+                TestMaker.createSrcFile(dir, srcFiles[i], label);            
+            }
+        }
+        final File[] argFiles = FileUtil.getBaseDirFiles(dir, compileSpec.getArgfilesArray());
+        if (!LangUtil.isEmpty(argFiles)) {
+            for (int i = 0; i < argFiles.length; i++) {
+                TestMaker.createArgFile(dir, argFiles[i], label);            
+            }
+        }
+        
+	}
+    
+    /** @return "Testmaker()" */    
+    public String toString() {
+        return "TestMaker()";
+    }
+}
+
+interface StringRunner {
+    boolean accept(String s);
+}
+
+/**
+ * StringRunner than accepts input matching 0+ substrings,
+ * optionally case-insensitive.
+ */
+class SubstringRunner implements StringRunner {
+    private static String[] extractSubstrings(
+            String substrings, 
+            boolean caseSensitive) {
+        if (null == substrings) {
+            return null;
+        }
+        StringTokenizer st = new StringTokenizer(substrings, ",");
+        String[] result = new String[st.countTokens()];
+        for (int i = 0; i < result.length; i++) {
+			result[i] = st.nextToken().trim();
+		    LangUtil.throwIaxIfFalse(0 < result[i].length(), "empty entry");
+            if (!caseSensitive) {
+                result[i] = result[i].toLowerCase();
+            }
+        }
+        return result;
+    }
+    
+    private final String[] substrings;
+    private final boolean caseSensitive;
+    
+    /**
+     * @param substrings the String containing comma-separated substrings
+     *                    to find in input - if null, any input accepted
+     * @param caseSensitive if true, do case-sensitive comparison
+     * @throws IllegalArgumentException if any substrings contains empty entry ", ,"
+     */
+    SubstringRunner(String substrings, boolean caseSensitive) {
+        this.caseSensitive = caseSensitive;
+        this.substrings = extractSubstrings(substrings, caseSensitive); 
+        System.err.println("XXX " + Arrays.asList(this.substrings));       
+    }
+    
+    public boolean accept(String input) {
+        if (null == substrings) {
+            return true;
+        }
+        if (null == input) {
+            return false;
+        }
+        
+        if (!caseSensitive) {
+            input = input.toLowerCase();
+        }
+        for (int i = 0; i < substrings.length; i++) {
+			if (-1 != input.indexOf(substrings[i])) {
+                return true;
+            }
+		}
+        return false;
+    }
+}
+
+/** 
+ * Signal whether run "passed" based on validating absolute source paths.
+ * (Static evaluation - no run necessary)
+ */
+class SourcePathValidator implements IRunValidator { // static - no run needed
+    private final StringRunner validator;
+    // XXX hoist common
+    SourcePathValidator(StringRunner validator) {
+        LangUtil.throwIaxIfNull(validator, "validator");
+        this.validator = validator;        
+    }
+    /**
+     * @return true if any source files in compile spec are
+     *          accepted by the validator.
+	 * @see org.aspectj.testing.run.IRunValidator#runPassed(IRunStatus)
+	 */
+	public boolean runPassed(IRunStatus run) {
+        AjcTest.Spec testSpec = AjcTest.unwrapSpec(run);
+        if (null != testSpec) {
+            CompilerRun.Spec compileSpec = AjcTest.unwrapCompilerRunSpec(testSpec);
+            File basedir = new File(testSpec.getSuiteDir(), testSpec.getTestDirOffset());
+            String[] paths = compileSpec.getPathsArray();
+            File[] files = FileUtil.getBaseDirFiles(basedir, paths);
+            for (int i = 0; i < files.length; i++) {
+				if (validator.accept(files[i].getAbsolutePath())) {
+                    return true;
+                }
+			}
+        }
+		return false;
+	}
+    
+}
+
+/** Signal whether run "passed" based on message kind and content */
+class MessageRunValidator implements IRunValidator {
+    
+    /** signals "passed" if any error contains "public type" */
+    static final IRunValidator PUBLIC_TYPE_ERROR 
+        = new MessageRunValidator("public type", IMessage.ERROR, false);
+    
+    private final IMessage.Kind kind;
+    private final String sought;
+    private final boolean orGreater;
+    
+    /**
+     * @param sought the String to seek anywhere in any message of the right kind
+     *         if null, accept any message of the right kind.
+     * @param kind the IMessage.Kind of messages to search - all if null
+     */
+    MessageRunValidator(String sought, IMessage.Kind kind, boolean orGreater) {
+        this.sought = sought;
+        this.kind = kind;
+        this.orGreater = orGreater;
+    }
+    
+    /** @return true if this run has messages of the right kind and text */
+	public boolean runPassed(IRunStatus run) {
+        return gotMessage(new IRunStatus[] {run});
+    }
+    
+    /**
+     * Search these children and their children recursively
+     * for messages of the right kind and content.
+     * @return true at first match of message of the right kind and content
+     */
+    private boolean gotMessage(IRunStatus[] children) {
+        if (LangUtil.isEmpty(children)) {
+            return false;
+        }
+        for (int i = 0; i < children.length; i++) {
+			IRunStatus run = children[i];
+            if (null == run) {
+                continue; // hmm
+            }
+            IMessage[] messages = run.getMessages(kind, orGreater);
+            if (!LangUtil.isEmpty(messages)) {
+                if (LangUtil.isEmpty(sought)) {
+                    return true;
+                } else {
+                    for (int j = 0; j < messages.length; j++) {
+                        if (null == messages[j]) {
+                            continue; // hmm
+                        }
+            			String text = messages[j].getMessage();
+                        if ((null != text) && (-1 != text.indexOf(sought))) {
+                            return true;
+                        }
+                    }
+                }
+    		}
+            if (gotMessage(run.getChildren())) {
+                return true;
+            }
+        }
+    	return false;
+	}
+}
+
+/** 
+ * Base class for listeners that run depending on pass/fail status of input.
+ * Template method runCompleted handled whether to run.
+ * Subclasses implement doRunCompleted(..).
+ */
+abstract class TestCompleteListener extends RunListener {
+    /** label suffix indicating both pass and fail */
+    public static final String ALL = "All";
+
+    /** label suffix indicating fail */
+    public static final String FAIL = "Fail";
+
+    /** label suffix indicating pass */
+    public static final String PASS = "Pass";
+    
+
+    /** runValidator determines if a given run passed */
+    protected final IRunValidator runValidator;
+
+    /** label for this listener */
+    final String label;
+    
+    /** if trun and run passed, then run doRunCompleted(..) */
+    final boolean logOnPass;
+
+    /** if true and run did not pass, then run doRunCompleted(..) */
+    final boolean logOnNotPass;
+
+    /** may be null */
+    protected final StreamsHandler streamsHandler;
+    
+    /** true if the last run evaluation was ok */
+    boolean lastRunOk;
+    
+    /** last run evaluated */
+    IRunStatus lastRun; // XXX small memory leak - cache hashcode instead?
+    
+    /** @param label endsWith PASS || FAIL || ALL */
+    protected TestCompleteListener(
+        String label, 
+        IRunValidator runValidator,
+        StreamsHandler streamsHandler) {
+        if (null == runValidator) {
+            runValidator = RunValidator.NORMAL;
+        }
+        this.label = (null == label? "" : label);
+        this.logOnPass = label.endsWith(PASS) || label.endsWith(ALL);
+        this.logOnNotPass = label.endsWith(FAIL) || label.endsWith(ALL);
+        this.runValidator = runValidator;
+        this.streamsHandler = streamsHandler;
+    }
+    
+    public void runStarted(IRunStatus run) {
+        if (null != streamsHandler) {
+            streamsHandler.startListening();
+        }
+    }
+    
+    /** subclasses implement this to do some initialization */
+    protected void doRunStarted(IRunStatus run) {
+    }
+
+    public final void runCompleted(IRunStatus run) {
+        boolean doit = lastRunOk(run);
+        StreamsHandler.Result result = null;
+        if (null != streamsHandler) {
+            streamsHandler.endListening(doit);
+        }
+        if (doit) {
+            doRunCompleted(run, result);
+        }
+    }
+
+    /**
+     * @return true if run is ok per constructor specifications
+     */
+    protected boolean lastRunOk(IRunStatus run) {
+        if (lastRun != run) {
+            boolean passed = runValidator.runPassed(run);
+            lastRunOk = (passed ? logOnPass : logOnNotPass);
+        }
+        return lastRunOk;
+    }
+
+    /** @return "{classname}({pass}{,fail})" indicating when this runs */    
+    public String toString() { // XXX add label?
+        return LangUtil.unqualifiedClassName(this)
+            + "(" + (logOnPass ? (logOnNotPass ? "pass, fail)" : "pass)") 
+                                       : (logOnNotPass ? "fail)" : ")"));
+    }
+    /** 
+     * Subclasses implement this to do some completion action 
+     * @param run the IRunStatus for this completed run
+     * @param result the StreamsHandler.Result (if any - may be null)
+     */
+    public abstract void doRunCompleted(IRunStatus run, StreamsHandler.Result result);
+}
+
+/** 
+ * Write XML for any test passed and/or failed.
+ * Must register with Runner for RunSpecIterator.class,
+ * most sensibly AjcTest.class.
+ */
+class XmlLogger extends TestCompleteListener {
+    /** 
+     * @param printer the component that prints any status - not null
+     * @param runValidator if null, use RunValidator.NORMAL
+     */
+    public XmlLogger(
+        String label,
+        StreamsHandler streamsHandler, 
+        IRunValidator runValidator) {
+        super(label, runValidator, streamsHandler);
+    }
+    
+    public void doRunCompleted(IRunStatus run, StreamsHandler.Result result) {
+        PrintStream out = streamsHandler.getLogStream();
+        out.println("");
+        XMLWriter writer = new XMLWriter(new PrintWriter(out, true));
+        Object id = run.getIdentifier();
+        if (!(id instanceof Runner.IteratorWrapper)) {                
+            out.println(this + " not IteratorWrapper: " 
+                + id.getClass().getName() + ": " + id);
+            return;
+        }
+        IRunIterator iter = ((Runner.IteratorWrapper) id).iterator;
+        if (!(iter instanceof RunSpecIterator)) {                
+            out.println(this + " not RunSpecIterator: " + iter.getClass().getName()
+                + ": " + iter);
+            return;
+        }
+        ((RunSpecIterator) iter).spec.writeXml(writer);
+        out.flush();
+    }
+    
+}
+
+/** log pass and/or failed runs */
+class RunLogger extends TestCompleteListener {
+    final boolean logStreams;
+    final RunUtils.IRunStatusPrinter printer;
+
+    /** 
+     * @param printer the component that prints any status - not null
+     * @param runValidator if null, use RunValidator.NORMAL
+     */
+    public RunLogger(
+        String label,
+        boolean logStreams,
+        StreamsHandler streamsHandler,
+        IRunValidator runValidator,
+        RunUtils.IRunStatusPrinter printer) {
+        super(label, runValidator, streamsHandler);
+        LangUtil.throwIaxIfNull(streamsHandler, "streamsHandler");
+        LangUtil.throwIaxIfNull(printer, "printer");
+        this.logStreams = logStreams;
+        this.printer = printer;
+    }
+
+    public void doRunCompleted(IRunStatus run, StreamsHandler.Result result) {
+        PrintStream out = streamsHandler.getLogStream();
+        printer.printRunStatus(out, run);
+        if (logStreams) {
+            if (!LangUtil.isEmpty(result.err)) {
+                out.println("--- error");
+                out.println(result.err); 
+            }
+            if (!LangUtil.isEmpty(result.out)) {
+                out.println("--- ouput");
+                out.println(result.out); 
+            }
+        }
+        out.println("");
+    }
+}
+
+/** trace time and memory between runStaring and runCompleted */
+class TestTraceLogger extends TestCompleteListener {
+    private static final Runtime runtime = Runtime.getRuntime();
+    private long startTime;
+    private long startMemoryFree;
+    private final boolean verbose;
+    
+    public TestTraceLogger(StreamsHandler handler) {
+        this(handler, true);
+    }
+    public TestTraceLogger(StreamsHandler handler, boolean verbose) {
+        super("-traceTestsAll", null, handler);
+        this.verbose = verbose;
+    }
+    public void runStarting(IRunStatus run) {
+        super.runStarting(run);
+        startTime = System.currentTimeMillis();
+        startMemoryFree = runtime.freeMemory();    
+    }
+    
+    public void doRunCompleted(IRunStatus run, StreamsHandler.Result result) {
+        long elapsed = System.currentTimeMillis() - startTime;
+        long free = runtime.freeMemory();
+        long used = startMemoryFree - free;
+        String label = run.runResult() ? "PASS " : "FAIL ";
+        PrintStream out = streamsHandler.getLogStream();
+        if (verbose) {
+            label = label
+                    + "elapsed: " + LangUtil.toSizedString(elapsed, 7)
+                    + " free: " + LangUtil.toSizedString(free, 10)
+                    + " used: " + LangUtil.toSizedString(used, 10)
+                    + " id: ";
+        }
+        out.println(label + renderId(run));
+    }
+    
+    /** @return true - always trace tests */
+    protected boolean isFailLabel(String label) {
+        return true;
+    }
+    
+    /** @return true - always trace tests */
+    protected boolean isPassLabel(String label) {
+        return true;
+    }
+
+    /**
+     * This implementation returns run identifier toString(). 
+     * Subclasses override this to render id as message suffix.
+     */
+    protected String renderId(IRunStatus run) {
+        return "" + run.getIdentifier();
+    }
+}
+        // printing files
+//        AjcTest.Spec testSpec = AjcTest.unwrapSpec(run);
+//        if (null != testSpec) {
+//            CompilerRun.Spec compileSpec = AjcTest.unwrapCompilerRunSpec(testSpec);
+//            File dir = new File(testSpec.getSuiteDir(), testSpec.getTestDirOffset());
+//            List files = compileSpec.getPathsAsFile(dir);
+//            StringBuffer sb = new StringBuffer();
+//            for (Iterator iter = files.iterator(); iter.hasNext();) {
+//                File file = (File) iter.next();
+//                sb.append(" " + file.getPath().replace('\\','/').substring(2));         
+//            }
+//            out.println("files: " + sb);
+//        }
+
+
diff --git a/testing-drivers/src/org/aspectj/testing/drivers/RFE-find-tests-for-resource.teamtask b/testing-drivers/src/org/aspectj/testing/drivers/RFE-find-tests-for-resource.teamtask
new file mode 100644
index 000000000..06c2e1d63
--- /dev/null
+++ b/testing-drivers/src/org/aspectj/testing/drivers/RFE-find-tests-for-resource.teamtask
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TeamTask>
+	<TeamTaskMeta>
+		<CreationDate format="yyyy-MM-dd :: HH:mm:ss z">2002-10-07 :: 08:44:57 PDT</CreationDate>
+		<LastModificationDate format="yyyy-MM-dd :: HH:mm:ss z">2002-10-07 :: 13:21:02 PDT</LastModificationDate>
+	</TeamTaskMeta>
+	<Summary>find all tests associated with a give .java source file</Summary>
+	<User>isberg</User>
+	<Module>testing-drivers</Module>
+	<AssignedTo>isberg</AssignedTo>
+	<State description="Postponed" index="2" />
+	<Severity description="Enhancement" index="0" />
+	<Description>When updating a source file, it would be nice to be able to find all the test definitions that use it, especially when updating error line numbers in message-variant tests.</Description>
+	<Notification>
+		<Recipient>isberg@parc.com</Recipient>
+	</Notification>
+	<NoteHistory>
+		<Note user="isberg">
+			<NoteMeta>
+				<NoteDate format="yyyy-MM-dd :: HH:mm:ss z">2002-10-07 :: 13:21:02 PDT</NoteDate>
+			</NoteMeta>
+			Ignoring this pending more traffic in the use-case.
+		</Note>
+	</NoteHistory>
+</TeamTask>
+
diff --git a/testing-drivers/src/org/aspectj/testing/drivers/package.html b/testing-drivers/src/org/aspectj/testing/drivers/package.html
new file mode 100644
index 000000000..8a098f798
--- /dev/null
+++ b/testing-drivers/src/org/aspectj/testing/drivers/package.html
@@ -0,0 +1,194 @@
+<html>
+<body>
+These harnesses drive ajc compiler tests.  Following is information on how to use them.
+<p>
+
+Use <code>Harness.main(String[])</code> from the command-line,
+or <code>Harness.getHarness()</code> programmatically.
+<code>Harness.runMain(String[])</code> takes arguments that
+each component in the chain may accept and interpret.
+<p>
+<table cellpadding="1" border="1">
+<tr><th>Component</th><th>Options</th></tr>
+
+<tr><td rowspan="5" valign="top">Harness 
+    <p>suite files, harness verbosity, temp files, option variants
+    </td></tr>
+  <tr><td><u>suite files</u>: ajcTest-compliant .txt or .xml files are accepted.
+     <!-- XXX link to ajcTestSuite.dtd and .txt definitions -->
+     </td></tr>
+  <tr><td><u><code>-verboseHarness</code>, <code>-quietHarness</code></u>: 
+      Log accepted options and skipped tests,
+      or do not print even info messages.
+     </td></tr>
+  <tr><td><u><code>-keepTemp</code></u>: Normally the harness saves temp files until
+     the end of the run, and deletes them.  If you abort the run or specify
+     <code>-keepTemp</code>, then temporary (sandbox) directories will remain for analysis.
+     </td></tr>
+  <tr><td><u>*- variants</u>: Options with a trailing "-" cause two sets of
+      option lists to be produced, one with and one without the corresponding
+      option.  E.g., "-usejavac-" will run the suite twice, once with and
+      once without the "-usejavac" flag.
+      That means if you use this on each of three options, you will
+      get 8 variant sets (1 with no options, 1 with all 3 options, 
+      3 with 2 options, and 3 with 1 option). 
+     </td></tr>
+    
+<tr><td rowspan="5" valign="top">FeatureHarness 
+    <p>output and logging options
+    </td></tr>
+  <tr><td><u>tracing</u>: 
+     <code>-progressDots</code> will print "." for every passed
+     test completed and "!" for every test completed but not passed.
+     <code>-traceTests</code> will print a one-line summary for each test
+     of the time and space taken and whether the test passed.
+     <code>-traceTestsMin</code> will print only the test and whether it passed.
+     <code>-baseline</code> is an alias for
+     <code>-traceTestsMin</code> 
+     <code>-hideStreams</code> and 
+     <code>!eclipse</code>, used to emit tests results in a form
+     comparable by <code>org.aspectj.testing.util.TestDiffs</code>.     
+     </td></tr>
+     
+  <tr><td><u>output</u>: <code>-hide{Compiler|Run}Streams</code> will prevent output and
+     error streams from being printed to System.err and System.out, 
+     optionally only for run or compile steps.
+     </td></tr>
+  <tr><td><u>logging</u>: 
+     Log variants take the form <code>-log{Min|Xml}[Fail|Pass|All]</code>.
+     The suffix {All|Pass|Fail} selects all tests or only passing or failing tests.
+     The infix {Min} means to log with minimal information, typically only any
+     fail messages.
+     The infix {Xml} means to log the XML form of the test definition, so that
+     you can inspect the input or re-run arbitrary tests.  (For the latter, consider
+     also using keywords, under <code>-ajctestsRequireKeywords=...</code> below.)
+     Finally, the experimental option <code>-XlogPublicType</code> will 
+      log the XML test definition for 
+  	  any test run that emits any ERROR messages containing the text "public type".
+     </td></tr>
+  <tr><td><u>interaction of output streams and logging</u>: 
+     Streams will be emitted before the test is logged, unless streams are hidden.
+     When logging in normal (non-Min or -XML) form, the log will emit the streams
+     with the test report, so e.g., you can use -hideStreams -logFail to 
+     hide streams for passing tests but emit them for failing tests.
+     </td></tr>
+    
+<tr><td rowspan="3" valign="top">AjcTest
+    <p>selection options for keywords, bugID (PR)
+    </td></tr>
+  <tr><td><u>keywords</u>: <code>-ajctest[Require|Skip]Keywords=one{,two}</code>
+     will either require or skip tests that have the specified keywords.
+     </td></tr>
+  <tr><td><u>Bugs</u>: <code>-ajctestPR=101{,102}</code>
+     will run only tests that are associated with one of the bug id's listed.
+     </td></tr>
+    
+<tr><td rowspan="6" valign="top">CompilerRun
+<p>compiler options and side-effects
+    </td></tr>
+  <tr><td><u>supported options</u>: Options given on the command-line have
+     the same meaning as the options in the test specification.
+     Only one-word options are supported; for this reason, <code>-source 1.4</code> is
+     specified as <code>-source14</code> and converted by CompilerRun back 
+     to <code>-source 1.4</code>. Unsupported options include
+     <code>-argfile</code>,
+     <code>-d</code>,
+     <code>-classpath</code>,
+     <code>-outjar</code>, and
+     <code>-sourceroot</code>.
+     </td></tr>
+  <tr><td><u>compiler selectors</u>: Use <code>-ajc</code> or <code>-eclipse</code> to select the old
+     (ajc 1.0) or new (eajc 1.1) compilers.  
+     </td></tr>
+  <tr><td><u>option dominance <code>-!^</code></u>: 
+     Some tests require or prohibit certain options; 
+     likewise, sometime the person running the tests wants to require that all tests
+     run with or without an option specified on the command-line.  CompilerRun supports encodings and
+     conflict resolution for these, so an option may be specified as
+      <code>-option</code>,
+      <code>!option</code>, or 
+      <code>^option</code>.
+     <ul>
+     <li><u>- set</u>: If the leading character of an option is "-", then it is set unless forced-off.</li>
+     <li><u>^ force-off</u>: If the leading character of an option is "^", then it is forced off.</li>
+     <li><u>! force-on</u>: If the leading character of an option is "!", then it is forced on.</li>
+     <li><u>force conflict</u>: If local and global forces oppose, the test is skipped.</li>
+     <li><u>compiler conflicts</u>: compiler selectors may be forced (e.g., 
+     	<code>!ajc</code> or <code>^eclipse</code>), and conflicts are resolved
+         in the same way, so a local-global set conflict resolves in favor of the 
+         global specification. (e.g., local <code>-eclipse</code> and global
+         <code>-ajc</code> will use the ajc compiler)</li>
+     <ul><p>
+     </td></tr>
+  <tr><td><u>auto-skip</u>: After collation of global and local options, there may be
+     conflicting or impossible options, which cause the test to be skipped:
+     <ul>
+     <li><u>semantic conflicts</u>: two options may conflict in meaning 
+           - e.g., <code>-lenient</code> and <code>-strict</code></li>
+     <li><u>impossible option</u>: It may not be possible in the current configuration to 
+         implement an option - e.g., <code>-usejavac</code> or <code>-eclipse</code> 
+         when javac or the eclipse implementation is not on the classpath</li>
+     <ul><p>
+     </td></tr>
+     
+  <tr><td><u>source searching</u>: Given <code>-seek:{literal}</code>,  
+  	  as a side-effect, 
+  	  CompilerRun will search source files for {literal},
+      emitting for each instance an INFO message of the form: 
+     <tt>found: {file}:{line}:{column}</tt>
+      (Note that the harness does not display INFO messages unless <tt>-verboseHarness</tt>
+      or <tt>-loud</tt> is used.) 
+     </td></tr>
+    
+</table>
+<p>
+Following are some sample configurations:
+<ul>
+<li><code>java {harness} -hideStreams {suiteFile}</code>
+ <p>Use this to output only a 1-line summary of the test results
+    (tests skipped, incomplete, failed, passed).<p>
+  </li>
+  
+<li><code>java {harness} -hideStreams -logMinFail {suiteFile}</code>
+ <p>Use this when running tests mainly to see if they pass or
+    if the failure messages are typically enough information
+    to indicate why the test is failing.  It produces only minimal
+    output for failed tests.<p>
+  </li>
+  
+<li><code>java {harness} -hideStreams -verboseHarness -logFail {suiteFile}</code>
+ <p>When it's not clear at first glance why a test is failing, before
+    looking at the test code you can run it and print any harness or test
+    setup failures and all the associated messages from the test components.<p>
+  </li>
+
+<li><code>java {harness} -hideStreams -usejavac- -ajc -Xlint- {suiteFile}</code>
+ <p>This would do four complete runs with the old (Ajc 1.0) compiler: one with
+    no options, one with -lenient, one with -Xlint, and one with both.<p>
+  </li>
+  
+
+<li><code>java {harness} --ajctestPR=101,102 -Xlint- ^usejavac !eclipse {suiteFile}</code>
+ <p>Run any tests associated with bugs 101 and 102, with and without -Xlint,
+    forcing off -usejavac and forcing the use of the new eclipse-based compiler.<p>
+  </li>
+  
+</ul>
+
+If you have a set of options you use often, you can define a single-word
+option alias for it; see <code>Harness.optionAliases</code>.
+
+<p><u>Configuration</u>: most tests use the library jars in 
+<code>aspectj/modules/lib/test</code>, defined in 
+<code>org.aspectj.testing.harness.bridge.Globals</code>.  
+Normally the harness finds these by relative path 
+<code>../lib/tests/*.jar</code>, which works whenever the tests are
+run from a peer module directory.  When running tests elsewhere,
+define the environment variable <code>harness.libdir</code> - e.g., 
+<pre>
+    $ cd aspectj/tests
+    $ java -Dharness.libdir=../modules/lib/test -jar eajctesting.jar ajcTests.xml
+</pre>
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/testing-drivers/testdata/defaultSuite.xml b/testing-drivers/testdata/defaultSuite.xml
new file mode 100644
index 000000000..6687b1de3
--- /dev/null
+++ b/testing-drivers/testdata/defaultSuite.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!DOCTYPE suite [
+   <!ELEMENT suite (ajc-test+)>
+   <!ATTLIST suite file CDATA #IMPLIED >
+   <!ELEMENT ajc-test (compile*,inc-compile*,run*)>
+   <!ATTLIST ajc-test title CDATA #REQUIRED >
+   <!ATTLIST ajc-test dir CDATA #REQUIRED >
+   <!ATTLIST ajc-test pr CDATA #IMPLIED >
+   <!ATTLIST ajc-test keywords CDATA #IMPLIED >
+
+   <!ELEMENT compile (file*,message*)>
+   <!ATTLIST compile files CDATA #IMPLIED >
+   <!ATTLIST compile options CDATA #IMPLIED >
+   <!ATTLIST compile staging (true | false) #IMPLIED >
+
+   <!ELEMENT inc-compile (message*)>
+   <!ATTLIST inc-compile tag CDATA #REQUIRED >
+   <!ATTLIST inc-compile changedFiles CDATA #IMPLIED >
+
+   <!ELEMENT run (message*)>
+   <!ATTLIST run class CDATA #REQUIRED >
+   <!ATTLIST run skipTester CDATA #IMPLIED >
+   <!ATTLIST run options CDATA #IMPLIED >
+
+   <!ELEMENT file (#PCDATA)>
+   <!ATTLIST file path CDATA #IMPLIED >
+   <!ELEMENT message (#PCDATA)>
+   <!ATTLIST message kind (error | warning | Xlint) #REQUIRED >
+   <!ATTLIST message line CDATA #REQUIRED >
+   <!ATTLIST message text CDATA #IMPLIED >
+   <!ATTLIST message file CDATA #IMPLIED >
+   ]>
+
+<suite file="defaultSuite.xml">
+
+    <ajc-test dir="incremental/java/static" 
+            title="minimal incremental test"
+         keywords="incremental" >
+        <compile staging="true" files="Main.java,Target.java"/>
+        <inc-compile tag="20" changedFiles="Main.java">
+            <message kind="error" line="6" file="Main.java"/>
+        </inc-compile>
+        <inc-compile tag="30"/>
+        <inc-compile tag="40"/>
+    </ajc-test>
+
+    <ajc-test dir="incremental/java/delete" 
+            title="minimal incremental test with delete operation"
+         keywords="incremental" >
+        <compile staging="true" files="Main.java,Target.java,DeleteMe.java"/>
+        <inc-compile tag="20">
+            <message kind="error" line="7" file="Target.java" text="*DeleteMe.main*"/>
+        </inc-compile>
+        <inc-compile tag="30"/>
+    </ajc-test>
+
+</suite>
diff --git a/testing-drivers/testdata/incremental/harness/TestNoTester.java b/testing-drivers/testdata/incremental/harness/TestNoTester.java
new file mode 100644
index 000000000..c411c1514
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/TestNoTester.java
@@ -0,0 +1,5 @@
+
+public class TestNoTester {
+    public static void main (String[] args) {
+    } 
+}
diff --git a/testing-drivers/testdata/incremental/harness/classAdded/main/Main.20.java b/testing-drivers/testdata/incremental/harness/classAdded/main/Main.20.java
new file mode 100644
index 000000000..aae295f7f
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classAdded/main/Main.20.java
@@ -0,0 +1,11 @@
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+        new Target().run();
+    }
+}
+
+class Target {
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/classAdded/main/Main.java b/testing-drivers/testdata/incremental/harness/classAdded/main/Main.java
new file mode 100644
index 000000000..185ed42bf
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classAdded/main/Main.java
@@ -0,0 +1,7 @@
+
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.20.java b/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.20.java
new file mode 100644
index 000000000..dbe5d38ca
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.20.java
@@ -0,0 +1,8 @@
+
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
+
diff --git a/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.java b/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.java
new file mode 100644
index 000000000..aae295f7f
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classRemoved/main/Main.java
@@ -0,0 +1,11 @@
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+        new Target().run();
+    }
+}
+
+class Target {
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.20.java b/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.20.java
new file mode 100644
index 000000000..fba791e7a
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.20.java
@@ -0,0 +1,12 @@
+
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+        String s = "" + new Target();
+    }
+}
+
+class Target {
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.java b/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.java
new file mode 100644
index 000000000..aae295f7f
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classUnchanged/main/Main.java
@@ -0,0 +1,11 @@
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+        new Target().run();
+    }
+}
+
+class Target {
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.20.java b/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.20.java
new file mode 100644
index 000000000..d0b9d37b4
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.20.java
@@ -0,0 +1,8 @@
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+        new Main().run();
+    }
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.java b/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.java
new file mode 100644
index 000000000..185ed42bf
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/classUpdated/main/Main.java
@@ -0,0 +1,7 @@
+
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/defaultPackage/Main.30.java b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.30.java
new file mode 100644
index 000000000..a46687d78
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.30.java
@@ -0,0 +1,8 @@
+
+// default package 
+
+public class Main {
+    public static void main (String[] args) {
+        new Target().run();
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/defaultPackage/Main.40.java b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.40.java
new file mode 100644
index 000000000..7616df98c
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.40.java
@@ -0,0 +1,7 @@
+
+// default package 
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/defaultPackage/Main.java b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.java
new file mode 100644
index 000000000..66b7433e4
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/defaultPackage/Main.java
@@ -0,0 +1,7 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/defaultPackage/Target.20.java b/testing-drivers/testdata/incremental/harness/defaultPackage/Target.20.java
new file mode 100644
index 000000000..d67b06569
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/defaultPackage/Target.20.java
@@ -0,0 +1,9 @@
+
+// default package
+
+public class Target {
+    public static void main(String[] args) {
+        new Target().run();
+    }
+    void run() {}
+}
diff --git a/testing-drivers/testdata/incremental/harness/defaultPackage/Target.delete.40.java b/testing-drivers/testdata/incremental/harness/defaultPackage/Target.delete.40.java
new file mode 100644
index 000000000..187c8a8e6
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/defaultPackage/Target.delete.40.java
@@ -0,0 +1,2 @@
+
+// delete this file
+\ No newline at end of file
diff --git a/testing-drivers/testdata/incremental/harness/expClasses/Main.java b/testing-drivers/testdata/incremental/harness/expClasses/Main.java
new file mode 100644
index 000000000..66b7433e4
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/expClasses/Main.java
@@ -0,0 +1,7 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class b/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class
new file mode 100644
index 000000000..fba840b69
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class
diff --git a/testing-drivers/testdata/incremental/harness/selectionTest.xml b/testing-drivers/testdata/incremental/harness/selectionTest.xml
new file mode 100644
index 000000000..1657317e8
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/selectionTest.xml
@@ -0,0 +1,145 @@
+
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
+
+<suite >
+
+    <!-- .............................................................................
+   	  Should get 1 tests run and passed when running with global options:
+   	    -ajctestRequireKeywords=requireKeyword
+   	    -ajctestSkipKeywords=skipKeyword
+   	    !verbose
+   	    -eclipse
+   	  
+   	  This is used by a JUnit test HarnessSelectionTest.	  
+   	  Do not change the outcome without changing that test.
+    -->
+    
+    <ajc-test dir="." title="run and pass" 
+    	 keywords="requireKeyword" >
+        <compile files="TestNoTester.java"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <!-- .............................................................................
+   	  AjcTest should skip or select based on (arbitrary) keywords
+    -->
+
+    <ajc-test dir="." pr="100" title="omit if skipKeyword" keywords="requireKeyword,skipKeyword" >
+        <compile staging="false" files="TestNoTester.java"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+    
+    <!-- .............................................................................
+   	  CompilerRun should resolve soft conflicts in favor of globals. XXX
+    -->
+
+    <!-- .............................................................................
+   	  CompilerRun should skip hard conflicts (both local and global use force). XXX
+    -->
+    <ajc-test dir="." pr="101" title="skip - conflict of local ^verbose and global !verbose XXX failing - runs" 
+    	 keywords="requireKeyword" >
+        <compile files="TestNoTester.java" options="^verbose"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    
+    <!-- .............................................................................
+   	  CompilerRun should skip semantic conflicts - see CompilerRun.Spec.setupArgs(..).
+    -->
+
+    <ajc-test dir="." title="skip - local conflict between -lenient, -strict" 
+    	 keywords="requireKeyword" >
+        <compile files="TestNoTester.java" options="-lenient,-strict"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - local conflict between forced lenient, forced strict" 
+    	 keywords="requireKeyword" >
+        <compile files="TestNoTester.java" options="!lenient,!strict"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <!-- ................... ajc limitations -->
+    <ajc-test dir="." title="skip - forced ajc with incremental tests" 
+    	 keywords="requireKeyword" >
+        <compile staging="true" files="TestNoTester.java" options="!ajc"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <!-- ................... eajc limitations -->
+    <ajc-test dir="." title="skip - forced eclipse with -strict" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="-strict,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - forced eclipse with -lenient" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="-lenient,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - forced eclipse with forced strict" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="!strict,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - forced eclipse with forced lenient" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="!lenient,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - forced eclipse with -preprocess" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="-preprocess,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - forced eclipse with -usejavac" 
+    	 keywords="requireKeyword,ajcEclipseForceConflict,eclipseOptionSkip" >
+        <compile staging="true" files="TestNoTester.java" options="-usejavac,!eclipse"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <!-- .............................................................................
+   	  CompilerRun should skip invalid options CompilerRun.Spec.INVALID_OPTIONS:
+      { "-workingdir", "-argfile", "-sourceroot", "-outjar", "-source" }
+    -->
+
+    <ajc-test dir="." title="skip - local invalid option -workingdir" 
+    	 keywords="requireKeyword,localInvalidOption" >
+        <compile files="TestNoTester.java" options="-workingdir,."/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - local invalid option -argfile" 
+    	 keywords="requireKeyword,localInvalidOption" >
+        <compile files="TestNoTester.java" options="-argfile,f"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - local invalid option -sourceroot" 
+    	 keywords="requireKeyword,localInvalidOption" >
+        <compile files="TestNoTester.java" options="-sourceroot,."/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - local invalid option -outjar"
+    	 keywords="requireKeyword,localInvalidOption" >
+        <compile files="TestNoTester.java" options="-outjar,foo.jar"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+
+    <ajc-test dir="." title="skip - local invalid option -source 1.4" 
+    	 keywords="requireKeyword,localInvalidOption" >
+        <compile files="TestNoTester.java" options="-source,1.4"/>
+        <run class="TestNoTester"/>
+    </ajc-test>
+    
+    <!-- .............................................................................
+   	  CompilerRun should skip invalid options specified as globals XXX
+    -->
+
+</suite>
diff --git a/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.30.java b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.30.java
new file mode 100644
index 000000000..59564d39c
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.30.java
@@ -0,0 +1,12 @@
+
+package main;
+
+import org.aspectj.testing.Tester;
+
+public class Main {
+    public static void main (String[] args) {
+        new Target().run();
+        Tester.expectEvent("Target.run()");
+        Tester.checkAllEvents();
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.java b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.java
new file mode 100644
index 000000000..185ed42bf
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Main.java
@@ -0,0 +1,7 @@
+
+package main;
+
+public class Main {
+    public static void main (String[] args) {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceAdded/main/Target.20.java b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Target.20.java
new file mode 100644
index 000000000..985587eec
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceAdded/main/Target.20.java
@@ -0,0 +1,9 @@
+package main;
+
+import org.aspectj.testing.Tester;
+
+public class Target {
+    void run() { 
+        Tester.event("Target.run()");
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.delete.20.java b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.delete.20.java
new file mode 100644
index 000000000..345047b16
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.delete.20.java
@@ -0,0 +1,2 @@
+
+// delete file DeleteMe.java
+\ No newline at end of file
diff --git a/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.java b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.java
new file mode 100644
index 000000000..9057235ff
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/DeleteMe.java
@@ -0,0 +1,7 @@
+
+package delete;
+
+public class DeleteMe {
+    static void run() {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Main.java b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Main.java
new file mode 100644
index 000000000..e180e46c8
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Main.java
@@ -0,0 +1,8 @@
+
+package delete;
+
+public class Main {
+	public static void main(String[] args) {
+        Target.run();
+	}
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.30.java b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.30.java
new file mode 100644
index 000000000..1678b7055
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.30.java
@@ -0,0 +1,7 @@
+
+package delete;
+
+public class Target {
+    static void run() {
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.java b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.java
new file mode 100644
index 000000000..a19401904
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/sourceDeleted/delete/Target.java
@@ -0,0 +1,8 @@
+
+package delete;
+
+public class Target {
+    static void run() {
+        DeleteMe.run(); // CE 6 after DeleteMe deleted
+    }
+}
diff --git a/testing-drivers/testdata/incremental/harness/suite.xml b/testing-drivers/testdata/incremental/harness/suite.xml
new file mode 100644
index 000000000..b6b568384
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/suite.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd">
+
+<suite>    
+
+    <!-- driven from JUnit by HarnessSelectionTest.testIncrementalSuite() -->
+	<!-- 
+	      Using OldAjc (no inc-compile), get two errors (updated file not found (b/c cleared?), 
+	      deleted file not found.
+	 -->
+
+    <!-- 
+         test harness ability to update and delete source files to prep for a compile
+     -->
+    <ajc-test dir="sourceDeleted" title="  file" keywords="incremental" >
+        <compile staging="true" files="delete/Main.java,delete/Target.java,delete/DeleteMe.java"/>
+        <run class="delete.Main"/>
+        <inc-compile tag="20">
+            <dir-changes removed="delete.DeleteMe"/>
+        	<message kind="error" line="6" file="delete/Target.java"/>
+        </inc-compile>
+        <inc-compile tag="30"/> 
+        <run class="delete.Main"/>
+    </ajc-test>
+    
+    <ajc-test dir="sourceAdded" title="add file with class" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20">
+            <dir-changes added="main.Target"/>
+        </inc-compile>
+        <inc-compile tag="30">
+            <dir-changes updated="main.Main"/>
+        </inc-compile>
+        <run class="main.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="defaultPackage" title="do everything in default package" keywords="incremental" >
+        <compile staging="true" files="Main.java"/>
+        <run class="Main"/>
+        <inc-compile tag="20">
+            <dir-changes added="Target"/>
+        </inc-compile>
+        <run class="Target" skipTester="true"/>
+        <inc-compile tag="30">
+            <dir-changes updated="Main"/>
+        </inc-compile>
+        <run class="Main" skipTester="true"/>
+        <inc-compile tag="40">
+            <dir-changes updated="Main" removed="Target"/>
+			<message kind="error" line="1"/>
+        </inc-compile>
+        <run class="Main"/>
+    </ajc-test>
+
+    <!-- 
+         test harness detection of .class file added, removed, or changed 
+         as a result of the compile process. 
+         XXX test dir-changes for JavaRun, CompilerRun
+         XXX document special handling of dir-changes paths as FQN for .class suffix
+         XXX need negative tests, fails reported
+     -->
+    <ajc-test dir="classAdded" title="expect class added" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes added="main.Target"/>
+        </inc-compile>
+        <run class="main.Main"  skipTester="true"/>
+    </ajc-test>
+
+    <ajc-test dir="classRemoved" title="expect class removed" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20">
+            <dir-changes removed="main.Target"/>
+        </inc-compile>
+        <run class="main.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="classUnchanged" title="expect class unchanged" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20">
+            <dir-changes updated="main.Main" unchanged="main.Target"/>
+        </inc-compile>
+        <run class="main.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="classUpdated" title="expect class updated" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20">
+            <dir-changes updated="main.Main"/>
+        </inc-compile>
+        <run class="main.Main"/>
+    </ajc-test>
+
+    <ajc-test dir="expClasses" title="expected class tree" keywords="incremental"
+      comment="XXX need to install Main.class compiled with harness" >
+        <compile files="Main.java">
+            <dir-changes expDir="expClasses"/>
+        </compile>
+        <run class="Main"/>
+    </ajc-test>
+
+
+</suite>
diff --git a/testing-drivers/testdata/incremental/harness/suiteFails.xml b/testing-drivers/testdata/incremental/harness/suiteFails.xml
new file mode 100644
index 000000000..8bf7f7404
--- /dev/null
+++ b/testing-drivers/testdata/incremental/harness/suiteFails.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!DOCTYPE suite [
+   <!ELEMENT suite (ajc-test+)>
+   <!ATTLIST suite suiteDir CDATA #IMPLIED >
+   <!ATTLIST suite verbose CDATA #IMPLIED >
+
+   <!ELEMENT ajc-test (compile, (compile | inc-compile | run )*)>
+   <!ATTLIST ajc-test title CDATA #REQUIRED >
+   <!ATTLIST ajc-test dir CDATA #REQUIRED >
+   <!ATTLIST ajc-test pr CDATA #IMPLIED >
+   <!ATTLIST ajc-test keywords CDATA #IMPLIED >
+
+   <!ELEMENT compile (dir-changes*,file*,message*)>
+   <!ATTLIST compile files CDATA #IMPLIED >
+   <!ATTLIST compile options CDATA #IMPLIED >
+   <!ATTLIST compile staging (true | false) #IMPLIED >
+
+   <!ELEMENT inc-compile (dir-changes*,message*)> <!-- 0-1? -->
+   <!ATTLIST inc-compile tag CDATA #REQUIRED >
+   <!ATTLIST inc-compile changedFiles CDATA #IMPLIED >
+   <!ATTLIST inc-compile classesAdded CDATA #IMPLIED >
+   <!ATTLIST inc-compile classesRemoved CDATA #IMPLIED >
+   <!ATTLIST inc-compile classesUpdated CDATA #IMPLIED >
+
+   <!ELEMENT run (dir-changes*,message*)>
+   <!ATTLIST run class CDATA #REQUIRED >
+   <!ATTLIST run skipTester CDATA #IMPLIED >
+   <!ATTLIST run options CDATA #IMPLIED >
+
+   <!ELEMENT file (#PCDATA)>
+   <!ATTLIST file path CDATA #IMPLIED >
+
+   <!ELEMENT dir-changes (#PCDATA)>
+   <!ATTLIST dir-changes dirToken (classes | run) #IMPLIED >
+   <!ATTLIST dir-changes defaultSuffix CDATA #IMPLIED >
+   <!ATTLIST dir-changes added CDATA #IMPLIED >
+   <!ATTLIST dir-changes removed CDATA #IMPLIED >
+   <!ATTLIST dir-changes updated CDATA #IMPLIED >
+   <!ATTLIST dir-changes unchanged CDATA #IMPLIED >
+
+   <!ELEMENT message (#PCDATA)>
+   <!ATTLIST message kind (error | warning | info | Xlint) #REQUIRED >
+   <!ATTLIST message line CDATA #REQUIRED >
+   <!ATTLIST message text CDATA #IMPLIED >
+   <!ATTLIST message file CDATA #IMPLIED >
+   ]>
+
+<suite suiteDir="."  verbose="true">    
+	<!-- 
+	      Using OldAjc (no inc-compile), get two errors (updated file not found (b/c cleared?), 
+	      deleted file not found.
+	 -->
+
+    <!-- 
+         test harness ability to update and delete source files to prep for a compile
+     -->
+    <!-- 
+         test harness ability to detect directory changes
+     -->
+    <ajc-test title="report dir-changes fail when expected added class not added"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes added="main.ExpectNotAdded"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected added class exists at start"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes added="main.Main"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected unchanged class changed"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes unchanged="main.Main"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected unchanged class does not exist at start"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes unchanged="main.DoesNotExistAtStart"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected updated class is not updated"
+    	dir="classUnchanged" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes updated="main.Target"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected updated class does not exist at start"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes updated="main.DoesNotExistAtStart"/>
+        </inc-compile>
+    </ajc-test>
+
+
+    <ajc-test title="report dir-changes fail when expected deleted class not deleted"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes removed="main.Main"/>
+        </inc-compile>
+    </ajc-test>
+
+    <ajc-test title="report dir-changes fail when expected deleted class does not exist at start"
+    	dir="classAdded" keywords="incremental" >
+        <compile staging="true" files="main/Main.java"/>
+        <run class="main.Main"/>
+        <inc-compile tag="20" >
+            <dir-changes removed="main.DoesNotExistAtStart"/>
+        </inc-compile>
+    </ajc-test>
+
+</suite>
diff --git a/testing-drivers/testdata/incremental/inc-suite.xml b/testing-drivers/testdata/incremental/inc-suite.xml
new file mode 100644
index 000000000..468b89a1f
--- /dev/null
+++ b/testing-drivers/testdata/incremental/inc-suite.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!DOCTYPE suite [
+   <!ELEMENT suite (ajc-test+)>
+   <!ATTLIST suite file CDATA #IMPLIED >
+   <!ELEMENT ajc-test (compile*,inc-compile*,run*)>
+   <!ATTLIST ajc-test title CDATA #REQUIRED >
+   <!ATTLIST ajc-test dir CDATA #REQUIRED >
+   <!ATTLIST ajc-test pr CDATA #IMPLIED >
+   <!ATTLIST ajc-test keywords CDATA #IMPLIED >
+
+   <!ELEMENT compile (file*,message*)>
+   <!ATTLIST compile files CDATA #IMPLIED >
+   <!ATTLIST compile options CDATA #IMPLIED >
+   <!ATTLIST compile staging (true | false) #IMPLIED >
+
+   <!ELEMENT inc-compile (message*)>
+   <!ATTLIST inc-compile tag CDATA #REQUIRED >
+   <!ATTLIST inc-compile changedFiles CDATA #IMPLIED >
+
+   <!ELEMENT run (message*)>
+   <!ATTLIST run class CDATA #REQUIRED >
+   <!ATTLIST run skipTester CDATA #IMPLIED >
+   <!ATTLIST run options CDATA #IMPLIED >
+
+   <!ELEMENT file (#PCDATA)>
+   <!ATTLIST file path CDATA #IMPLIED >
+   <!ELEMENT message (#PCDATA)>
+   <!ATTLIST message kind (error | warning | Xlint) #REQUIRED >
+   <!ATTLIST message line CDATA #REQUIRED >
+   <!ATTLIST message text CDATA #IMPLIED >
+   <!ATTLIST message file CDATA #IMPLIED >
+   ]>
+
+<suite file="inc-suite.xml">    
+
+    <ajc-test dir="java/static" 
+            title="minimal incremental test"
+         keywords="incremental" >
+        <compile staging="true" files="Main.java,Target.java"/>
+        <inc-compile tag="20" changedFiles="Main.java">
+            <message kind="error" line="6" file="Main.java"/>
+        </inc-compile>
+        <inc-compile tag="30"/>
+        <inc-compile tag="40"/>
+    </ajc-test>
+
+    <ajc-test dir="java/delete" 
+            title="minimal incremental test with delete operation"
+         keywords="incremental" >
+        <compile staging="true" files="Main.java,Target.java,DeleteMe.java"/>
+        <inc-compile tag="20">
+            <message kind="error" line="7" file="Target.java" text="*DeleteMe.main*"/>
+        </inc-compile>
+        <inc-compile tag="30"/>
+    </ajc-test>
+
+</suite>
diff --git a/testing-drivers/testdata/incremental/java/delete/DeleteMe.delete.20.java b/testing-drivers/testdata/incremental/java/delete/DeleteMe.delete.20.java
new file mode 100644
index 000000000..6beafcc3d
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/delete/DeleteMe.delete.20.java
@@ -0,0 +1,5 @@
+public class Main {
+    public static void main (String[] args) {
+    } 
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/delete/DeleteMe.java b/testing-drivers/testdata/incremental/java/delete/DeleteMe.java
new file mode 100644
index 000000000..0f8d29157
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/delete/DeleteMe.java
@@ -0,0 +1,8 @@
+
+
+
+public class DeleteMe {
+    public static void main (String[] args) {
+    } 
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/delete/Main.java b/testing-drivers/testdata/incremental/java/delete/Main.java
new file mode 100644
index 000000000..db1d83469
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/delete/Main.java
@@ -0,0 +1,9 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+        Target.staticMethod();
+    } 
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/delete/Target.30.java b/testing-drivers/testdata/incremental/java/delete/Target.30.java
new file mode 100644
index 000000000..8ae9dc730
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/delete/Target.30.java
@@ -0,0 +1,9 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod() {
+    }
+    
+}
diff --git a/testing-drivers/testdata/incremental/java/delete/Target.java b/testing-drivers/testdata/incremental/java/delete/Target.java
new file mode 100644
index 000000000..1ae129b7c
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/delete/Target.java
@@ -0,0 +1,10 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod() {
+        DeleteMe.main(new String[0]);
+    }
+    
+}
diff --git a/testing-drivers/testdata/incremental/java/static/Main.30.java b/testing-drivers/testdata/incremental/java/static/Main.30.java
new file mode 100644
index 000000000..a032688c5
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Main.30.java
@@ -0,0 +1,9 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+        Target.staticMethod(1);
+    } 
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/static/Main.40.java b/testing-drivers/testdata/incremental/java/static/Main.40.java
new file mode 100644
index 000000000..3286e34f8
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Main.40.java
@@ -0,0 +1,11 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+        Target.staticMethod(1);
+    }
+    
+    static Target.Inner foo = null;
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/static/Main.60.java b/testing-drivers/testdata/incremental/java/static/Main.60.java
new file mode 100644
index 000000000..3286e34f8
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Main.60.java
@@ -0,0 +1,11 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+        Target.staticMethod(1);
+    }
+    
+    static Target.Inner foo = null;
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/static/Main.java b/testing-drivers/testdata/incremental/java/static/Main.java
new file mode 100644
index 000000000..db1d83469
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Main.java
@@ -0,0 +1,9 @@
+
+// default package
+
+public class Main {
+    public static void main (String[] args) {
+        Target.staticMethod();
+    } 
+}
+    
diff --git a/testing-drivers/testdata/incremental/java/static/Target.20.java b/testing-drivers/testdata/incremental/java/static/Target.20.java
new file mode 100644
index 000000000..dc0764c69
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Target.20.java
@@ -0,0 +1,8 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod(int i) { // CE Main.java:6
+    }
+}
diff --git a/testing-drivers/testdata/incremental/java/static/Target.40.java b/testing-drivers/testdata/incremental/java/static/Target.40.java
new file mode 100644
index 000000000..bd0a3ed3e
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Target.40.java
@@ -0,0 +1,10 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod(int i) { // CE Main.java:6
+    }
+    
+    static class Inner {}
+}
diff --git a/testing-drivers/testdata/incremental/java/static/Target.50.java b/testing-drivers/testdata/incremental/java/static/Target.50.java
new file mode 100644
index 000000000..dc0764c69
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Target.50.java
@@ -0,0 +1,8 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod(int i) { // CE Main.java:6
+    }
+}
diff --git a/testing-drivers/testdata/incremental/java/static/Target.java b/testing-drivers/testdata/incremental/java/static/Target.java
new file mode 100644
index 000000000..581afbab9
--- /dev/null
+++ b/testing-drivers/testdata/incremental/java/static/Target.java
@@ -0,0 +1,8 @@
+
+
+// default package
+
+class Target {
+    static void staticMethod() {
+    }
+}
diff --git a/testing-drivers/testing-drivers.mf.txt b/testing-drivers/testing-drivers.mf.txt
new file mode 100644
index 000000000..b7e819c9f
--- /dev/null
+++ b/testing-drivers/testing-drivers.mf.txt
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.aspectj.testing.drivers.Harness
+
diff --git a/testing-drivers/testsrc/TestingDriversModuleTests.java b/testing-drivers/testsrc/TestingDriversModuleTests.java
new file mode 100644
index 000000000..55254beb2
--- /dev/null
+++ b/testing-drivers/testsrc/TestingDriversModuleTests.java
@@ -0,0 +1,32 @@
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+
+// default package
+
+import org.aspectj.testing.drivers.DriversTests;
+
+import junit.framework.*;
+import junit.framework.Test;
+
+public class TestingDriversModuleTests extends TestCase {
+
+    public static Test suite() { 
+        TestSuite suite = new TestSuite(TestingDriversModuleTests.class.getName());
+        suite.addTest(DriversTests.suite()); 
+        return suite;
+    }
+
+    public TestingDriversModuleTests(String name) { super(name); }
+
+}  
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java
new file mode 100644
index 000000000..5182b3175
--- /dev/null
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java
@@ -0,0 +1,32 @@
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+
+package org.aspectj.testing.drivers;
+
+import junit.framework.*;
+
+public class DriversTests extends TestCase {
+
+    public static Test suite() { 
+        TestSuite suite = new TestSuite(DriversTests.class.getName());
+        // for now, do not include SuiteTest because it would take 15 minutes
+        //$JUnit-BEGIN$
+        suite.addTestSuite(HarnessSelectionTest.class); 
+        //$JUnit-END$
+        return suite;
+    }
+
+    public DriversTests(String name) { super(name); }
+
+}  
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
new file mode 100644
index 000000000..a167f7d87
--- /dev/null
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
@@ -0,0 +1,286 @@
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+package org.aspectj.testing.drivers;
+
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.testing.drivers.Harness.RunResult;
+import org.aspectj.testing.harness.bridge.AbstractRunSpec;
+import org.aspectj.testing.harness.bridge.AjcTest;
+import org.aspectj.testing.harness.bridge.AjcTest.Spec;
+import org.aspectj.testing.run.IRunStatus;
+import org.aspectj.testing.run.RunValidator;
+import org.aspectj.testing.util.BridgeUtil;
+import org.aspectj.testing.util.RunUtils;
+import org.aspectj.testing.xml.AjcSpecXmlReader;
+import org.aspectj.util.LangUtil;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * 
+ */
+public class HarnessSelectionTest extends TestCase {
+    private static final String SELECT 
+        = "testdata/incremental/harness/selectionTest.xml";
+        
+    /** @see testIncrementalSuite() */
+    private static final String INCREMENTAL 
+        = "testdata/incremental/harness/suite.xml";
+    
+    private static Hashtable SPECS = new Hashtable();    
+    
+    private static AjcTest.Suite.Spec getSpec(String suiteFile) {
+        AjcTest.Suite.Spec result = (AjcTest.Suite.Spec) SPECS.get(suiteFile);
+        if (null == result) {
+            try {
+                result = AjcSpecXmlReader.getReader().readAjcSuite(new File(suiteFile));
+                SPECS.put(suiteFile, result);
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+        }
+        return result;
+    }
+    
+    private boolean verbose;
+
+	public HarnessSelectionTest(String name) {
+		super(name);
+	}
+    
+    public void testIncrementalSuite() {
+        if (!eclipseAvailable()) {
+            System.err.println("skipping test - eclipse classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "!verbose", "!eclipse",
+            };
+        Exp exp = new Exp(8, 8, 0, 8, 0, 0, 0);
+        checkSelection(INCREMENTAL, options, "INFIX IGNORED", exp);
+    }
+    
+    public void testKeywordSelectionBoth() {
+        if (!eclipseAvailable()) {
+            System.err.println("skipping test - eclipse classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "-ajctestRequireKeywords=requireKeyword", 
+            "-ajctestSkipKeywords=skipKeyword",
+            "!verbose",
+            "-eclipse",
+            };
+        Exp exp = new Exp(17, 1, 16, 1, 0, 0, 1);
+        checkSelection(SELECT, options, "keyword skipKeyword was found", exp);
+    }
+    
+    public void testKeywordSelectionRequire() {
+        if (!eclipseAvailable()) {
+            System.err.println("skipping test - eclipse classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "-ajctestRequireKeywords=skipKeyword", 
+            "!verbose",
+            "-eclipse",
+            };
+        Exp exp = new Exp(17, 1, 16, 1, 0, 0, 16);
+        checkSelection(SELECT, options, "keyword skipKeyword was not found", exp);
+    }
+
+    public void testKeywordSelectionSkip() {
+        if (!eclipseAvailable()) {
+            System.err.println("skipping test - eclipse classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "-ajctestSkipKeywords=requireKeyword", 
+            "!verbose",
+            "-eclipse",
+            };
+        Exp exp = new Exp(17, 0, 17, 0, 0, 0, 17);
+        checkSelection(SELECT, options, "keyword requireKeyword was found", exp);
+    }
+    
+    public void testNoOptions() {
+        if (!ajcAvailable()) {
+            System.err.println("skipping test - ajc classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "!ajc"
+            };
+        Exp exp = new Exp(17, 3, 14, 3, 0, 0, 4);
+        checkSelection(SELECT, options, "normally-valid", exp);
+    }
+
+    public void testEclipseOptionsSkip() {
+        String[] options = new String[] 
+            { "-eclipse",
+                "-ajctestRequireKeywords=eclipseOptionSkip"
+            };
+        Exp exp = new Exp(17, 0, 17, 0, 0, 0, 6);
+        checkSelection(SELECT, options, "no support in eclipse-based compiler", exp);
+    }
+    
+    public void testAjcEclipseConflict() {
+        if (!ajcAvailable()) {
+            System.err.println("skipping test - ajc classes not available");
+            return;
+        }
+        String[] options = new String[] 
+            { "!ajc"
+            };
+        Exp exp = new Exp(17, 3, 14, 3, 0, 0, 6);
+        checkSelection(SELECT, options, "conflict between !eclipse and !ajc", exp);
+    }
+    
+    public void testEclipseConflict() {
+        String[] options = new String[] 
+            { "^eclipse"
+            };
+        Exp exp = new Exp(17, 3, 14, 3, 0, 0, 6);
+        checkSelection(SELECT, options, "conflict between arg=!eclipse and global=^eclipse", exp);
+    }
+    
+    public void testSinglePR() {
+        String[] options = new String[] 
+            { "-eclipse", "-ajctestPR=100"
+            };
+        Exp exp = new Exp(17, 1, 16, 1, 0, 0, 16);
+        checkSelection(SELECT, options, "bugId required", exp);
+    }
+    
+    public void testTwoPR() {
+        String[] options = new String[] 
+            { "-eclipse", "-ajctestPR=100,101"
+            };
+        Exp exp = new Exp(17, 2, 15, 2, 0, 0, 15);
+        checkSelection(SELECT, options, "bugId required", exp);
+    }
+
+    /** 
+     * Run the static test suite with the given options.
+     * @param setupHolder the IMessageHolder for any setup messages
+     * @return null if setup failed or Harness.RunResult if suite completed.
+     */
+    private Harness.RunResult runSuite(String suiteFile, String[] options, MessageHandler setupHolder) {
+        AbstractRunSpec.RT runtime = new AbstractRunSpec.RT();
+        runtime.setOptions(options);
+        AjcTest.Suite.Spec spec = getSpec(suiteFile);
+        assertNotNull(spec);
+        ArrayList kids = spec.getChildren();
+        assertNotNull(kids);
+        if ((suiteFile == SELECT) && (17 != kids.size())) {
+            assertTrue("expected 17 kids, got " + kids.size(), false);
+        }
+        if (!spec.adoptParentValues(runtime, setupHolder)) {
+            return null; 
+        } else {
+            class TestHarness extends Harness {
+                public RunResult run(AjcTest.Suite.Spec spec) {
+                    return super.run(spec);
+                } 
+            }
+            TestHarness h = new TestHarness();
+            return h.run(spec);            
+        }
+    }
+
+    class Exp {
+        public final int tests;
+        public final int testsRun;
+        public final int skipped;
+        public final int passed;
+        public final int failed;
+        public final int incomplete;
+        public final int infix;
+        Exp(int tests, int testsRun, int skipped, int passed, int failed, int incomplete, int infix) {
+            this.tests = tests;
+            this.testsRun = testsRun;
+            this.skipped = skipped;
+            this.passed = passed;
+            this.failed = failed;
+            this.incomplete = incomplete;
+            this.infix = infix;
+        }
+    }   
+         
+    public void checkSelection(String suiteFile, String[] options, String infoInfix, Exp exp) {
+        MessageHandler holder = new MessageHandler();
+        Harness.RunResult result = runSuite(suiteFile, options, holder);
+        if (verbose) {
+            MessageUtil.print(System.out, holder, " setup - ");
+        }
+        assertNotNull("Harness.RunResult", result);
+        // XXX sync hack snooping of message text with skip messages, harness
+        final List skipList = MessageUtil.getMessages(holder, IMessage.INFO, false, "skip");
+        final int numSkipped = skipList.size();        
+        IRunStatus status = result.status;
+        assertNotNull(status);
+        if (verbose) {
+            RunUtils.print(System.out, "result - ", status);
+            System.out.println(BridgeUtil.childString(status, numSkipped, result.numIncomplete));
+        }
+        assertEquals("skips", exp.skipped, numSkipped);
+        IRunStatus[] children = status.getChildren();
+        assertNotNull(children);
+        assertTrue(children.length + "!= expRun=" + exp.testsRun, 
+            exp.testsRun == children.length);
+        int actPass = 0;
+        for (int i = 0; i < children.length; i++) {
+            if (RunValidator.NORMAL.runPassed(children[i])) {
+                actPass++;
+            }
+		}
+        if (exp.passed != actPass) {
+            assertTrue("exp.passed=" + exp.passed + " != actPass=" + actPass, false);
+        }
+        if (!LangUtil.isEmpty(infoInfix)) {
+            int actInfix = MessageUtil.getMessages(holder, IMessage.INFO, false, infoInfix).size();
+            if (actInfix != exp.infix) {
+                String s = "for infix \"" + infoInfix 
+                    + "\" actInfix=" + actInfix + " != expInfix=" + exp.infix;
+                assertTrue(s, false);
+            }
+        }
+    }
+    
+    private boolean ajcAvailable() { // XXX util
+        try {
+            return (null != Class.forName("org.aspectj.compiler.base.JavaCompiler"));
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+
+    
+    private boolean eclipseAvailable() { // XXX util
+        try {
+            return (null != Class.forName("org.aspectj.ajdt.ajc.AjdtCommand"));
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+    }
+}
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/SuiteTest.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/SuiteTest.java
new file mode 100644
index 000000000..3f9ff1b26
--- /dev/null
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/SuiteTest.java
@@ -0,0 +1,197 @@
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+package org.aspectj.testing.drivers;
+
+import org.aspectj.bridge.IMessageHolder;
+import org.aspectj.bridge.MessageHandler;
+import org.aspectj.bridge.MessageUtil;
+import org.aspectj.testing.harness.bridge.AbstractRunSpec;
+import org.aspectj.testing.harness.bridge.AjcTest;
+import org.aspectj.testing.harness.bridge.Sandbox;
+import org.aspectj.testing.harness.bridge.Validator;
+import org.aspectj.testing.run.IRun;
+import org.aspectj.testing.run.IRunIterator;
+import org.aspectj.testing.run.RunStatus;
+import org.aspectj.testing.run.Runner;
+import org.aspectj.testing.util.RunUtils;
+import org.aspectj.util.LangUtil;
+
+import java.io.File;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+/**
+ * 
+ */
+public class SuiteTest extends TestCase {
+    private static final String[] SUITES = new String[]
+        { "testdata/incremental/harness/selectionTest.xml",
+          "../tests/ajcTests.xml"
+        };
+        
+    public static Test suite() {
+        TestSuite suite = new TestSuite();
+        for (int i = 0; i < SUITES.length; i++) {
+            suite.addTest(JUnitSuite.suite(SUITES[i]));			
+		}
+        return suite;
+    }
+    
+	public SuiteTest(String name) {
+		super(name);
+	}
+}
+
+/** adapt ajc test suite to JUnit TestSuite */
+class JUnitSuite extends TestSuite {
+    public static final String DEFAULT_SUITE = "../tests/ajcTests.xml";
+    public static final String[] DEFAULT_OPTIONS = new String[] 
+        { "-eclipse", "-hideStreams", "-logMinFail" };
+
+    static TestSuite suite() {
+        return suite(DEFAULT_SUITE);
+    }
+
+    static TestSuite suite(String path, String[] options, boolean verbose) {
+        return new JUnitSuite(path, options, verbose);
+    }
+
+    static TestSuite suite(String path) {
+        return new JUnitSuite(path, DEFAULT_OPTIONS, true);
+    }
+
+    private final Runner runner;
+
+    private boolean loadedTestCases;
+    
+    private JUnitSuite(String suiteFile, String[] options, boolean verbose) {
+        super(suiteFile);
+        runner = new Runner();
+        loadTestCases(suiteFile, options, verbose);
+    }
+    
+    public void runTest(Test test, TestResult result) {
+        if (!(test instanceof JUnitRunAdapter)) {
+            test.run(result);
+            return;
+        }
+        RunStatus status = new RunStatus(new MessageHandler(), runner);
+        result.startTest(test);
+        IRun testRun = ((JUnitRunAdapter) test).run;
+        try {
+            runner.run(testRun, status, null);
+            if (!status.runResult()) { 
+                RunUtils.VERBOSE_PRINTER.printRunStatus(System.out, status);
+                AssertionFailedError failure = new AssertionFailedError(""+status);
+                result.addFailure(test, failure);
+            }
+        } finally {
+            result.endTest(test);
+            if (testRun instanceof AjcTest) {
+                AjcTest ajcTest = (AjcTest) testRun;
+            }
+        }
+    }
+    
+    private void loadTestCases(String suiteFile, String[] options, boolean verbose) {
+        if (loadedTestCases) { // guard that cleanup is last
+            throw new IllegalStateException("already loaded test cases");
+        }
+        loadedTestCases = true;
+        final SuiteReader reader = new SuiteReader();
+        final Validator validator = new Validator(new MessageHandler());
+        AjcTest.Suite.Spec spec = reader.readSuite(new File(suiteFile));
+        if (null == spec) {
+            return;
+        }
+        IMessageHolder holder = new MessageHandler();
+        final AbstractRunSpec.RT parentValues = new AbstractRunSpec.RT();
+        parentValues.setOptions(options);
+        parentValues.setVerbose(verbose);
+        spec.adoptParentValues(parentValues, holder);
+        if (0 < holder.numMessages(null, true)) {
+            System.err.println("init: messages adopting options ");
+            MessageUtil.print(System.err, holder, "init: ");
+            holder = new MessageHandler();
+        }        
+        final RunStatus status = new RunStatus(holder, runner);
+        status.setIdentifier(spec);
+        final Sandbox sandbox = new Sandbox(spec.getSuiteDirFile(), validator);
+        int i = 0;
+        System.out.println("-- loading tests");
+        for (IRunIterator tests = spec.makeRunIterator(sandbox, validator);
+            tests.hasNextRun();) {
+            final IRun run = tests.nextRun(holder, runner);
+            if (0 < holder.numMessages(null, true)) {
+                System.err.println(i + ": messages loading " + run);
+                MessageUtil.print(System.err, holder, i + ": ");
+                holder = new MessageHandler();
+            } else if (null == run) {
+                System.err.println(i + ": null run ");
+            } else {
+                addTest(new JUnitRunAdapter(run));
+            }
+            System.out.print(".");
+            i++;
+            if ((i % 50) == 0) {
+                System.out.println(" -- " + i);
+            }
+        }
+        System.out.println("-- done loading tests for this suite");
+        // add a cleanup test
+        addTest(new Test() {
+            public int countTestCases() { return 1;}
+            public void run(TestResult result) {
+                result.startTest(this);
+                validator.deleteTempFiles(false);
+                result.endTest(this);
+            }
+            public String toString() { return "validator cleanup"; }
+        });
+    }
+
+    /** just opens up access, protected to public */
+    static class SuiteReader extends Harness {
+        public AjcTest.Suite.Spec readSuite(File suiteFile) {
+            return super.readSuite(suiteFile);
+        }
+
+    }
+    
+    /** non-functional wrapper for the enclosed IRun */
+    public static class JUnitRunAdapter implements Test {
+        static final UnsupportedOperationException EX =
+            new UnsupportedOperationException("");
+        
+        public final IRun run;
+        public JUnitRunAdapter(IRun run) {
+            LangUtil.throwIaxIfNull(run, "run");
+            this.run = run;
+        }
+        public final void run(TestResult result) {
+          throw EX;
+        }
+        public final int countTestCases() {
+            return 1;
+        }
+        public String toString() {
+            return run.toString();
+        }
+
+    }
+}
author	wisberg <wisberg>	2002-12-16 21:46:19 +0000
committer	wisberg <wisberg>	2002-12-16 21:46:19 +0000
commit	31b7d84b2b4dc4ba29088947d8872027830e8fe4 (patch)
tree	ec64d701df1ee2d84272264b6688032f4a860f6d /testing-drivers
parent	c67cb6056cbd89b1fa95ec6a1813793fa18edf16 (diff)
download	aspectj-31b7d84b2b4dc4ba29088947d8872027830e8fe4.tar.gz aspectj-31b7d84b2b4dc4ba29088947d8872027830e8fe4.zip