diff options
155 files changed, 507 insertions, 563 deletions
diff --git a/build/src/main/java/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java index 9e7518038..6ecebae63 100644 --- a/build/src/main/java/$installer$/org/aspectj/Main.java +++ b/build/src/main/java/$installer$/org/aspectj/Main.java @@ -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(); diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Module.java b/build/src/main/java/org/aspectj/internal/tools/build/Module.java index cbbbc308b..58789424f 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/Module.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/Module.java @@ -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; } diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Result.java b/build/src/main/java/org/aspectj/internal/tools/build/Result.java index e12ba4e29..b17ac656e 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/Result.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/Result.java @@ -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() { diff --git a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java index bb1ed8555..4e9f59011 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java @@ -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) { diff --git a/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java index 8fb274176..0dcc23dfd 100644 --- a/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java +++ b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java index 0fbbd125e..59974f1b1 100644 --- a/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java @@ -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/> diff --git a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java index 81ff4e1b4..327be6bd4 100644 --- a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java +++ b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java index 94d31833a..f8d12e80e 100644 --- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java index 1f6ab38ab..3ed472c5e 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java index f4a88c3b2..b2060480c 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java index 0c469ec3a..36ade5f2a 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java @@ -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 */ diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java index bdebae02c..629b0a0a3 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java index 8d6c587fe..c5d4b0b60 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java @@ -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. diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java index 83e14cf10..1a8873072 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java index ddfaee1f4..c5f68d03a 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java @@ -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. diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java index 3ee0fd041..dc3ccec07 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java @@ -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. diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java index 8d75d5620..b3249feeb 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java index 7c7f2c54e..ac707a183 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java index aade35f48..c7e282040 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java @@ -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: diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java index cfbc6b0e1..c891f134c 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java @@ -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) { diff --git a/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java index 1f5325e82..09798850c 100644 --- a/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java +++ b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java @@ -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. diff --git a/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java index 253184c8d..869cb3c4c 100644 --- a/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java +++ b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java index a0299889b..83a8b96a3 100644 --- a/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/util/Diffs.java b/testing/src/test/java/org/aspectj/testing/util/Diffs.java index eb09f9700..dd54fa4da 100644 --- a/testing/src/test/java/org/aspectj/testing/util/Diffs.java +++ b/testing/src/test/java/org/aspectj/testing/util/Diffs.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java index 0e81b24d3..3317f7746 100644 --- a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java +++ b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java index 51ec73efd..571633a0c 100644 --- a/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java index 366727b80..11b9ea2b4 100644 --- a/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java @@ -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 */ diff --git a/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java b/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java index af13aed03..17fa8234d 100644 --- a/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java index ebb6c9d98..f077eba52 100644 --- a/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java +++ b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java @@ -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; /** diff --git a/testing/src/test/java/org/aspectj/testing/util/options/Option.java b/testing/src/test/java/org/aspectj/testing/util/options/Option.java index e845a89bf..f8ea3d9c4 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/Option.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/Option.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java index a8b3b2c5a..87748f0b1 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java @@ -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, diff --git a/testing/src/test/java/org/aspectj/testing/util/options/Options.java b/testing/src/test/java/org/aspectj/testing/util/options/Options.java index 04a968d88..f3e52767f 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/Options.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/Options.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java index 4d8efdf2e..bd7d98613 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java @@ -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 { diff --git a/testing/src/test/java/org/aspectj/testing/util/options/Values.java b/testing/src/test/java/org/aspectj/testing/util/options/Values.java index 574969080..d21f03165 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/Values.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/Values.java @@ -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; diff --git a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java index 370a9ac91..62e3fd186 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java +++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java @@ -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; /** diff --git a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java index 81842dc30..397e8ccfa 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java +++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java @@ -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; + /** * */ diff --git a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java index aa393f5de..6d0eeffff 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java +++ b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java @@ -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; /** diff --git a/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java index f59bf397e..9a39d0cc8 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java +++ b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java @@ -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; diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests.java b/tests/src/test/java/org/aspectj/systemtest/AllTests.java index 2ce16495f..206738dd4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests15.java b/tests/src/test/java/org/aspectj/systemtest/AllTests15.java index 8b19ef23b..af06fd729 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests15.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests15.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests16.java b/tests/src/test/java/org/aspectj/systemtest/AllTests16.java index f1f7b4a14..d4106ea53 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests16.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests16.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests17.java b/tests/src/test/java/org/aspectj/systemtest/AllTests17.java index 9feebfb1e..cc1e480ef 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests17.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests17.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java index 1ee946099..8b4cee73e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java index 6b1013780..b7fa755db 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java index 8b11ccfba..d4d445a68 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java index 1301ed779..000a72010 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java index aa77443a1..a1e7fc648 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java @@ -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"); } - - + + }
\ No newline at end of file diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java index 3fc84da3b..cde62fe51 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java @@ -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"); } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java index 1d750bb94..47aeae0e8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java @@ -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 */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java index a8a578d38..6c4f21bd5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java @@ -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); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java index 00eea99db..d21c76c52 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java index d045bb4c9..9358d9c81 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java @@ -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 */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java index fb7a30071..0c44996cb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java index 5961f64fa..55f5c9a52 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java @@ -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: diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java index e03f507d8..3ea9afb17 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java @@ -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 !!! diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java index 9231b0130..f5d18e351 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java @@ -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"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java index cc6d446ea..6de83353a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java index f866bfc75..0e88d7b3f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java @@ -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: diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java index a0c213462..d6e4b7112 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java @@ -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; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java index fe1f5649f..9a96d31c6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java index ed3428c45..16ba5f286 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java @@ -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. diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java index eeef4a4a9..ddd8966a6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java @@ -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 { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java index 93cfb03ce..44ca53004 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java @@ -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) */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java index f6002bde7..5b970575d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java index 490915b48..733c946dd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java index 726688b87..c50c6aa15 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java @@ -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: diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java index 371823063..796057fa5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java @@ -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 * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java index 808d14f37..16f7321a9 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java @@ -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> */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java index b1b131859..e922075ae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java @@ -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> */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java index e69219cc4..e556be462 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java @@ -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 * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java index 6f3e032e3..ca8dbbb53 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java @@ -1,6 +1,5 @@ package org.aspectj.systemtest.ajc150.ataspectj.coverage; -import java.io.File; import java.net.URL; import junit.framework.Test; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java index 0f7034ceb..9164c7225 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java index c2b75515f..5d469fbd3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java index 0c5bc2c80..5fba25cae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc151; -import java.io.File; import java.io.IOException; import org.aspectj.asm.AsmManager; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java index f7c4eabce..138ffb9f1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java index 05f8660fe..553ce8111 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc151; -import java.io.File; import java.util.List; import org.aspectj.asm.AsmManager; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java index 9fbbdc504..4558a4c39 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java @@ -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 { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java index 48bc274af..9ef043b8a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -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"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java index af4004498..bb6df5d4c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java index d599747c4..92d2addfd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java @@ -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: * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java index d021c0588..84faf9430 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java index 32c7d8072..2d398f86f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java @@ -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; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java index 7918205ae..939dfe92e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java index 2b3999346..3e384c1fc 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java @@ -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) * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java index c088adf51..6fde74765 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java @@ -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 */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java index 31d2ba8eb..133a11797 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java @@ -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 */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java index bcaed869b..bb5784edc 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java @@ -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 * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java index acdcf3cc6..fd7afb9f1 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java index c87697138..ca377f836 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java @@ -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 * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java index 14433e187..bcf640f3f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java index b75603b12..35f3d680e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java @@ -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. diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java index fc1e5f945..1970aa5c3 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java @@ -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 { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java index 580469e97..34b72996f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java index 8f44cfa59..acfcdab87 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java @@ -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; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java index def99671d..e0cfe6dad 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java @@ -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() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java index 1e358dfcc..9e857cb31 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java @@ -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 */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 2aca41178..4a6f019d6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -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 diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java index 2368c97ae..c0bd95645 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java @@ -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"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java index d65112024..f474af49c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java @@ -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; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java index 4505da240..6b366c15d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc164; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * <h4>Design and test coverage</h4><br> * In many ways the design is similar to DeclareParents now - so we have to plug in at the same points, but the code generation for diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java index 24332e998..80056f9ba 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc164; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * * @author Andy Clement diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java index 0f05155e5..6b8923e2a 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc165; -import java.io.File; import java.util.List; import org.aspectj.bridge.IMessage; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java index 37d6e09fe..ebf440b3e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc166; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testParentsLTW_286473_binary() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java index 20f34b8e3..3c8399e0c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc167; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // public void testGenericsItds_298665() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java index 2c944f645..7f02f0077 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc167; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * Tests for the new all singing all dancing intertype syntax. * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java index 9d8040944..09d4f2108 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc167; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * Testing whether AspectJ can overweave. Overweaving is where we attempt to weave something that has already been woven. The simple * rule followed is that aspects that applied to the type before are not applied this time around (if they are visible to the diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java index 3dd0046e5..1f9f18e2d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc169; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testMessyDecp_318241() { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java index 64bf7c822..a91b3a13e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java @@ -8,15 +8,14 @@ package org.aspectj.systemtest.ajc169; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.PrintWriter; -import junit.framework.Test; - import org.aspectj.asm.AsmManager; import org.aspectj.asm.IRelationshipMap; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * Tests exploring intertype declared inner types and the new intertype syntax. * diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java index 61e32b98f..cea518175 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java @@ -10,17 +10,16 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc169; -import java.io.File; import java.lang.reflect.Modifier; -import junit.framework.Test; - import org.aspectj.apache.bcel.classfile.Field; import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.apache.bcel.classfile.annotation.AnnotationGen; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * What would a completely transparent weave be? Is there a minimal subset that makes sense? What is the roadmap to get there? What * needs testing diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java index 94471ca5a..b28ddbafa 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java @@ -10,13 +10,12 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc170; -import java.io.File; import java.io.IOException; -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java index 3089fcaa7..53b9aed38 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc171; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java index 74f40c7bf..68ff45345 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc171; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java index 61b2e9985..deec8651b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java @@ -10,14 +10,12 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc172; -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; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java index c51ed28ba..98d16daae 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java @@ -10,15 +10,13 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc173; -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.apache.bcel.classfile.annotation.AnnotationGen; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java index 6063efc89..72d7dac08 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc174; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java index 2a44a0a6a..9ce61ddab 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc175; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java index f83f5efef..4ce10c9cd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc180; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java index b3a34c795..56955f358 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java @@ -10,13 +10,11 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc181; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java b/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java index a6c89f895..ea1c9a926 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java @@ -10,9 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc181; +import org.aspectj.systemtest.apt.AptTests; + import junit.framework.Test; import junit.framework.TestSuite; -import org.aspectj.systemtest.apt.AptTests; public class AllTestsAspectJ181 { diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java index b8ceb9836..89f0e0146 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc1810; -import java.io.File; - import org.aspectj.apache.bcel.Constants; import org.aspectj.apache.bcel.classfile.Attribute; import org.aspectj.apache.bcel.classfile.JavaClass; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java index 07096cfc0..eaa86ad79 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc1811; -import java.io.File; - import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.weaver.ResolvedMember; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java index dadd926a0..210d6ee37 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java @@ -10,15 +10,13 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc182; -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.apache.bcel.classfile.annotation.RuntimeInvisTypeAnnos; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java index d0822e40b..e9a168d20 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc183; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java index 86cda03b3..708238746 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc184; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java index 64b004222..6d57f64f6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc185; -import java.io.File; - import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java index 31627ebaa..379c54333 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java @@ -10,13 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc186; -import java.io.File; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.weaver.tools.ContextBasedMatcher; import org.aspectj.weaver.tools.DefaultMatchingContext; @@ -26,6 +23,8 @@ import org.aspectj.weaver.tools.PointcutDesignatorHandler; import org.aspectj.weaver.tools.PointcutExpression; import org.aspectj.weaver.tools.PointcutParser; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java index e2d2f1b63..5c87bd187 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc187; -import java.io.File; - import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java index f53d4241d..40f4cd4d6 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc188; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java index 7aace8d1e..267f3fdad 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java @@ -10,13 +10,11 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc189; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + /** * @author Andy Clement */ diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java index cd7ff2f79..971e53435 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java @@ -7,12 +7,12 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc190; -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; + /** * A copy of the 1.5.0 Annotations test but with compliance set to 1.9 * The testdata is referenced in the 150 test folder but the XML file indicates compliance of 1.9. diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java index 0506f90a1..7167249fd 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java @@ -7,7 +7,6 @@ *******************************************************************************/ package org.aspectj.systemtest.ajc192; -import org.aspectj.apache.bcel.classfile.JavaClass; import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.testing.XMLBasedAjcTestCaseForJava11OrLater; diff --git a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java index af9d8af9c..3b6430c38 100644 --- a/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.aspectj.systemtest.apt; -import java.io.File; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.util.LangUtil; diff --git a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java index 4b5a4d449..ac8af3a86 100644 --- a/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.aspectpath; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class AspectPathTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java index 76c4e164a..ffccd307c 100644 --- a/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.base; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class BaseTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java index 7af3476ee..7ef4c838f 100644 --- a/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.bringup; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - /** * These are tests that will run on Java 1.4 and use the old harness format for test specification. */ diff --git a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java index a187c9619..d33ef643d 100644 --- a/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.design; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class DesignTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java index 55e624d09..fc1fa68d8 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java @@ -12,12 +12,12 @@ package org.aspectj.systemtest.incremental; import java.io.File; import java.util.List; -import junit.framework.Test; - import org.aspectj.ajdt.internal.core.builder.AbstractStateListener; import org.aspectj.ajdt.internal.core.builder.AjState; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java index 68d9d6d3a..521248ddb 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java @@ -9,14 +9,12 @@ * ******************************************************************/ package org.aspectj.systemtest.incremental.model; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.asm.AsmManager; import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.testing.util.StructureModelUtil; +import junit.framework.Test; + public class IncrementalModelTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java index 1a2d53c02..0fe276f46 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.TestCase; - import org.aspectj.ajde.core.AjCompiler; import org.aspectj.ajde.core.IBuildMessageHandler; import org.aspectj.ajde.core.ICompilerConfiguration; @@ -32,7 +30,8 @@ import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager; import org.aspectj.asm.AsmManager; import org.aspectj.bridge.IMessage; import org.aspectj.testing.util.TestUtil; -import org.aspectj.tools.ajc.Ajc; + +import junit.framework.TestCase; /** * This class uses Ajde in the same way that an IDE (e.g. AJDT) does. diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java index 3b243d5b8..78caba4ea 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java @@ -12,7 +12,6 @@ package org.aspectj.systemtest.incremental.tools; import java.util.Collection; import java.util.Hashtable; -import java.util.Iterator; import java.util.Map; import org.aspectj.ajde.core.AjCompiler; diff --git a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java index 895438dfd..f858b118b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.inpath; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class InPathTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java index 94c3f79d9..edfd9ad71 100644 --- a/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java @@ -9,13 +9,11 @@ * ******************************************************************/ package org.aspectj.systemtest.java14; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.util.LangUtil; +import junit.framework.Test; + public class Java14Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java index b40099a89..3997291c0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java @@ -11,12 +11,10 @@ * ******************************************************************/ package org.aspectj.systemtest.knownfailures; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - public class KnownfailuresTests extends org.aspectj.testing.XMLBasedAjcTestCase { diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java index b6672698a..4115ff90e 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.knownlimitations; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class KnownLimitationsTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java index b8a000d71..5222261d5 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java @@ -10,13 +10,11 @@ *******************************************************************/ package org.aspectj.systemtest.model; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.weaver.World; +import junit.framework.Test; + /** * Tests the model when there is a requirement on Java5 features. * diff --git a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java index aa57f1abf..86cb1c1df 100644 --- a/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java @@ -10,13 +10,11 @@ *******************************************************************/ package org.aspectj.systemtest.model; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.weaver.World; +import junit.framework.Test; + /** * Tests the model when there is no requirement on Java5 features. * diff --git a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java index d1309442c..6b67bc0d7 100644 --- a/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.options; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class OptionsTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java index 33eb11691..e82c91349 100644 --- a/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.pre10x; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class AjcPre10xTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java index 4d5a0d2b8..7802f4c93 100644 --- a/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.purejava; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class PureJavaTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java index 24028f164..08c291a56 100644 --- a/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java @@ -9,10 +9,10 @@ * ******************************************************************/ package org.aspectj.systemtest.serialVerUID; -import java.io.File; -import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class SUIDTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java index 909cb025b..249953069 100644 --- a/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java @@ -12,10 +12,10 @@ package org.aspectj.systemtest.tracing; import java.io.File; -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; +import junit.framework.Test; + public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java index 2df75fd6f..51f225ba2 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java @@ -10,12 +10,10 @@ *******************************************************************************/ package org.aspectj.systemtest.xlint; -import java.io.File; +import org.aspectj.testing.XMLBasedAjcTestCase; import junit.framework.Test; -import org.aspectj.testing.XMLBasedAjcTestCase; - public class XLint5Tests extends XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java index c50a0e6bb..b14ba5882 100644 --- a/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java @@ -9,13 +9,11 @@ * ******************************************************************/ package org.aspectj.systemtest.xlint; -import java.io.File; - -import junit.framework.Test; - import org.aspectj.testing.XMLBasedAjcTestCase; import org.aspectj.weaver.bcel.BcelShadow; +import junit.framework.Test; + public class XLintTests extends org.aspectj.testing.XMLBasedAjcTestCase { public static Test suite() { diff --git a/tests/src/test/java/org/aspectj/testing/Utils.java b/tests/src/test/java/org/aspectj/testing/Utils.java index 524ac7186..c2acd649d 100644 --- a/tests/src/test/java/org/aspectj/testing/Utils.java +++ b/tests/src/test/java/org/aspectj/testing/Utils.java @@ -12,15 +12,9 @@ package org.aspectj.testing; import java.io.File; -import org.aspectj.apache.bcel.Repository; import org.aspectj.apache.bcel.classfile.JavaClass; -import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.apache.bcel.util.ClassPath; import org.aspectj.apache.bcel.util.SyntheticRepository; -//import org.aspectj.apache.bcel.verifier.VerificationResult; -//import org.aspectj.apache.bcel.verifier.Verifier; -//import org.aspectj.apache.bcel.verifier.VerifierFactory; -import org.aspectj.tools.ajc.Ajc; /** * Not quite the right place for this class.. diff --git a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java index 672a95299..da75267b2 100644 --- a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java +++ b/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java @@ -1,5 +1,12 @@ package org.aspectj.tests; +import org.aspectj.systemtest.AllTests; +import org.aspectj.systemtest.AllTests14; +import org.aspectj.systemtest.AllTests17; +import org.aspectj.systemtest.AllTests18; +import org.aspectj.systemtest.AllTests19; +import org.aspectj.util.LangUtil; + /* ******************************************************************* * Copyright (c) 2005 Contributors. * All rights reserved. @@ -16,13 +23,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.aspectj.systemtest.AllTests; -import org.aspectj.systemtest.AllTests14; -import org.aspectj.systemtest.AllTests17; -import org.aspectj.systemtest.AllTests18; -import org.aspectj.systemtest.AllTests19; -import org.aspectj.util.LangUtil; - public class TestsModuleTests extends TestCase { public static Test suite() { |