+ "=... in order to run all tests");
}
}
+
+ private static String[][] duplicate(String[][] input, String prefix) {
+ String[][] output = new String[input.length][];
+ final int prefixLength = (null == prefix ? 0 : prefix.length());
+ for (int i = 0; i < output.length; i++) {
+ int length = input[i].length;
+ output[i] = new String[length];
+ if ((length > 0) && (prefixLength > 0)) {
+ System.arraycopy(input[i], 0, output[i], 0, length);
+ output[i][0] =
+ prefix + output[i][0].substring(prefixLength);
+ }
+ }
+ return output;
+ }
+
private static boolean haveProperty(String key) {
try {
return (null != System.getProperty(key));
}
}
+ /**
+ * Checck that setting arg as spec compiler and setting up args
+ * results in this compiler classname.
+ * @param arg
+ * @param className
+ */
void checkCompilerOption(String arg, String className) {
MessageHandler handler = new MessageHandler();
try {
}
}
- String[][] duplicate(String[][] input, String prefix) {
- String[][] output = new String[input.length][];
- final int prefixLength = (null == prefix ? 0 : prefix.length());
- for (int i = 0; i < output.length; i++) {
- int length = input[i].length;
- output[i] = new String[length];
- if ((length > 0) && (prefixLength > 0)) {
- System.arraycopy(input[i], 0, output[i], 0, length);
- output[i][0] =
- prefix + output[i][0].substring(prefixLength);
- }
- }
- return output;
- }
-
public void checkSourceTargetOverride(String name, int from, int to) {
final String specOptions = "-" + name + ", 1." + from;
String[] globalOptions = new String[] { "!" + name, "1." + to };
resultContains,
messagesContain);
}
+
+ /**
+ * Drive option-setting for CompilerRun.Spec, including
+ * expected errors.
+ * @param specOptions
+ * @param globalOptions
+ * @param expectAdopted
+ * @param resultContains
+ * @param messagesContain
+ * @return
+ */
MessageHandler runTest(
String specOptions,
--- /dev/null
+/* *******************************************************************
+ * Copyright (c) 2003 Contributors.
+ * 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:
+ * Wes Isberg initial implementation
+ * ******************************************************************/
+
+package org.aspectj.testing.harness.bridge;
+
+import java.io.File;
+import java.util.*;
+
+import junit.framework.TestCase;
+
+import org.aspectj.bridge.*;
+import org.aspectj.testing.run.*;
+import org.aspectj.util.*;
+import org.aspectj.util.LangUtil;
+
+/**
+ * Use a stub compiler/ICommand to verify command-line passed
+ * to the compiler by the harness.
+ */
+public class CompilerRunTest extends TestCase {
+
+ /** String for each dummy report: {run|repeat}: [{args}] */
+ private static ArrayList dummyReports = new ArrayList();
+
+ private static void dummyRunning(String[] args) {
+ dummyReports.add("run: " + Arrays.asList(args));
+ }
+
+ private static void dummyRepeating(String[] args) {
+ dummyReports.add("repeat: " + Arrays.asList(args));
+ }
+
+ private File testBaseDir;
+
+ public CompilerRunTest(String name) {
+ super(name);
+ }
+
+ public void setUp() {
+ testBaseDir = new File(".");
+ File f = new File(testBaseDir, "one");
+ f.mkdirs();
+ assertTrue(f.canRead());
+ f = new File(testBaseDir, "two");
+ f.mkdirs();
+ assertTrue(f.canRead());
+ f = new File(testBaseDir, "Foo.java");
+ String foo = "public class Foo { public void main(String[] s) { System.out.println(\"Hello!\");}}";
+ String err = FileUtil.writeAsString(f, foo);
+ assertTrue(err, null == err);
+ assertTrue(f.canRead());
+ }
+
+ public void tearDown() {
+ testBaseDir = null;
+ }
+
+ public void testExtDirs() {
+ String[] globals = null;
+ CompilerRun.Spec spec = new CompilerRun.Spec();
+ spec.setExtdirs("one,two");
+ spec.setFiles("Foo.java");
+ checkCommandLine(testBaseDir, spec, null, "-extdirs");
+ }
+
+ void checkCommandLine(
+ File testBaseDir,
+ CompilerRun.Spec spec,
+ String[] globals,
+ String expectedInCommand) {
+ assertTrue(0 == dummyReports.size());
+ assertTrue(checkCompilerRun(testBaseDir, spec, globals, null));
+ assertTrue(dummyReports.toString(), 1 == dummyReports.size());
+ String command = (String) dummyReports.remove(0);
+ assertTrue(0 == dummyReports.size());
+ if ((null == command)
+ || (-1 == command.indexOf(expectedInCommand))) {
+ assertTrue("expected "
+ + expectedInCommand
+ + "got "
+ + command,
+ false);
+ }
+ }
+
+ /** run with dummy compiler */
+ boolean checkCompilerRun(
+ File testBaseDir,
+ CompilerRun.Spec spec,
+ String[] globals,
+ MessageHandler handler) {
+ LangUtil.throwIaxIfNull(spec, "spec");
+ if (null == handler) {
+ handler = new MessageHandler();
+ }
+ spec.setPermitAnyCompiler(true);
+ spec.setCompiler(DummyCompiler.class.getName());
+ AbstractRunSpec.RT parentRuntime = new AbstractRunSpec.RT();
+
+ if (!LangUtil.isEmpty(globals)) {
+ parentRuntime.setOptions(globals);
+ }
+ boolean adopted =
+ spec.adoptParentValues(parentRuntime, handler);
+ if (!adopted) {
+ String s = "not adopted spec="
+ + spec
+ + " globals="
+ + (LangUtil.isEmpty(globals)
+ ? "[]"
+ : Arrays.asList(globals).toString())
+ + " -- "
+ + handler;
+ assertTrue(s, false);
+ }
+ if (0 != handler.numMessages(null, true)) {
+ assertTrue("unexpected " + handler, false);
+ }
+ return run(testBaseDir, spec);
+ }
+
+ /** Run the compiler run specified by the spec */
+ protected boolean run(File testBaseDir, CompilerRun.Spec spec) {
+
+// his is created using the Spec.</li>
+// * <li>setupAjcRun(Sandbox, Validator) is invoked,
+// * at which point this populates the shared sandbox
+// * with values derived from the spec and also
+// * sets up internal state based on both the sandbox
+// * and the spec.</li>
+// * <li>run(IRunStatus) is invoked,
+
+ LangUtil.throwIaxIfNull(spec, "spec");
+ Runner runner = new Runner();
+ IMessageHolder holder = new MessageHandler();
+ RunStatus status = new RunStatus(holder, runner);
+ status.setIdentifier(spec);
+ Validator validator = new Validator(status);
+ validator.lock(this);
+ Sandbox sandbox = null;
+ try {
+ sandbox = new Sandbox(testBaseDir, validator);
+ IRunIterator test = spec.makeRunIterator(sandbox, validator);
+ return runner.runIterator(test, status, null);
+ } finally {
+ validator.unlock(this);
+ validator.deleteTempFiles(true);
+ }
+ }
+
+
+ public static class DummyCompiler implements ICommand {
+ private String[] command;
+
+ public DummyCompiler() {
+ }
+
+ public boolean runCommand(
+ String[] args,
+ IMessageHandler handler) {
+ command = (String[]) LangUtil.safeCopy(args, new String[0]);
+ CompilerRunTest.dummyRunning(command);
+ return true;
+ }
+
+ public boolean repeatCommand(IMessageHandler handler) {
+ CompilerRunTest.dummyRunning(command);
+ return true;
+ }
+ }
+}
projects / aspectj.git / commitdiff