import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.StringTokenizer;
+import junit.framework.TestCase;
+
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.ISourceLocation;
import org.aspectj.testing.util.TestUtil;
import org.aspectj.weaver.loadtime.WeavingURLClassLoader;
-import junit.framework.TestCase;
-
/**
* A TestCase class that acts as the superclass for all test cases wishing
* to drive the ajc compiler.
* @see org.aspectj.testing.XMLBasedAjcTestCase
*/
public class AjcTestCase extends TestCase {
-
- private RunResult lastRunResult;
+ private RunResult lastRunResult;
/**
* The Ajc (compiler) instance used for thet test. Created afresh
+ File.pathSeparator+".."+File.separator+"lib" +File.separator+"test"+File.separator+"aspectjrt.jar"
;
+ /*
+ * Save reference to real stderr and stdout before starting redirection
+ */
+ public final static PrintStream err = System.err;
+ public final static PrintStream out = System.out;
+ private final static DelegatingOutputStream delegatingErr;
+ private final static DelegatingOutputStream delegatingOut;
+ public final static boolean DEFAULT_VERBOSE = getBoolean("org.aspectj.tools.ajc.AjcTestCase.verbose",false);
+ public final static boolean DEFAULT_ERR_VERBOSE = getBoolean("org.aspectj.tools.ajc.AjcTestCase.verbose.err",DEFAULT_VERBOSE);
+ public final static boolean DEFAULT_OUT_VERBOSE = getBoolean("org.aspectj.tools.ajc.AjcTestCase.verbose.out",DEFAULT_VERBOSE);
+
/**
* Helper class that represents the specification of an individual
* message expected to be produced during a compilation run.
command.append(" ");
command.append(args[i]);
}
- PrintStream systemOut = System.out;
- PrintStream systemErr = System.err;
ByteArrayOutputStream baosOut = new ByteArrayOutputStream();
ByteArrayOutputStream baosErr = new ByteArrayOutputStream();
StringTokenizer strTok = new StringTokenizer(classpath,File.pathSeparator);
} catch (Exception ex) {
fail ("Unable to prepare org.aspectj.testing.Tester for test run: " + ex);
}
- System.setOut(new PrintStream(baosOut));
- System.setErr(new PrintStream(baosErr));
+ startCapture(baosErr,baosOut);
+
Class toRun = cLoader.loadClass(className);
Method mainMethod = toRun.getMethod("main",new Class[] {String[].class});
mainMethod.invoke(null,new Object[] {args});
// the main method threw an exception...
fail("Exception thrown by " + className + ".main(String[]) :" + invTgt.getTargetException());
} finally {
- System.setOut(systemOut);
- System.setErr(systemErr);
+ stopCapture(baosErr,baosOut);
}
return lastRunResult;
}
}
}
+ private static void startCapture (OutputStream errOS, OutputStream outOS) {
+ delegatingErr.add(errOS);
+ delegatingOut.add(outOS);
+
+ delegatingErr.setVerbose(DEFAULT_ERR_VERBOSE);
+ delegatingOut.setVerbose(DEFAULT_OUT_VERBOSE);
+ }
+
+ private static void stopCapture (OutputStream errOS, OutputStream outOS) {
+ delegatingErr.setVerbose(true);
+ delegatingOut.setVerbose(true);
+
+ delegatingErr.remove(errOS);
+ delegatingOut.remove(outOS);
+ }
+
+ private static boolean getBoolean (String name, boolean def) {
+ String defaultValue = String.valueOf(def);
+ String value = System.getProperty(name,defaultValue);
+ return Boolean.valueOf(value).booleanValue();
+ }
+
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
super.tearDown();
//ajc = null;
}
+
+ static {
+// new RuntimeException("*** AjcTestCase.<clinit>()").printStackTrace();
+ delegatingErr = new DelegatingOutputStream(err);
+ System.setErr(new PrintStream(delegatingErr));
+ delegatingOut = new DelegatingOutputStream(out);
+ System.setOut(new PrintStream(delegatingOut));
+ }
}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2005 IBM Corporation and others.
+ * 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:
+ * Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.tools.ajc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+public class DelegatingOutputStream extends OutputStream {
+
+ private boolean verbose = true;
+ private OutputStream target;
+ private List delegates;
+
+ public DelegatingOutputStream (OutputStream os) {
+ this.target = os;
+ this.delegates = new LinkedList();
+ }
+
+ public void close() throws IOException {
+ target.close();
+
+ for (Iterator i = delegates.iterator(); i.hasNext();) {
+ OutputStream delegate = (OutputStream)i.next();
+ delegate.close();
+ }
+ }
+
+ public void flush() throws IOException {
+ target.flush();
+
+ for (Iterator i = delegates.iterator(); i.hasNext();) {
+ OutputStream delegate = (OutputStream)i.next();
+ delegate.flush();
+ }
+ }
+
+ public void write(byte[] b, int off, int len) throws IOException {
+ if (verbose) target.write(b, off, len);
+
+ for (Iterator i = delegates.iterator(); i.hasNext();) {
+ OutputStream delegate = (OutputStream)i.next();
+ delegate.write(b,off,len);
+ }
+ }
+
+ public void write(byte[] b) throws IOException {
+ if (verbose) target.write(b);
+
+ for (Iterator i = delegates.iterator(); i.hasNext();) {
+ OutputStream delegate = (OutputStream)i.next();
+ delegate.write(b);
+ }
+ }
+
+ public void write(int b) throws IOException {
+ if (verbose) target.write(b);
+
+ for (Iterator i = delegates.iterator(); i.hasNext();) {
+ OutputStream delegate = (OutputStream)i.next();
+ delegate.write(b);
+ }
+ }
+
+ public boolean add (OutputStream delegate) {
+ return delegates.add(delegate);
+ }
+
+ public boolean remove (OutputStream delegate) {
+ return delegates.remove(delegate);
+ }
+
+ public boolean isVerbose() {
+ return verbose;
+ }
+
+ public void setVerbose(boolean verbose) {
+ this.verbose = verbose;
+ }
+
+}
projects / aspectj.git / commitdiff