@@ -822,7 +822,7 @@ abstract class WizardPane { | |||
* + "}</head>\n"; | |||
*/ | |||
public static String applyProperties(String text, Map map) { | |||
public static String applyProperties(String text, Map<String,String> map) { | |||
// ${name} -> map.get(name).toString() | |||
int lastIndex = 0; | |||
StringBuffer buf = new StringBuffer(); |
@@ -257,8 +257,8 @@ public class Module { | |||
} | |||
} | |||
// libraries | |||
for (Iterator iter = result.getLibJars().iterator(); iter.hasNext();) { | |||
file = (File) iter.next(); | |||
for (Iterator<File> iter = result.getLibJars().iterator(); iter.hasNext();) { | |||
file = iter.next(); | |||
if (outOfDate(time, file)) { | |||
return true; | |||
} |
@@ -1,15 +1,14 @@ | |||
/* ******************************************************************* | |||
* Copyright (c) 2005 Contributors. | |||
* All rights reserved. | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://eclipse.org/legal/epl-v10.html | |||
* | |||
* Contributors: | |||
* Wes Isberg initial implementation | |||
* All rights reserved. | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://eclipse.org/legal/epl-v10.html | |||
* | |||
* Contributors: | |||
* Wes Isberg initial implementation | |||
* ******************************************************************/ | |||
package org.aspectj.internal.tools.build; | |||
import java.io.File; | |||
@@ -17,7 +16,6 @@ import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.ListIterator; | |||
@@ -62,7 +60,7 @@ public class Result { | |||
if (null == name) { | |||
throw new IllegalArgumentException("null name"); | |||
} | |||
return (Result) nameToResult.get(name); | |||
return nameToResult.get(name); | |||
} | |||
public static Result[] getResults(String[] names) { | |||
@@ -293,7 +291,7 @@ public class Result { | |||
if (null == list) { | |||
return new Result[0]; | |||
} | |||
return (Result[]) list.toArray(new Result[0]); | |||
return list.toArray(new Result[0]); | |||
} | |||
private void initSrcDirs() { |
@@ -172,7 +172,7 @@ public class SampleGatherer { | |||
StringBuffer sampleCode = new StringBuffer(); | |||
String anchorName = null; | |||
String anchorTitle = null; | |||
ArrayList flags = new ArrayList(); | |||
ArrayList<String> flags = new ArrayList<>(); | |||
int startLine = -1; // seeking | |||
int endLine = Integer.MAX_VALUE; // not seeking | |||
reader = new FileReader(source); | |||
@@ -221,7 +221,7 @@ public class SampleGatherer { | |||
source, | |||
startLine, | |||
endLine, | |||
(String[]) flags.toArray(new String[flags.size()])); | |||
flags.toArray(new String[flags.size()])); | |||
sink.addSample(sample); | |||
// back to seeking start | |||
@@ -331,7 +331,7 @@ class Sample { | |||
final int endLine; | |||
final Kind kind; | |||
/** List of String flags found in the sample */ | |||
final List flags; | |||
final List<String> flags; | |||
public Sample( | |||
String anchorName, | |||
String anchorTitle, | |||
@@ -351,7 +351,7 @@ class Sample { | |||
this.kind = Kind.getKind(sourcePath); | |||
// List theFlags; | |||
if ((null == flags) || (0 == flags.length)) { | |||
this.flags = Collections.EMPTY_LIST; | |||
this.flags = Collections.emptyList(); | |||
} else { | |||
this.flags = Collections.unmodifiableList(Arrays.asList(flags)); | |||
} | |||
@@ -777,10 +777,10 @@ class HTMLSamplesRenderer extends SamplesRenderer { | |||
protected void renderAuthorIndex(Samples samples, StringBuffer sink) { | |||
sink.append("<h2><a name=\"authorIndex\"></a>Author Index</h2>"); | |||
List list = samples.getSortedSamples(Sample.AUTHOR_NAME_SOURCE_COMPARER); | |||
List<Sample> list = samples.getSortedSamples(Sample.AUTHOR_NAME_SOURCE_COMPARER); | |||
String lastAuthor = null; | |||
for (ListIterator iter = list.listIterator(); iter.hasNext();) { | |||
Sample sample = (Sample)iter.next(); | |||
for (ListIterator<Sample> iter = list.listIterator(); iter.hasNext();) { | |||
Sample sample = iter.next(); | |||
String author = sample.author; | |||
if (!author.equals(lastAuthor)) { | |||
if (null != lastAuthor) { |
@@ -1,14 +1,14 @@ | |||
/* ******************************************************************* | |||
* Copyright (c) 1999-2001 Xerox Corporation, | |||
* 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 Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* Contributors: | |||
* Xerox/PARC initial implementation | |||
* All rights reserved. | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* Contributors: | |||
* Xerox/PARC initial implementation | |||
* ******************************************************************/ | |||
@@ -78,10 +78,11 @@ import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.Reference; | |||
import org.aspectj.util.LangUtil; | |||
@SuppressWarnings("deprecation") | |||
public class Ajctest extends Task implements PropertyChangeListener { | |||
private static Ajctest CURRENT_AJCTEST; | |||
// todo shutdown hook assumes one task per VM | |||
// todo shutdown hook assumes one task per VM | |||
public Ajctest() { | |||
super(); | |||
CURRENT_AJCTEST = this; | |||
@@ -112,13 +113,13 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
private void fire(String prop) { | |||
fire(prop, "dummy-old", "dummy-new"); | |||
} | |||
private static boolean dumpresults = false; | |||
private Stats ajdocStats = new Stats(); | |||
private Stats ajcStats = new Stats(); | |||
private Stats runStats = new Stats(); | |||
// private Stats errorStats = new Stats(); | |||
private static final String NO_TESTID = "NONE"; | |||
private static final String NO_TESTID = "NONE"; | |||
private File workingdir = new File("ajworkingdir"); //XXX | |||
//fields | |||
@@ -141,7 +142,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public Argfile createArgfile() { | |||
return createTestset().createArgfile(); | |||
} | |||
public void setNoverify(boolean input) { | |||
if (input != noverify) noverify = input; | |||
} | |||
@@ -152,13 +153,13 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
//setTestId(target.getName()); | |||
} | |||
} | |||
public void setTestId(String str) { | |||
if ((null != str) && (0 < str.trim().length())) { | |||
testId = str; | |||
} | |||
} | |||
public void setArgs(String str) { | |||
if (str == null || str.length() < 1) return; | |||
StringTokenizer tok = new StringTokenizer(str, ",", false); | |||
@@ -221,7 +222,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
return arg; | |||
} | |||
public Argument createArg() { | |||
Argument arg = new Argument(false); | |||
args.add(arg); | |||
@@ -279,7 +280,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
public Run createJava() { | |||
Run testclass = new Run(project); | |||
Run testclass = new Run(project); | |||
testclasses.add(testclass); | |||
return testclass; | |||
} | |||
@@ -310,11 +311,11 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
ajdoc.createArg().setValue(t.nextToken().trim()); | |||
} | |||
} | |||
public void addAjdoc(Ajdoc ajdoc) { | |||
this.ajdoc = ajdoc; | |||
} | |||
public Ajdoc createAjdoc() { | |||
return ajdoc = new Ajdoc(); | |||
} | |||
@@ -387,7 +388,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
} | |||
//end-methods | |||
public static class Argfile { | |||
private String name; | |||
public void setName(String name) { this.name = name; } | |||
@@ -457,18 +458,18 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public void setExcludesfile(File excludesfile) { | |||
super.setExcludesfile(excludesfile); | |||
havecludes = true; | |||
} | |||
} | |||
public void setArgfile(String name) { | |||
createArgfile().setName(name); | |||
} | |||
public void setArgfiles(String str) { | |||
StringTokenizer tok = new StringTokenizer(str, ", ", false); | |||
while (tok.hasMoreTokens()) { | |||
createArgfile().setName(tok.nextToken().trim()); | |||
} | |||
} | |||
public Argfile createArgfile() { | |||
Argfile argfile = new Argfile(); | |||
@@ -496,7 +497,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public void setTestclass(String testclass) { | |||
createJava().setClassname(testclass); | |||
} | |||
public void setClasses(String str) { | |||
for (StringTokenizer t = new StringTokenizer(str, ", ", false); | |||
t.hasMoreTokens();) { | |||
@@ -510,14 +511,14 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
classpath.append(path); | |||
} | |||
} | |||
public Path createClasspath() { | |||
if (classpath == null) { | |||
classpath = new Path(project); | |||
} | |||
return classpath.createPath(); | |||
} | |||
public void setClasspathRef(Reference r) { | |||
createClasspath().setRefid(r); | |||
} | |||
@@ -528,18 +529,18 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
internalclasspath.append(path); | |||
} | |||
} | |||
public Path createInternalclasspath() { | |||
if (internalclasspath == null) { | |||
internalclasspath = new Path(project); | |||
} | |||
return internalclasspath.createPath(); | |||
} | |||
public void setInternalclasspathRef(Reference r) { | |||
createInternalclasspath().setRefid(r); | |||
} | |||
public void setAjdoc(boolean b) { | |||
if (b && ajdoc == null) { | |||
createAjdoc(); | |||
@@ -574,7 +575,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
} | |||
//end-testset-methods | |||
public void resolve() throws BuildException { | |||
if (dir != null) this.setDir(dir); | |||
File src = getDir(project); | |||
@@ -589,7 +590,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
String[] filenames = | |||
getDirectoryScanner(project).getIncludedFiles(); | |||
for (int j = 0; j < filenames.length; j++) { | |||
String name = filenames[j]; | |||
String name = filenames[j]; | |||
if (name.endsWith(".java")) { | |||
File file = new File(src, name); | |||
if (check(file, name, location)) files.add(file); | |||
@@ -638,25 +639,25 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
StringTokenizer tok = new StringTokenizer(str, ",", false); | |||
while (tok.hasMoreTokens()) { | |||
String name = tok.nextToken().trim(); | |||
parse(name.startsWith("J") ? createJarg() : createArg(), name); | |||
parse(name.startsWith("J") ? createJarg() : createArg(), name); | |||
} | |||
} | |||
public Argument createJarg() { | |||
Argument arg = new Argument(true); | |||
args.add(arg); | |||
return arg; | |||
} | |||
public Argument createArg() { | |||
Argument arg = new Argument(false); | |||
args.add(arg); | |||
return arg; | |||
} | |||
} | |||
} | |||
private void prepare() throws BuildException { | |||
} | |||
private void finish() throws BuildException { | |||
@@ -664,7 +665,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
log(""); | |||
log("There " + w(errors) + " " + errors.size() + " errors:"); | |||
for (int i = 0; i < errors.size(); i++) { | |||
log(" ", (Failure)errors.get(i), i); | |||
log(" ", errors.get(i), i); | |||
} | |||
} | |||
allErrors.addAll(errors); | |||
@@ -680,13 +681,13 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
log(space + "msgs:" + failure.msgs); | |||
} | |||
private String enough(String str, int size, char filler) { | |||
while (str.length() < size) str += filler; | |||
return str; | |||
} | |||
private void log(String space, List<?> list, String title) { | |||
if (list == null || list.size() < 1) return; | |||
log(space + title); | |||
@@ -762,9 +763,9 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} else { | |||
throw new Error("unknown compiler: " + compiler); | |||
} | |||
System.out.println("using compiler: " + ajc); | |||
try { | |||
try { | |||
if ((exit = ajc.run()) != 0) { | |||
post(testset, args, ajc.msgs, exit, "ajc"); | |||
goodCompile = false; | |||
@@ -782,7 +783,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
"couldn't run classes " + testset.testclasses + | |||
"due to failed compile", | |||
-1, "run"); | |||
} else if (!isSet("norun")) { | |||
for (Iterator<Run> i = testset.testclasses.iterator(); i.hasNext();) { | |||
Run testclass = i.next(); | |||
@@ -833,7 +834,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
execute(testset, args); | |||
} | |||
} | |||
// for (Iterator iter = testsets.iterator(); iter.hasNext(); _++) { | |||
// Testset testset = (Testset)iter.next(); | |||
// testset.resolve(); | |||
@@ -850,7 +851,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
// execute(testset, args); | |||
// log(""); | |||
// } | |||
// } | |||
// } | |||
finish(); | |||
} | |||
@@ -886,20 +887,20 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
return true; | |||
} | |||
/** | |||
/** | |||
* Interpose Wrapper class to catch and report exceptions | |||
* by setting a positive value for System.exit(). | |||
* (In some cases it seems that Exceptions are not being reported | |||
* as errors in the tests.) | |||
* This forces the VM to fork. A forked VM is required for | |||
* two reasons: | |||
* (1) The wrapper class may have been defined by a different | |||
* (1) The wrapper class may have been defined by a different | |||
* class loader than the target class, so it would not be able | |||
* to load the target class; | |||
* <p> | |||
* (2) Since the wrapper class is generic, we have to pass in | |||
* the name of the target class. I choose to do this using | |||
* VM properties rather than hacking up the arguments. | |||
* VM properties rather than hacking up the arguments. | |||
* <p>todo: relies on name/value of property "taskdef.jar" | |||
* to add jar with wrapper to invoking classpath. | |||
* <p> | |||
@@ -916,7 +917,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public final String PROP_NAME = "MainWrapper.classname"; | |||
/** tracked in MainWrapper.CLASSDIR_NAME */ | |||
public final String CLASSDIR_NAME = "MainWrapper.classdir"; | |||
public final String WRAPPER_CLASS | |||
public final String WRAPPER_CLASS | |||
= "org.aspectj.internal.tools.ant.taskdefs.MainWrapper"; | |||
private String classname; | |||
protected String classesDir; | |||
@@ -951,7 +952,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
RunWrapper.this.createClasspath().append(wrapperPath); | |||
} | |||
} | |||
/** do setup, then super.execute() */ | |||
public int executeJava() { | |||
setup(); | |||
@@ -967,7 +968,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
public class Run extends RunWrapper { | |||
//public class Run extends Java | |||
//public class Run extends Java | |||
private Path bootclasspath; | |||
public void setBootbootclasspath(Path path) { | |||
if (bootclasspath == null) { | |||
@@ -1123,19 +1124,19 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
str += secs + " second" + (secs != 1 ? "s" : "") + " "; | |||
return str; | |||
} | |||
public void run() { | |||
Ajctest current = CURRENT_AJCTEST; | |||
String oneLine = "warning: oneLine not set."; | |||
String multiLine = "warning: multiLine not set."; | |||
// setup oneLine | |||
if (null == current) { | |||
oneLine = "\nRESULT=\"ERROR\" null ACJTEST"; | |||
} else { | |||
StringBuffer sb = new StringBuffer("\n"); | |||
int errs = Ajctest.allErrors.size(); | |||
int allFails = errs | |||
int allFails = errs | |||
+ current.ajdocStats.fails | |||
+ current.ajcStats.fails | |||
+ current.runStats.fails; | |||
@@ -1181,7 +1182,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
str += "Total time : " + ms(startTime, stopTime) + "\n"; | |||
str += | |||
"------------------------------" + | |||
" Summary " + | |||
" Summary " + | |||
"------------------------------" + "\n"; | |||
str += "Task\tPassed\tFailed" + "\n"; | |||
Object[] os = new Object[] { | |||
@@ -1194,7 +1195,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
if (allErrors.size() > 0) { | |||
str += "" + "\n"; | |||
str += | |||
str += | |||
"There " + w(allErrors) + " " + | |||
allErrors.size() + " error" + | |||
s(allErrors) + ":" + "\n"; | |||
@@ -1210,7 +1211,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
str += "No errors." + "\n"; | |||
} | |||
str += "--------------------------" + | |||
" End of Summary " + | |||
" End of Summary " + | |||
"---------------------------" + "\n"; | |||
multiLine = str; | |||
} | |||
@@ -1251,7 +1252,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
private static String a(List list, String some, String one) { | |||
return list == null || list.size() != 1 ? some : one; | |||
} | |||
static class Failure { | |||
public final Testset testset; | |||
public final List args; | |||
@@ -1276,7 +1277,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
str += "type:" + type + "\n"; | |||
str += testset + "\n"; | |||
if (args.size() > 0) { | |||
str += " args: " + args + "\n";; | |||
str += " args: " + args + "\n"; | |||
} | |||
str += " msgs:" + msgs + "\n"; | |||
str += " exit:" + exit; | |||
@@ -1378,7 +1379,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public AjcWrapper(Testset testset, List args) { | |||
super(testset, args, false); | |||
if (testset.noclean) { | |||
setExtraclasspath(new Path(project, | |||
setExtraclasspath(new Path(project, | |||
destdir.getAbsolutePath())); | |||
} | |||
} | |||
@@ -1391,7 +1392,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public EAjcWrapper(Testset testset, List args) { | |||
super(testset, args, false); | |||
if (testset.noclean) { | |||
setExtraclasspath(new Path(project, | |||
setExtraclasspath(new Path(project, | |||
destdir.getAbsolutePath())); | |||
} | |||
} | |||
@@ -1445,7 +1446,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
protected List args; | |||
protected boolean needsClasspath; | |||
protected Path extraClasspath; | |||
public JavaCommandWrapper(Testset testset, List args, | |||
boolean needsClasspath) { | |||
this.testset = testset; | |||
@@ -1456,12 +1457,12 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
public void setExtraclasspath(Path extraClasspath) { | |||
this.extraClasspath = extraClasspath; | |||
} | |||
public String toString() { | |||
return LangUtil.unqualifiedClassName(getClass()) | |||
return LangUtil.unqualifiedClassName(getClass()) | |||
+ "(" + getMainClassName() + ")"; | |||
} | |||
protected Commandline createCommandline() { | |||
Commandline cmd = new Commandline(); | |||
cmd.setExecutable("java"); | |||
@@ -1471,7 +1472,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
cp = extraClasspath; | |||
} | |||
if (extraClasspath == null) { | |||
Path aspectjBuildDir = | |||
Path aspectjBuildDir = | |||
new Path(project, | |||
project.getProperty("ajctest.pathelement")); | |||
// todo: dependency on ant script variable name ajctest.pathelement | |||
@@ -1611,7 +1612,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
// } | |||
// exec.execute(); | |||
// } | |||
// | |||
// | |||
public void handle(Throwable t) { | |||
log("handling " + t); | |||
if (t != null) t.printStackTrace(); | |||
@@ -1692,7 +1693,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
status.runs.fails.inc(); | |||
} | |||
} | |||
private abstract static class TitledPanel extends JPanel { | |||
public TitledPanel(LayoutManager layout, String title) { | |||
super(layout); | |||
@@ -1753,7 +1754,7 @@ public class Ajctest extends Task implements PropertyChangeListener { | |||
} | |||
} | |||
} | |||
private class TablePanel extends TitledPanel { | |||
private DefaultTableModel model = new DefaultTableModel(); | |||
private TJable table; |
@@ -10,21 +10,20 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.testing; | |||
import junit.framework.Test; | |||
import junit.framework.TestCase; | |||
import junit.framework.TestSuite; | |||
import junit.extensions.TestSetup; | |||
import java.io.InputStreamReader; | |||
import java.lang.reflect.Method; | |||
import java.util.HashMap; | |||
import java.util.Iterator; | |||
import java.util.Map; | |||
import java.util.HashMap; | |||
import java.io.InputStreamReader; | |||
import java.io.FileInputStream; | |||
import org.apache.commons.digester.Digester; | |||
import org.aspectj.tools.ajc.Ajc; | |||
import junit.extensions.TestSetup; | |||
import junit.framework.Test; | |||
import junit.framework.TestCase; | |||
import junit.framework.TestSuite; | |||
/** | |||
* Autowiring of XML test spec file as JUnit tests. | |||
* <p/> |
@@ -12,11 +12,26 @@ | |||
* ******************************************************************/ | |||
package org.aspectj.testing; | |||
import org.aspectj.testing.harness.bridge.*; | |||
import org.aspectj.testing.taskdefs.*; | |||
import org.aspectj.testing.util.*; | |||
import org.aspectj.testing.util.options.*; | |||
import org.aspectj.testing.xml.*; | |||
import org.aspectj.testing.harness.bridge.AbstractRunSpecTest; | |||
import org.aspectj.testing.harness.bridge.AjcSpecTest; | |||
import org.aspectj.testing.harness.bridge.CompilerRunSpecTest; | |||
import org.aspectj.testing.harness.bridge.CompilerRunTest; | |||
import org.aspectj.testing.harness.bridge.DirChangesTest; | |||
import org.aspectj.testing.harness.bridge.ParseTestCase; | |||
import org.aspectj.testing.taskdefs.AjcTaskCompileCommandTest; | |||
import org.aspectj.testing.util.BridgeUtilTest; | |||
import org.aspectj.testing.util.FileUtilTest; | |||
import org.aspectj.testing.util.IteratorWrapperTest; | |||
import org.aspectj.testing.util.LangUtilTest; | |||
import org.aspectj.testing.util.MessageUtilTest; | |||
import org.aspectj.testing.util.StreamGrabberTest; | |||
import org.aspectj.testing.util.StructureModelUtilTest; | |||
import org.aspectj.testing.util.TestDiffsTest; | |||
import org.aspectj.testing.util.options.OptionsTest; | |||
import org.aspectj.testing.util.options.ValuesTest; | |||
import org.aspectj.testing.xml.AjcSpecXmlReaderTest; | |||
import org.aspectj.testing.xml.MessageListXmlReaderTest; | |||
import org.aspectj.testing.xml.XMLWriterTest; | |||
import junit.framework.Test; | |||
import junit.framework.TestCase; |
@@ -39,11 +39,11 @@ import org.aspectj.tools.ajc.AjcTestCase; | |||
import org.aspectj.tools.ajc.CompilationResult; | |||
import org.aspectj.util.FileUtil; | |||
import org.aspectj.weaver.AjAttribute; | |||
import org.aspectj.weaver.AjAttribute.WeaverState; | |||
import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; | |||
import org.aspectj.weaver.ResolvedMember; | |||
import org.aspectj.weaver.ResolvedType; | |||
import org.aspectj.weaver.WeaverStateInfo; | |||
import org.aspectj.weaver.AjAttribute.WeaverState; | |||
import org.aspectj.weaver.AjAttribute.WeaverVersionInfo; | |||
import org.aspectj.weaver.bcel.BcelConstantPoolReader; | |||
import junit.extensions.TestSetup; |
@@ -16,11 +16,11 @@ package org.aspectj.testing.harness.bridge; | |||
import java.io.PrintWriter; | |||
import java.util.List; | |||
import junit.framework.TestCase; | |||
import org.aspectj.testing.run.IRunIterator; | |||
import org.aspectj.testing.xml.XMLWriter; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -13,7 +13,7 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Comparator; |
@@ -13,21 +13,21 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.ListIterator; | |||
import junit.framework.Assert; | |||
import junit.framework.AssertionFailedError; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.ISourceLocation; | |||
import org.aspectj.bridge.MessageUtil; | |||
import junit.framework.Assert; | |||
import junit.framework.AssertionFailedError; | |||
import junit.framework.TestCase; | |||
/** | |||
* Primarily used by others to test AjcTest | |||
*/ |
@@ -13,13 +13,19 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.io.*; | |||
import java.io.BufferedReader; | |||
import java.io.File; | |||
import java.util.*; | |||
import java.io.FileReader; | |||
import java.io.IOException; | |||
import java.io.Reader; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.HashMap; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.StringTokenizer; | |||
//import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.IMessageHandler; |
@@ -14,18 +14,40 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.io.*; | |||
import java.io.File; | |||
import java.io.FileFilter; | |||
import java.io.IOException; | |||
import java.io.PrintStream; | |||
import java.lang.reflect.Array; | |||
import java.util.*; | |||
import org.aspectj.bridge.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.Set; | |||
import java.util.TreeMap; | |||
import org.aspectj.bridge.ICommand; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.bridge.ReflectionFactory; | |||
import org.aspectj.testing.ajde.CompileCommand; | |||
import org.aspectj.testing.run.*; | |||
import org.aspectj.testing.run.IRunIterator; | |||
import org.aspectj.testing.run.IRunStatus; | |||
import org.aspectj.testing.run.WrappedRunIterator; | |||
import org.aspectj.testing.taskdefs.AjcTaskCompileCommand; | |||
import org.aspectj.testing.util.options.*; | |||
import org.aspectj.testing.util.options.Option.*; | |||
import org.aspectj.testing.xml.*; | |||
import org.aspectj.util.*; | |||
import org.aspectj.testing.util.options.Option; | |||
import org.aspectj.testing.util.options.Option.Family; | |||
import org.aspectj.testing.util.options.Option.InvalidInputException; | |||
import org.aspectj.testing.util.options.Options; | |||
import org.aspectj.testing.util.options.Values; | |||
import org.aspectj.testing.xml.SoftMessage; | |||
import org.aspectj.testing.xml.XMLWriter; | |||
import org.aspectj.util.FileUtil; | |||
import org.aspectj.util.LangUtil; | |||
/** | |||
* Run the compiler once. |
@@ -14,18 +14,20 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.util.*; | |||
import java.util.Arrays; | |||
import junit.framework.TestCase; | |||
import java.util.Iterator; | |||
import java.util.Set; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.testing.harness.bridge.CompilerRun.Spec.CRSOptions; | |||
import org.aspectj.testing.util.options.*; | |||
import org.aspectj.testing.util.options.Option; | |||
import org.aspectj.testing.util.options.OptionChecker; | |||
import org.aspectj.testing.util.options.Options; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -13,15 +13,21 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.io.File; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.testing.run.*; | |||
import org.aspectj.util.*; | |||
import org.aspectj.bridge.ICommand; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.testing.run.IRunIterator; | |||
import org.aspectj.testing.run.RunStatus; | |||
import org.aspectj.testing.run.Runner; | |||
import org.aspectj.util.FileUtil; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.TestCase; | |||
/** | |||
* Use a stub compiler/ICommand to verify command-line passed | |||
* to the compiler by the harness. |
@@ -18,9 +18,6 @@ import java.io.IOException; | |||
import java.io.PrintWriter; | |||
import java.io.StringWriter; | |||
import junit.framework.AssertionFailedError; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
@@ -28,6 +25,9 @@ import org.aspectj.testing.xml.MessageListXmlReader; | |||
import org.aspectj.testing.xml.XMLWriter; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.AssertionFailedError; | |||
import junit.framework.TestCase; | |||
/** | |||
* (broken) tests for unutilized feature to read in | |||
* expected directory changes as messages. |
@@ -21,11 +21,11 @@ import java.util.List; | |||
import org.aspectj.bridge.AbortException; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessage.Kind; | |||
import org.aspectj.bridge.ISourceLocation; | |||
import org.aspectj.bridge.Message; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.bridge.SourceLocation; | |||
import org.aspectj.bridge.IMessage.Kind; | |||
import org.aspectj.testing.util.BridgeUtil; | |||
import org.aspectj.testing.util.ObjectChecker; | |||
import org.aspectj.testing.util.SFileReader; |
@@ -20,7 +20,6 @@ import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.List; | |||
import org.aspectj.bridge.AbortException; | |||
import org.aspectj.bridge.ICommand; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.testing.ajde.CompileCommand; | |||
@@ -29,8 +28,6 @@ import org.aspectj.testing.run.IRunStatus; | |||
import org.aspectj.testing.run.WrappedRunIterator; | |||
import org.aspectj.testing.util.StructureModelUtil; | |||
import org.aspectj.testing.util.StructureModelUtil.ModelIncorrectException; | |||
import org.aspectj.testing.xml.AjcSpecXmlReader; | |||
import org.aspectj.testing.xml.IXmlWritable; | |||
import org.aspectj.testing.xml.SoftMessage; | |||
import org.aspectj.testing.xml.XMLWriter; | |||
import org.aspectj.util.FileUtil; |
@@ -12,6 +12,18 @@ | |||
package org.aspectj.testing.harness.bridge; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
import java.io.FileDescriptor; | |||
import java.io.PrintStream; | |||
import java.lang.reflect.InvocationTargetException; | |||
import java.lang.reflect.Method; | |||
import java.net.InetAddress; | |||
import java.net.URL; | |||
import java.security.Permission; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import org.aspectj.bridge.AbortException; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
@@ -27,12 +39,6 @@ import org.aspectj.util.FileUtil; | |||
import org.aspectj.util.LangUtil; | |||
import org.aspectj.weaver.loadtime.WeavingURLClassLoader; | |||
import java.io.*; | |||
import java.lang.reflect.*; | |||
import java.net.*; | |||
import java.security.Permission; | |||
import java.util.*; | |||
/** | |||
* Run a class in this VM using reflection. | |||
* Forked mode supported, but through system properties: |
@@ -22,8 +22,6 @@ import javax.xml.parsers.DocumentBuilder; | |||
import javax.xml.parsers.DocumentBuilderFactory; | |||
import javax.xml.parsers.ParserConfigurationException; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.ISourceLocation; | |||
@@ -40,6 +38,8 @@ import org.w3c.dom.Node; | |||
import org.w3c.dom.NodeList; | |||
import org.xml.sax.SAXException; | |||
import junit.framework.TestCase; | |||
public class ParseTestCase extends TestCase { | |||
public ParseTestCase(String name) { |
@@ -13,17 +13,23 @@ | |||
package org.aspectj.testing.taskdefs; | |||
//import java.awt.Frame; | |||
import java.io.*; | |||
import java.io.File; | |||
import java.io.IOException; | |||
//import java.lang.reflect.*; | |||
import java.util.*; | |||
//import java.util.List; | |||
import java.util.ArrayList; | |||
import org.apache.tools.ant.*; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.Project; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.ICommand; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.tools.ant.taskdefs.AjcTask; | |||
import org.aspectj.util.*; | |||
import org.aspectj.util.FileUtil; | |||
import org.aspectj.util.LangUtil; | |||
/** | |||
* Drive tests using the Ant taskdef. |
@@ -14,12 +14,12 @@ package org.aspectj.testing.taskdefs; | |||
import java.io.File; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.testing.harness.bridge.Globals; | |||
import org.aspectj.util.*; | |||
import org.aspectj.util.FileUtil; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.TestCase; |
@@ -13,14 +13,14 @@ | |||
package org.aspectj.testing.util; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.testing.run.IRun; | |||
import org.aspectj.testing.run.IRunStatus; | |||
import org.aspectj.testing.run.RunStatus; | |||
import org.aspectj.testing.run.Runner; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -14,12 +14,13 @@ | |||
package org.aspectj.testing.util; | |||
import java.io.File; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Comparator; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.ListIterator; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; |
@@ -12,16 +12,30 @@ | |||
package org.aspectj.testing.util; | |||
import java.io.*; | |||
import java.net.*; | |||
import java.util.*; | |||
import java.io.FileNotFoundException; | |||
import java.io.FileOutputStream; | |||
import java.io.IOException; | |||
import java.io.InputStream; | |||
import java.io.InputStreamReader; | |||
import java.io.OutputStream; | |||
import java.io.PrintStream; | |||
import java.net.MalformedURLException; | |||
import java.net.URL; | |||
import java.net.URLConnection; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import javax.swing.text.MutableAttributeSet; | |||
import javax.swing.text.html.*; | |||
import javax.swing.text.html.HTML; | |||
import javax.swing.text.html.HTML.Tag; | |||
import javax.swing.text.html.HTMLEditorKit; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.util.LangUtil; | |||
//import org.aspectj.util.FileUtil; | |||
@@ -22,8 +22,6 @@ import java.util.Arrays; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import junit.framework.TestCase; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.ISourceLocation; | |||
import org.aspectj.bridge.Message; | |||
@@ -31,6 +29,8 @@ import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.bridge.SourceLocation; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -16,12 +16,12 @@ package org.aspectj.testing.util; | |||
import java.io.File; | |||
import java.util.List; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.ajde.core.AjdeCoreTestCase; | |||
import org.aspectj.ajde.core.TestCompilerConfiguration; | |||
import org.aspectj.asm.IProgramElement; | |||
import junit.framework.TestSuite; | |||
/** | |||
* @author Mik Kersten | |||
*/ |
@@ -20,10 +20,10 @@ import java.io.PrintWriter; | |||
import java.util.ArrayList; | |||
import java.util.ListIterator; | |||
import junit.framework.TestCase; | |||
import org.aspectj.util.FileUtil; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -14,7 +14,10 @@ | |||
package org.aspectj.testing.util; | |||
import java.io.*; | |||
import java.io.File; | |||
import java.io.FileReader; | |||
import java.io.IOException; | |||
import java.io.LineNumberReader; | |||
import java.util.ArrayList; | |||
/** |
@@ -12,7 +12,14 @@ | |||
package org.aspectj.testing.util.options; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.Map; | |||
import java.util.StringTokenizer; | |||
import java.util.TreeMap; | |||
import org.aspectj.util.LangUtil; | |||
@@ -14,10 +14,10 @@ package org.aspectj.testing.util.options; | |||
import java.util.Arrays; | |||
import junit.framework.Assert; | |||
import org.aspectj.testing.util.LangUtil; | |||
import junit.framework.Assert; | |||
/** | |||
* Drivers to test a given set of Options. | |||
* They now throw AssertionFailedError on failure, |
@@ -12,7 +12,8 @@ | |||
package org.aspectj.testing.util.options; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Iterator; | |||
import org.aspectj.util.LangUtil; | |||
@@ -12,10 +12,11 @@ | |||
package org.aspectj.testing.util.options; | |||
import junit.framework.*; | |||
import org.aspectj.testing.util.options.Option.InvalidInputException; | |||
import junit.framework.Assert; | |||
import junit.framework.TestCase; | |||
/** | |||
*/ | |||
public class OptionsTest extends TestCase { |
@@ -12,7 +12,12 @@ | |||
package org.aspectj.testing.util.options; | |||
import java.util.*; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.Map; | |||
import java.util.TreeMap; | |||
import org.aspectj.testing.util.options.Option.Value; | |||
import org.aspectj.util.LangUtil; |
@@ -15,8 +15,13 @@ | |||
package org.aspectj.testing.xml; | |||
import java.io.*; | |||
//import java.util.Vector; | |||
import java.io.File; | |||
import java.io.FileInputStream; | |||
import java.io.FileOutputStream; | |||
import java.io.FileWriter; | |||
import java.io.IOException; | |||
import java.io.PrintWriter; | |||
import org.apache.commons.digester.Digester; | |||
import org.aspectj.bridge.AbortException; | |||
@@ -24,10 +29,17 @@ import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.ISourceLocation; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.bridge.SourceLocation; | |||
import org.aspectj.testing.harness.bridge.*; | |||
import org.aspectj.testing.harness.bridge.AjcTest; | |||
import org.aspectj.testing.harness.bridge.CompilerRun; | |||
import org.aspectj.testing.harness.bridge.DirChanges; | |||
import org.aspectj.testing.harness.bridge.IncCompilerRun; | |||
import org.aspectj.testing.harness.bridge.JavaRun; | |||
import org.aspectj.testing.harness.bridge.Sandbox; | |||
import org.aspectj.testing.harness.bridge.Validator; | |||
import org.aspectj.testing.util.RunUtils; | |||
import org.aspectj.util.LangUtil; | |||
import org.xml.sax.*; | |||
import org.xml.sax.EntityResolver; | |||
import org.xml.sax.InputSource; | |||
import org.xml.sax.SAXException; | |||
/** |
@@ -22,14 +22,14 @@ import java.io.IOException; | |||
import java.util.ArrayList; | |||
import java.util.Iterator; | |||
//import junit.framework.*; | |||
import junit.framework.TestCase; | |||
import org.aspectj.testing.harness.bridge.AjcSpecTest; | |||
import org.aspectj.testing.harness.bridge.AjcTest; | |||
import org.aspectj.testing.harness.bridge.FlatSuiteReader; | |||
import org.aspectj.util.LangUtil; | |||
//import junit.framework.*; | |||
import junit.framework.TestCase; | |||
/** | |||
* | |||
*/ |
@@ -13,13 +13,13 @@ | |||
package org.aspectj.testing.xml; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.util.LangUtil; | |||
import java.io.File; | |||
import java.util.ArrayList; | |||
import java.util.Iterator; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.TestCase; | |||
/** |
@@ -19,8 +19,8 @@ import java.util.ArrayList; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import org.aspectj.bridge.*; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.ISourceLocation; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.bridge.SourceLocation; |
@@ -9,9 +9,6 @@ | |||
* ******************************************************************/ | |||
package org.aspectj.systemtest; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc10x.Ajc10xTests; | |||
import org.aspectj.systemtest.ajc11.Ajc11Tests; | |||
import org.aspectj.systemtest.ajc120.Ajc120Tests; | |||
@@ -30,6 +27,9 @@ import org.aspectj.systemtest.serialVerUID.SUIDTests; | |||
import org.aspectj.systemtest.tracing.TracingTests; | |||
import org.aspectj.systemtest.xlint.XLintTests; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
/** | |||
* @author Andy Clement | |||
* @author Adrian Colyer |
@@ -3,9 +3,6 @@ | |||
*/ | |||
package org.aspectj.systemtest; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc150.AllTestsAspectJ150; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjAnnotationGenTests; | |||
import org.aspectj.systemtest.ajc151.AllTestsAspectJ151; | |||
@@ -20,6 +17,9 @@ import org.aspectj.systemtest.incremental.tools.MultiProjectIncrementalTests; | |||
import org.aspectj.systemtest.model.Model5Tests; | |||
import org.aspectj.systemtest.xlint.XLint5Tests; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
public class AllTests15 { | |||
public static Test suite() { |
@@ -3,9 +3,6 @@ | |||
*/ | |||
package org.aspectj.systemtest; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc160.AllTestsAspectJ160; | |||
import org.aspectj.systemtest.ajc161.AllTestsAspectJ161; | |||
import org.aspectj.systemtest.ajc1610.AllTestsAspectJ1610; | |||
@@ -20,6 +17,9 @@ import org.aspectj.systemtest.ajc167.AllTestsAspectJ167; | |||
import org.aspectj.systemtest.ajc169.AllTestsAspectJ169; | |||
import org.aspectj.systemtest.incremental.tools.AnnotationProcessingTests; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
public class AllTests16 { | |||
public static Test suite() { |
@@ -3,9 +3,6 @@ | |||
*/ | |||
package org.aspectj.systemtest; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc170.AllTestsAspectJ170; | |||
import org.aspectj.systemtest.ajc171.AllTestsAspectJ171; | |||
import org.aspectj.systemtest.ajc172.AllTestsAspectJ172; | |||
@@ -13,6 +10,9 @@ import org.aspectj.systemtest.ajc173.AllTestsAspectJ173; | |||
import org.aspectj.systemtest.ajc174.AllTestsAspectJ174; | |||
import org.aspectj.systemtest.ajc175.AllTestsAspectJ175; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
public class AllTests17 { | |||
public static Test suite() { |
@@ -4,17 +4,15 @@ | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* ******************************************************************/ | |||
package org.aspectj.systemtest.ajc10x; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class Ajc10xTests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -4,18 +4,16 @@ | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* ******************************************************************/ | |||
package org.aspectj.systemtest.ajc11; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.Test; | |||
public class Ajc11Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -4,15 +4,15 @@ | |||
* This program and the accompanying materials are made available | |||
* under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* ******************************************************************/ | |||
package org.aspectj.systemtest.ajc120; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Ajc120Tests extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -11,10 +11,10 @@ package org.aspectj.systemtest.ajc121; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Ajc121Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -1,5 +1,5 @@ | |||
/******************************************************************************* | |||
* Copyright (c) 2004 IBM | |||
* Copyright (c) 2004 IBM | |||
* All rights reserved. This program and the accompanying materials | |||
* are made available under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution, and is available at | |||
@@ -10,32 +10,30 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* <b>These tests check binary weaving of code compiled with the 1.5 compiler. If you need to rebuild | |||
* the class files then you will have to run tests/java5/bridgeMethods/build.xml.</b> | |||
* | |||
* <p>Bridge methods are generated when a type extends or implements a parameterized class or interface and | |||
* | |||
* <p>Bridge methods are generated when a type extends or implements a parameterized class or interface and | |||
* type erasure changes the signature of any inherited method. | |||
* | |||
* | |||
* <p>They impact AspectJ in two ways: | |||
* <ol> | |||
* <li>They exist as a method execution join point, and their 'body' exists as a set of new join points | |||
* (although their body is normally coded simply to delegate to the method they are bridging too). | |||
* <li> They create a potential call join point where a call can be made to the bridge method. | |||
* </ol> | |||
* | |||
* <p>The principal things we have to do are avoid weaving their body and ignore their existence | |||
* </ol> | |||
* | |||
* <p>The principal things we have to do are avoid weaving their body and ignore their existence | |||
* as a method execution join point. Their existence as a potential target for a call join point are | |||
* more complicated. Although they exist in the code, a 1.5 compiler will prevent a call to them with | |||
* an error like this: | |||
* | |||
* | |||
* M.java:3: compareTo(Number) in Number cannot be applied to (java.lang.String) | |||
* new Number(5).compareTo("abc"); | |||
* | |||
@@ -43,7 +41,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase; | |||
* and it will let them through. | |||
*/ | |||
public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { | |||
return XMLBasedAjcTestCase.loadSuite(AccBridgeMethods.class); | |||
} | |||
@@ -52,7 +50,7 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
return getClassResource("ajc150.xml"); | |||
} | |||
/** | |||
* AspectX attempts to weave call and execution of the method for which a 'bridge method' is also created. | |||
* If the test works then only two weaving messages come out. If it fails then usually 4 messages come out | |||
@@ -62,6 +60,6 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public void test001_bridgeMethodIgnored() { | |||
runTest("Ignore bridge methods"); | |||
} | |||
} |
@@ -1,5 +1,5 @@ | |||
/******************************************************************************* | |||
* Copyright (c) 2004 IBM | |||
* Copyright (c) 2004 IBM | |||
* All rights reserved. This program and the accompanying materials | |||
* are made available under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution, and is available at | |||
@@ -11,12 +11,9 @@ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.io.PrintWriter; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.apache.bcel.classfile.Signature; | |||
@@ -24,6 +21,8 @@ import org.aspectj.asm.AsmManager; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.util.LangUtil; | |||
import junit.framework.Test; | |||
public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { | |||
@@ -845,7 +844,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
if (LangUtil.is17VMOrGreater()) { | |||
runTest("java 5 pointcuts and declares at pre-java 5 compliance levels - 1.7"); | |||
} else { | |||
runTest("java 5 pointcuts and declares at pre-java 5 compliance levels"); | |||
runTest("java 5 pointcuts and declares at pre-java 5 compliance levels"); | |||
} | |||
} | |||
@@ -10,15 +10,15 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjMisuseTests; | |||
import org.aspectj.systemtest.ajc150.ataspectj.AtAjSyntaxTests; | |||
import org.aspectj.systemtest.ajc150.ltw.LTWServerTests; | |||
import org.aspectj.systemtest.ajc150.ltw.LTWTests; | |||
import junit.framework.Test; | |||
import junit.framework.TestSuite; | |||
/** | |||
* This pulls together tests we have written for AspectJ 1.5.0 that don't need Java 1.5 to run | |||
*/ |
@@ -1,5 +1,5 @@ | |||
/******************************************************************************* | |||
* Copyright (c) 2004 IBM | |||
* Copyright (c) 2004 IBM | |||
* All rights reserved. This program and the accompanying materials | |||
* are made available under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution, and is available at | |||
@@ -10,11 +10,8 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IHierarchy; | |||
import org.aspectj.asm.IProgramElement; | |||
@@ -22,6 +19,8 @@ import org.aspectj.asm.IRelationship; | |||
import org.aspectj.asm.internal.Relationship; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class AnnotationBinding extends XMLBasedAjcTestCase { | |||
public static Test suite() { | |||
@@ -326,7 +325,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase { | |||
Relationship rel = (Relationship) l.get(0); | |||
assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1); | |||
String tgt = (String) rel.getTargets().get(0); | |||
String tgt = rel.getTargets().get(0); | |||
int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt); | |||
assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10); | |||
} | |||
@@ -356,7 +355,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase { | |||
Relationship rel = (Relationship) l.get(0); | |||
assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1); | |||
String tgt = (String) rel.getTargets().get(0); | |||
String tgt = rel.getTargets().get(0); | |||
int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt); | |||
assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10); | |||
@@ -388,7 +387,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase { | |||
Relationship rel = (Relationship) l.get(0); | |||
assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1); | |||
String tgt = (String) rel.getTargets().get(0); | |||
String tgt = rel.getTargets().get(0); | |||
int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt); | |||
assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10); | |||
@@ -10,13 +10,12 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
/** | |||
* Tests the use of Annotations in pointcuts |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Tests for @this, @target, @args | |||
*/ |
@@ -10,14 +10,12 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Annotations extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Annotations, the rules/tests: |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
This test must be run under a Java5 VM - so it is *not* currently | |||
in the test suite !!! |
@@ -1,21 +1,19 @@ | |||
/******************************************************************************* | |||
* Copyright (c) 2004 IBM Corporation and others. | |||
* All rights reserved. This program and the accompanying materials | |||
* All rights reserved. This program and the accompanying materials | |||
* are made available under the terms of the Eclipse Public License v1.0 | |||
* which accompanies this distribution, and is available at | |||
* http://www.eclipse.org/legal/epl-v10.html | |||
* | |||
* | |||
* Contributors: | |||
* Andy Clement - initial implementation | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/* | |||
class Car {} | |||
@@ -67,7 +65,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
} | |||
private boolean verbose = false; | |||
/** | |||
* call(* getCar()) should match both | |||
*/ | |||
@@ -75,10 +73,10 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
runTest("covariance 1"); | |||
} | |||
/** | |||
* call(* Super.getCar()) should match both | |||
* | |||
* | |||
* This test required a change to the compiler. When we are looking at signatures and comparing them we walk up | |||
* the hierarchy looking for supertypes that declare the same method. The problem is that in the comparison for | |||
* whether to methods are compatible we were including the return type - this meant 'Car getCar()' on Super was | |||
@@ -88,7 +86,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
* '()LFastCar;' (which includes the return type). If the full signature comparison fails then it looks at the | |||
* parameter signature - I did it that way to try and preserve some performance. I haven't changed the | |||
* definition of 'signature' for a member as trimming the return type off it seems rather serious ! | |||
* | |||
* | |||
* What might break: | |||
* - 'matches' can now return true for things that have different return types - I guess whether this is a problem | |||
* depends on what the caller of matches is expecting, their code will have been written before covariance was | |||
@@ -97,23 +95,23 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
public void testCOV002() { | |||
runTest("covariance 2"); | |||
} | |||
/** | |||
* call(Car getCar()) should match both | |||
* | |||
* | |||
* Had to implement proper covariance support here... | |||
*/ | |||
public void testCOV003() { | |||
runTest("covariance 3"); | |||
} | |||
/** | |||
* *** Different base program, where Sub does not extend Super. | |||
* call(Car Super.getCar()) should only match first call to getCar() | |||
*/ | |||
public void testCOV004() { | |||
runTest("covariance 4"); | |||
} | |||
} | |||
/** | |||
* *** Original base program | |||
@@ -121,21 +119,21 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
*/ | |||
public void testCOV005() { | |||
runTest("covariance 5"); | |||
} | |||
} | |||
/** | |||
* call(Car Sub.getCar()) should not match anything | |||
*/ | |||
public void testCOV006() { | |||
runTest("covariance 6"); | |||
} | |||
} | |||
/** | |||
* call(Car+ Sub.getCar()) should match 2nd call with xlint for the 1st call | |||
*/ | |||
public void testCOV007() { | |||
runTest("covariance 7"); | |||
} | |||
} | |||
/** | |||
* *** aspect now contains two pointcuts and two pieces of advice | |||
@@ -144,21 +142,21 @@ public class CovarianceTests extends XMLBasedAjcTestCase { | |||
*/ | |||
public void testCOV008() { | |||
runTest("covariance 8"); | |||
} | |||
} | |||
/** | |||
* call(FastCar Super.getCar()) matches nothing | |||
*/ | |||
public void testCOV009() { | |||
runTest("covariance 9"); | |||
} | |||
} | |||
/** | |||
* call(Car+ getCar()) matches both | |||
*/ | |||
public void testCOV010() { | |||
runTest("covariance 10"); | |||
} | |||
} | |||
public void testAJDKExamples() { | |||
runTest("ajdk: covariance"); |
@@ -10,17 +10,16 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IHierarchy; | |||
import org.aspectj.asm.IProgramElement; | |||
import org.aspectj.asm.IRelationship; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class DeclareAnnotationTests extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Enums, the rules/tests: |
@@ -5,8 +5,6 @@ import java.util.Hashtable; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.Attribute; | |||
import org.aspectj.apache.bcel.classfile.Field; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
@@ -27,6 +25,8 @@ import org.aspectj.weaver.World; | |||
import org.aspectj.weaver.bcel.BcelTypeMunger; | |||
import org.aspectj.weaver.bcel.BcelWorld; | |||
import junit.framework.Test; | |||
public class GenericITDsDesign extends XMLBasedAjcTestCase { | |||
private World recentWorld; |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class HasMember extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Checks if we are obeying migration rules. |
@@ -12,11 +12,11 @@ package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.tools.ajc.CompilationResult; | |||
import junit.framework.Test; | |||
public class PerTypeWithinTests extends XMLBasedAjcTestCase { |
@@ -1,11 +1,9 @@ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Checking that runtime visible annotations are visible at runtime (they get into the class file) | |||
*/ |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class StaticImports extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class SuppressedWarnings extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Varargs, the rules/tests: |
@@ -12,10 +12,10 @@ package org.aspectj.systemtest.ajc150.ataspectj; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
/** | |||
* A suite for @AspectJ aspects located in java5/ataspectj | |||
* |
@@ -14,11 +14,11 @@ package org.aspectj.systemtest.ajc150.ataspectj; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.util.FileUtil; | |||
import junit.framework.Test; | |||
/** | |||
* @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> | |||
*/ |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150.ataspectj; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a> | |||
*/ |
@@ -11,12 +11,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc150.ataspectj; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* A suite for @AspectJ aspects located in java5/ataspectj | |||
* |
@@ -1,6 +1,5 @@ | |||
package org.aspectj.systemtest.ajc150.ataspectj.coverage; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; |
@@ -1,11 +1,9 @@ | |||
package org.aspectj.systemtest.ajc150.ltw; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class LTWServerTests extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -15,11 +15,11 @@ import java.io.File; | |||
import java.util.Enumeration; | |||
import java.util.Properties; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.weaver.tools.WeavingAdaptor; | |||
import junit.framework.Test; | |||
public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,7 +10,6 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc151; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import org.aspectj.asm.AsmManager; |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc151; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* This testcode shows what is possible with code style and the current limitations | |||
* of @AJ style. Each program is written in both styles and those variations |
@@ -10,7 +10,6 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc151; | |||
import java.io.File; | |||
import java.util.List; | |||
import org.aspectj.asm.AsmManager; |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc151; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class SerialVersionUIDTests extends XMLBasedAjcTestCase { | |||
@@ -10,18 +10,17 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc152; | |||
import java.io.File; | |||
import java.net.URL; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IHierarchy; | |||
import org.aspectj.asm.IProgramElement; | |||
import org.aspectj.asm.internal.CharOperation; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
// public void testCovarianceAndDecp_pr128443_1() { runTest("covariance and decp - 1"); } |
@@ -10,13 +10,12 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc152; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
/** | |||
* Work items, phase #1: lock()/unlock() x expose new joinpoints x parse new pcds x fix tjp string x preventing double unlock() | |||
* messages/markers in structure model x error messages appropriate for attempting to use around advice on synchronization join |
@@ -21,8 +21,6 @@ import java.util.ArrayList; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
@@ -36,6 +34,8 @@ import org.aspectj.weaver.bcel.BcelWorld; | |||
import org.aspectj.weaver.bcel.LazyClassGen; | |||
import org.aspectj.weaver.bcel.LazyMethodGen; | |||
import junit.framework.Test; | |||
/** | |||
* Method transformation, example: | |||
* |
@@ -10,17 +10,16 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc153; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IHierarchy; | |||
import org.aspectj.asm.IProgramElement; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import org.aspectj.weaver.bcel.Utility; | |||
import junit.framework.Test; | |||
public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public void testFormalCommentsAreSetForConstructorIPEs_pr164340() { |
@@ -10,19 +10,18 @@ | |||
*******************************************************************/ | |||
package org.aspectj.systemtest.ajc153; | |||
import java.io.File; | |||
import java.io.IOException; | |||
import java.net.URL; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IHierarchy; | |||
import org.aspectj.asm.IProgramElement; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class JDTLikeHandleProviderTests extends XMLBasedAjcTestCase { | |||
// IElementHandleProvider handleProvider; |
@@ -1,12 +1,11 @@ | |||
package org.aspectj.systemtest.ajc153; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class LTWServer153Tests extends XMLBasedAjcTestCase { | |||
public static Test suite() { |
@@ -10,15 +10,14 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc153; | |||
import java.io.File; | |||
import java.net.URL; | |||
import junit.framework.Test; | |||
//import org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter; | |||
import org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
/** | |||
* testplan: (x = complete) | |||
* |
@@ -10,11 +10,8 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc154; | |||
import java.io.File; | |||
import java.lang.reflect.Field; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.ConstantPool; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.LineNumber; | |||
@@ -27,6 +24,8 @@ import org.aspectj.weaver.tools.FuzzyBoolean; | |||
import org.aspectj.weaver.tools.MatchingContext; | |||
import org.aspectj.weaver.tools.PointcutDesignatorHandler; | |||
import junit.framework.Test; | |||
/** | |||
* These are tests for AspectJ1.5.4 | |||
*/ |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc160; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* These are tests for AspectJ1.6.0 | |||
*/ |
@@ -12,12 +12,10 @@ | |||
package org.aspectj.systemtest.ajc160; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Parameter value matching | |||
* |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc160; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
// Supporting -Xset:weaveJavaPackages=true and -Xset:weaveJavaxPackages=true |
@@ -12,12 +12,10 @@ | |||
package org.aspectj.systemtest.ajc160; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Parameter annotation matching | |||
* |
@@ -10,16 +10,15 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc161; | |||
import java.io.File; | |||
import java.util.Iterator; | |||
import java.util.Set; | |||
import junit.framework.Test; | |||
import org.aspectj.asm.AsmManager; | |||
import org.aspectj.asm.IRelationshipMap; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
// AspectJ1.6.1 |
@@ -11,12 +11,10 @@ | |||
* ******************************************************************/ | |||
package org.aspectj.systemtest.ajc161; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
/** | |||
* Optimising Annotation Field Binding - better code gen for the cases where the user just wants a field from the | |||
* annotation on a method but not the whole annotation. |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc1610; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
@@ -10,14 +10,12 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc1610; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public void testMakeSJPOptimizationLDCNo() { |
@@ -10,8 +10,6 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc1611; | |||
import java.io.File; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.systemtest.ajc150.GenericsTests; |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc1611; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public void testAddingRemoving() { |
@@ -10,15 +10,13 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc1612; | |||
import java.io.File; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.Method; | |||
import org.aspectj.asm.internal.ProgramElement; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
/** | |||
* @author Andy Clement | |||
*/ |
@@ -10,12 +10,10 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc162; | |||
import java.io.File; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
// AspectJ1.6.2 |
@@ -10,11 +10,8 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc163; | |||
import java.io.File; | |||
import java.util.List; | |||
import junit.framework.Test; | |||
import org.aspectj.apache.bcel.classfile.JavaClass; | |||
import org.aspectj.apache.bcel.classfile.LocalVariable; | |||
import org.aspectj.apache.bcel.classfile.LocalVariableTable; | |||
@@ -25,6 +22,8 @@ import org.aspectj.asm.IProgramElement; | |||
import org.aspectj.testing.Utils; | |||
import org.aspectj.testing.XMLBasedAjcTestCase; | |||
import junit.framework.Test; | |||
public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase { | |||
public void testGenericMethodBridging_pr251326() { | |||
runTest("itd anonymous inner class in wrong package"); |
@@ -10,7 +10,6 @@ | |||
*******************************************************************************/ | |||
package org.aspectj.systemtest.ajc164; | |||
import java.io.File; | |||
import java.io.PrintWriter; | |||
import java.util.Iterator; | |||
import java.util.List; |