]> source.dussan.org Git - aspectj.git/commitdiff
polish
authorAndy Clement <aclement@pivotal.io>
Fri, 29 Nov 2019 05:22:23 +0000 (21:22 -0800)
committerAndy Clement <aclement@pivotal.io>
Fri, 29 Nov 2019 05:22:23 +0000 (21:22 -0800)
155 files changed:
build/src/main/java/$installer$/org/aspectj/Main.java
build/src/main/java/org/aspectj/internal/tools/build/Module.java
build/src/main/java/org/aspectj/internal/tools/build/Result.java
build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java
testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java
testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java
testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java
testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java
testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java
testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java
testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java
testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java
testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java
testing/src/test/java/org/aspectj/testing/util/Diffs.java
testing/src/test/java/org/aspectj/testing/util/LinkCheck.java
testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java
testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java
testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java
testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java
testing/src/test/java/org/aspectj/testing/util/options/Option.java
testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java
testing/src/test/java/org/aspectj/testing/util/options/Options.java
testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java
testing/src/test/java/org/aspectj/testing/util/options/Values.java
testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java
testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java
testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java
tests/src/test/java/org/aspectj/systemtest/AllTests.java
tests/src/test/java/org/aspectj/systemtest/AllTests15.java
tests/src/test/java/org/aspectj/systemtest/AllTests16.java
tests/src/test/java/org/aspectj/systemtest/AllTests17.java
tests/src/test/java/org/aspectj/systemtest/ajc10x/Ajc10xTests.java
tests/src/test/java/org/aspectj/systemtest/ajc11/Ajc11Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc120/Ajc120Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc121/Ajc121Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java
tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java
tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java
tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java
tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java
tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java
tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java
tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java
tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java
tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java
tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
tests/src/test/java/org/aspectj/systemtest/ajc151/Ajc151Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc151/AtAroundTests.java
tests/src/test/java/org/aspectj/systemtest/ajc151/NewarrayJoinpointTests.java
tests/src/test/java/org/aspectj/systemtest/ajc151/SerialVersionUIDTests.java
tests/src/test/java/org/aspectj/systemtest/ajc152/Ajc152Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTests.java
tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java
tests/src/test/java/org/aspectj/systemtest/ajc153/Ajc153Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc153/JDTLikeHandleProviderTests.java
tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc153/PipeliningTests.java
tests/src/test/java/org/aspectj/systemtest/ajc154/Ajc154Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc160/Ajc160Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc160/AnnotationValueMatchingTests.java
tests/src/test/java/org/aspectj/systemtest/ajc160/NewFeatures.java
tests/src/test/java/org/aspectj/systemtest/ajc160/ParameterAnnotationMatchingTests.java
tests/src/test/java/org/aspectj/systemtest/ajc161/Ajc161Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc161/OptimizedAnnotationFieldBinding.java
tests/src/test/java/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc1610/NewFeatures.java
tests/src/test/java/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc1611/NewFeatures.java
tests/src/test/java/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc162/Ajc162Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc163/Ajc163Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc164/Ajc164Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java
tests/src/test/java/org/aspectj/systemtest/ajc164/JointpointIdTests.java
tests/src/test/java/org/aspectj/systemtest/ajc165/Ajc165Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc166/Ajc166Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc167/Ajc167Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc167/IntertypeTests.java
tests/src/test/java/org/aspectj/systemtest/ajc167/OverweavingTests.java
tests/src/test/java/org/aspectj/systemtest/ajc169/Ajc169Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc169/IntertypeTests.java
tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java
tests/src/test/java/org/aspectj/systemtest/ajc170/IndyTests.java
tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc171/Ajc171Tests_need17jre.java
tests/src/test/java/org/aspectj/systemtest/ajc172/Ajc172Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc173/Ajc173Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc174/Ajc174Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc175/Ajc175Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc180/Ajc180Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc181/Ajc181Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java
tests/src/test/java/org/aspectj/systemtest/ajc1810/Ajc1810Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc182/Ajc182Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc183/Ajc183Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc184/Ajc184Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc185/Ajc185Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc186/Ajc186Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc187/Ajc187Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc188/Ajc188Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc189/Ajc189Tests.java
tests/src/test/java/org/aspectj/systemtest/ajc190/Annotations.java
tests/src/test/java/org/aspectj/systemtest/ajc192/SanityTestsJava11.java
tests/src/test/java/org/aspectj/systemtest/apt/AptTests.java
tests/src/test/java/org/aspectj/systemtest/aspectpath/AspectPathTests.java
tests/src/test/java/org/aspectj/systemtest/base/BaseTests.java
tests/src/test/java/org/aspectj/systemtest/bringup/BringUpTests.java
tests/src/test/java/org/aspectj/systemtest/design/DesignTests.java
tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
tests/src/test/java/org/aspectj/systemtest/incremental/model/IncrementalModelTests.java
tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
tests/src/test/java/org/aspectj/systemtest/incremental/tools/CompilerFactory.java
tests/src/test/java/org/aspectj/systemtest/inpath/InPathTests.java
tests/src/test/java/org/aspectj/systemtest/java14/Java14Tests.java
tests/src/test/java/org/aspectj/systemtest/knownfailures/KnownfailuresTests.java
tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java
tests/src/test/java/org/aspectj/systemtest/model/Model5Tests.java
tests/src/test/java/org/aspectj/systemtest/model/ModelTests.java
tests/src/test/java/org/aspectj/systemtest/options/OptionsTests.java
tests/src/test/java/org/aspectj/systemtest/pre10x/AjcPre10xTests.java
tests/src/test/java/org/aspectj/systemtest/purejava/PureJavaTests.java
tests/src/test/java/org/aspectj/systemtest/serialVerUID/SUIDTests.java
tests/src/test/java/org/aspectj/systemtest/tracing/TracingTests.java
tests/src/test/java/org/aspectj/systemtest/xlint/XLint5Tests.java
tests/src/test/java/org/aspectj/systemtest/xlint/XLintTests.java
tests/src/test/java/org/aspectj/testing/Utils.java
tests/src/test/java/org/aspectj/tests/TestsModuleTests.java

index 9e751803800923e36ffb201fba8764729f009ee1..6ecebae63b9a6640f8c6d39b29163c2da1174066 100644 (file)
@@ -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();
index cbbbc308bad3900160bdf035255ab679bb740f53..58789424f4a3e22a6e6d145671d598a1b139bbbc 100644 (file)
@@ -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;
             }
index e12ba4e292e693dee2231a53d80ea5e374b23f76..b17ac656e2d2a3b0e3001601eb3fb7ecefe347e3 100644 (file)
@@ -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() {
index bb1ed85557367bd79b0a5e4324e49e569c5af414..4e9f59011bafcd7c377f035d77b5a48d98b84e5a 100644 (file)
@@ -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) {
index 8fb2741762f6c1417b397fbaeb14f0779b95f790..0dcc23dfda2f5843bef3c1a9fff07123ace1a073 100644 (file)
@@ -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;
index 0fbbd125e483247270103726cd0f1ae0916dbc91..59974f1b176b8dc276efc8c79611b85a521c8eef 100644 (file)
  *******************************************************************************/
 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/>
index 81ff4e1b4e7c82df8da432a5e99213db447663f9..327be6bd4915583a34da1330ab1dbba52a82e853 100644 (file)
  * ******************************************************************/
 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;
index 94d31833a89ca14108b75568389b9ed787aaea61..f8d12e80ed07ddd8b666c17b68d5bbd72b241321 100644 (file)
@@ -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;
index 1f6ab38ab0c738c7e092f913a246246f305eee97..3ed472c5e2916977e5b0a252236aef4dc6e7e435 100644 (file)
@@ -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;
+
 /**
  * 
  */
index f4a88c3b2b57ea878a6218dc03398898719ff1d6..b2060480cf4e5706d55bad7feee847f1009c9ea2 100644 (file)
@@ -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;
index 0c469ec3a7bf14a3915227b79f98c80c83608bb9..36ade5f2a84305859f1b012d79bb27f59ca84cd3 100644 (file)
 
 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
  */
index bdebae02c8c45ea9c3e44bcfd294d90c545c3695..629b0a0a3877f909216d90b52ae7584eb908fa0d 100644 (file)
 
 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;
index 8d6c587fee309b4536f7638b9ac4194da226b224..c5d4b0b602fd8b9d3309e27645d646052c202921 100644 (file)
 
 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.
index 83e14cf104a0b554edefb7f8fd9c3a25e35e9771..1a8873072eb088cfd2bb58c4318f321d764aab73 100644 (file)
 
 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;
+
 /**
  * 
  */
index ddfaee1f4985c0fb51dedc87a083fc10132b2e9a..c5f68d03a7c279cb96d8c44300ed8c9d20f76bc4 100644 (file)
 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.
index 3ee0fd041eda2eca90e0db93d8a385d5496810d2..dc3ccec07748151d847518067b3d286f330238d1 100644 (file)
@@ -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.
index 8d75d56204c9c0c2dd2a49bdb715118b04605ed3..b3249feeb952660dae9ee7e5c84fc43ed6bd2c5e 100644 (file)
@@ -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;
index 7c7f2c54e76d4269bd243f67e074f4b223ef7b3f..ac707a1836bf2823769eb9eeff4ab2d462a3b390 100644 (file)
@@ -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;
index aade35f48928d50a45d0a0dc588fe3b65468f040..c7e282040436f083f3d85900ff8386b7343cd362 100644 (file)
 
 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:
index cfbc6b0e1ab90bd440f3d27e6b470dd7c6dbf968..c891f134c52570d4af645458eb387932241d8b0e 100644 (file)
@@ -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) {
index 1f5325e82b02cd2ff868afa552f229b86d54ef13..09798850c8b27784d620eff4811a8a40c4fd7986 100644 (file)
 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.
index 253184c8ddbe6492814f49296831684cde368f81..869cb3c4c64c9a5fc564b679da98a91d3e99e652 100644 (file)
@@ -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;
index a0299889b8ca5abed505f6d85256f1740cd64a46..83a8b96a30a87dbbc578d1497114e32884248020 100644 (file)
 
 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;
+
 /**
  * 
  */
index eb09f97005cfb8b4d9d98c08c048e53e2c13907c..dd54fa4daa729a5c0b2c972624249f3c1b3cdade 100644 (file)
 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;
index 0e81b24d379cfd7f6b41bf8568f40b0f07bf4093..3317f7746c7ffa3f389905a293b3c17e406c6b61 100644 (file)
 
 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;
 
index 51ec73efd0053c610019d7ff9aba42f20c47de1a..571633a0c7d050ad0f1bc38dbfd28eecaacc3fa5 100644 (file)
@@ -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;
+
 /**
  * 
  */
index 366727b8042cf81db7c18d751b0a13dc0f3d1281..11b9ea2b4676793e683a39de17869a3d5ba84254 100644 (file)
@@ -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
  */
index af13aed03360904ee255d5fbc79d58a8b075a00c..17fa8234da4ce4a9a4220e741adb6c8c2e0a5957 100644 (file)
@@ -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;
+
 /**
  * 
  */
index ebb6c9d9858dbcb089665d923967e1572ba3046a..f077eba523b09a24bf9c44e4960ab00d399cec89 100644 (file)
 
 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;
 
 /** 
index e845a89bf0b9ef6bfb9a652b4c5c08cf10f33b56..f8ea3d9c495d77c72f76ba0e7da2b0929c68b815 100644 (file)
 
 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;
 
index a8b3b2c5a69765ed824fec48d746113044f7ae24..87748f0b17fde92607f002f0110e4b6d8efb34e0 100644 (file)
@@ -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, 
index 04a968d885aebc485e4c8ed453af1957817da677..f3e52767f1f5bdb5b0ce008baf40dc326c63f291 100644 (file)
@@ -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;
 
index 4d8efdf2ef7c0203e5230c08fe0235e596c491a9..bd7d98613a2bd66123645e06d0f8160be8ff2dab 100644 (file)
 
 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 {
index 574969080859274b97ebec7fa7b5b6f6d7a1e868..d21f03165c9571427dca0aef30e7e584d9e9625f 100644 (file)
 
 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;
index 370a9ac913861f589545fa922a6ca46a6bba39fd..62e3fd18688ba047822096f8f6c6be48e79f6ab1 100644 (file)
 
 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;
 
 /** 
index 81842dc300922b37d953cd50bf413b3e213769aa..397e8ccfa35e484cd632dc671957357bc907b9a2 100644 (file)
@@ -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;
+
 /**
  * 
  */
index aa393f5de570614cd5d9d3b936411d8c0d5fdfe4..6d0eeffff3ac83920f26c694390f9aca4a653591 100644 (file)
 
 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;
 
 /**
index f59bf397e81f002d75919b07833c5a04097bd331..9a39d0cc8c0aaaadc8b5904ca9ac62b043a10223 100644 (file)
@@ -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;
index 2ce16495fd746a53023440ac0fbec90ce8cdaece..206738dd42f922bb44a45c9de68906be6547b3b6 100644 (file)
@@ -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
index 8b19ef23b30633ce8d9714ef169295e3e4a6a74b..af06fd72935ae994b2b562b861152c6c8bf323cf 100644 (file)
@@ -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() {
index f1f7b4a145ca0e4556cea543f9c508989e8d9681..d4106ea53b1cf17c5e4879e34d11fd8b6abf76b4 100644 (file)
@@ -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() {
index 9feebfb1e619b98dc5b6913f4ceec96334419950..cc1e480ef1b875ff551c605d649a9fe91dae9e61 100644 (file)
@@ -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() {
index 1ee946099cb04345f536182601575bdb418bb714..8b4cee73eb168a7a39aa271c6067c0aaac2e2298 100644 (file)
@@ -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() {
index 6b1013780a58d0605f83932f4bc53ff9161103d3..b7fa755db73e345618a746dcf08c6e4ef9b90e4d 100644 (file)
@@ -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() {
index 8b11ccfbac3576b73bc03d1e9fbb31bb6cec926c..d4d445a68f7f4c29283deb2a5f114f86951b0211 100644 (file)
@@ -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() {
index 1301ed77930d7455ed28b2b57941da44344ed37d..000a72010234cf3ffb8bca7052548247ffb19a04 100644 (file)
@@ -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() {
index aa77443a1d4bdf673904ff21c7ad7bc5d2cfd5e5..a1e7fc648aa3fd0642677c98a5ea93239666af34 100644 (file)
@@ -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
  *******************************************************************************/
 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
index 3fc84da3b0f32719e153fda77383cccf607fbdf9..cde62fe514c3ae258ed452dc1eb74f571cc823a0 100644 (file)
@@ -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
 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");
                }
        }
 
index 1d750bb94ebcef44b4fc9995947c90b16dbbad0f..47aeae0e87205a6568587a738f6f8f80c2d76fac 100644 (file)
  *******************************************************************************/
 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
  */
index a8a578d3800e655c0ca4455948c65da4a3e45dc7..6c4f21bd5854b7552bd6fa2c0bf4846ea325e8eb 100644 (file)
@@ -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
  *******************************************************************************/
 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);
 
index 00eea99db342384b108f2bf4c4f375186ebf31df..d21c76c5297d99725110b731e067c88ec747ae64 100644 (file)
  *******************************************************************************/
 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
index d045bb4c977f406b2b149187fd8a1d80c88ffae5..9358d9c817d1aed0a532910a377d2a849cb96032 100644 (file)
  *******************************************************************************/
 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
 */
index fb7a3007126a5103aab9823439038053efa88b04..0c44996cb92f1b77f5d135e5a5889d7ce8c2d7e5 100644 (file)
  *******************************************************************************/
 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() {
index 5961f64fa0e12c3b3c61b8c0db2f9ddff42dca0d..55f5c9a5252a8b6f6dcf8bdfbce0432ab7f2c9a5 100644 (file)
  *******************************************************************************/
 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:
index e03f507d83b1f2e084e96a95ba3e401e964201ac..3ea9afb1720e4f4867b2b5e0e1114092dae24131 100644 (file)
  *******************************************************************************/
 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 !!!
index 9231b013085221dbfa7f90d433df82b0c08c4481..f5d18e3517450a2f0c025c241c9fd8447fc40ccc 100644 (file)
@@ -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");
index cc6d446ea1a505b968e1bcbb803a9125b3d49bae..6de83353a6f5b3abbc3e0bcdd0d645084e00299c 100644 (file)
  *******************************************************************************/
 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() {
index f866bfc75f3c2a7dc8e94a474efe7f9dd6d39975..0e88d7b3fbe261b046d2dec2100d527d47a7896e 100644 (file)
  *******************************************************************************/
 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:
index a0c213462c375d7e95b0259366ef1b0247ec899e..d6e4b7112bb6ee13693069fa3955cc7ec97ca953 100644 (file)
@@ -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;
index fe1f5649f1574b73b3556b2c7346362792d390c8..9a96d31c656642c5762cdc2e24745a593e74ad94 100644 (file)
  *******************************************************************************/
 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() {
index ed3428c454022de67281e16f7931e33c3a115b20..16ba5f286940c7efb0cc25ab6dca6ef8deed4a05 100644 (file)
  *******************************************************************************/
 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. 
index eeef4a4a9052bc1e0f3a0681048910fbce9ca473..ddd8966a65f2ce039a26d1e326e6d5dfb0e0bfa4 100644 (file)
@@ -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 {
index 93cfb03cefca57f775450878ca425e67b6d2f1c2..44ca53004eaf09895d9266be08caa9012b5d1cc2 100644 (file)
@@ -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)
  */
index f6002bde77a11a35a288e70566489ff4ec2a4df6..5b970575d3d9b434fe5463ffae32d77b81935c34 100644 (file)
  *******************************************************************************/
 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() {
index 490915b48e785bc3abcff9f33abe0e5484ed4ecb..733c946dd6689a77a3393021cb1ab017a2c204b0 100644 (file)
  *******************************************************************************/
 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() {
index 726688b87312350d34b8f13eeaeb23ca9ec4fcea..c50c6aa159e9ba2afb50b504ed6ac5fa33035e3d 100644 (file)
  *******************************************************************************/
 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:
index 371823063367c9b5ba7d4bcb74c549b8329c3dd5..796057fa51d5b6590978578ddaa69e079e5bf8ea 100644 (file)
@@ -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
  *
index 808d14f3754750d3a6e4bc546ce77b27d5041058..16f7321a989cee536e5cde962d27a6300bca4537 100644 (file)
@@ -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>
  */
index b1b131859a8f0500aa903e1c4038490243cb72b6..e922075ae4af4f0a0f81c363750f0b181be65e8b 100644 (file)
  *******************************************************************************/
 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>
  */
index e69219cc4a6d3ebab2afdb6411c883239be9ce9f..e556be4627f86e3c3d8b0ed052250fbb9fb60cdb 100644 (file)
  *******************************************************************************/
 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
  * 
index 6f3e032e33d61247a314392c93f1a2738ab26c0e..ca8dbbb536d244f569b04acc295ce80fae4b9bf0 100644 (file)
@@ -1,6 +1,5 @@
 package org.aspectj.systemtest.ajc150.ataspectj.coverage;
 
-import java.io.File;
 import java.net.URL;
 
 import junit.framework.Test;
index 0f7034ceb5f8dc86f10382d1fef13c4ba9eb420b..9164c722595c026dce2b5f5ee7f117dd6aac27b9 100644 (file)
@@ -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() {
index c2b75515f3b41baff259a645c533b1febef0d121..5d469fbd3ea7f112cf99ea3b88467aa3e762a729 100644 (file)
@@ -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() {
index 0c5bc2c80fb7333714e17fd90f23dfa5a9785103..5fba25cae4e6c87a415d74d0756980f7a61f5858 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc151;
 
-import java.io.File;
 import java.io.IOException;
 
 import org.aspectj.asm.AsmManager;
index f7c4eabce26a332d5eb0d5d8b033529efbc08420..138ffb9f1971cec5b311e90427eb10919a09dde7 100644 (file)
  *******************************************************************************/
 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
index 05f8660fea7d7b052a3d0f8678ae2c15bb4cf84f..553ce81117a0a1dd62ce2181c39e53fcd5953b0d 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc151;
 
-import java.io.File;
 import java.util.List;
 
 import org.aspectj.asm.AsmManager;
index 9fbbdc5046026f865ec0e7122713376933d80b14..4558a4c395cf261a6e48660181171e5e487d0a59 100644 (file)
  *******************************************************************************/
 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 {
 
index 48bc274afd7fde32e76fb80f96a0e4f8a8077e1e..9ef043b8aff27740fa6839512cef1214d20f79d1 100644 (file)
  *******************************************************************************/
 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"); }
index af40044984d1f5572d36cd5bb9b494b70384bb8a..bb6df5d4c0a5e1dca2c37639fe74af79b7c25cc4 100644 (file)
  *******************************************************************************/
 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
index d599747c4e9803897149867405cfbef28d9e0854..92d2addfd7ddfa2b84c68990e7be6d049ecaafed 100644 (file)
@@ -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:
  * 
index d021c05886575d916a9581bf1b58edfae94cbc9c..84faf9430f368434097a770769fe352536813609 100644 (file)
  *******************************************************************************/
 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() {
index 32c7d8072f4e87201f75037a3c6d87f7e286041e..2d398f86f64c8dc2e438d6249c4e8d4b8adb798d 100644 (file)
  *******************************************************************/
 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;
index 7918205aea4a32b0c80740510587b02a0bc10ad3..939dfe92e84ee930a24530e55a57ff4921bb8522 100644 (file)
@@ -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() {
index 2b3999346d2d8c4d286bc0ca01838f6781198265..3e384c1fc8831387707435f600bd268bbe2f4bd4 100644 (file)
  *******************************************************************************/
 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)
  * 
index c088adf51f62b5402d31b865d2101b7ca2330f6f..6fde74765028d03d37b022fad0fafb4ee73d9e26 100644 (file)
  *******************************************************************************/
 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
  */
index 31d2ba8eb8894b7291c751edf15f139a74439c15..133a117974e7add90a9b2da97a137dcd60ad1a8b 100644 (file)
  *******************************************************************************/
 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
  */
index bcaed869bdd91a3410850cec6a1a919ca5961d5c..bb5784edc33241e7d6d5610b18f54bb7a630ed1d 100644 (file)
 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
  * 
index acdcf3cc654d42a098dc7fbd036873c19acefc21..fd7afb9f1e2f177f7b7f5459a4c9318b22799e01 100644 (file)
  *******************************************************************************/
 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
index c876971381d7210edf2b77534c9ff7e392dd78e5..ca377f83682cc044706e90f0830592b52a3afdd3 100644 (file)
 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
  * 
index 14433e1871e55be009ca37e0b476edff5f69a518..bcf640f3f51a83daeb5541d50e0e2d7aea6c7965 100644 (file)
  *******************************************************************************/
 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
index b75603b12ea8ccb7e0e9c4b07e5cef5895580f24..35f3d680e1e9edefcd97a4a7f90d38e564fd1f1b 100644 (file)
  * ******************************************************************/
 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.
index fc1e5f945d3198faee5ca21241813c7946693d1f..1970aa5c3d9c2c97813b427a6c2ecdaabf1e0f5b 100644 (file)
  *******************************************************************************/
 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 {
 
        
index 580469e97a42630d0e50869b44a1ada8ff19a59b..34b72996f7b84f2903080c723503fce27e3f09f2 100644 (file)
  *******************************************************************************/
 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() {
index 8f44cfa59732f3a35557af608bf3c456dacff99b..acfcdab8777ddb5b17f8cbfce88f9c70aec5658b 100644 (file)
@@ -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;
index def99671d65346226bed5393a28228ac6fee1a4a..e0cfe6dad47ea774cf7c5310a391ff127359b2cd 100644 (file)
  *******************************************************************************/
 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() {
index 1e358dfccb2be128811941aa2b848581ce95fd89..9e857cb316d175e167aa6da53386213333e555c9 100644 (file)
  *******************************************************************************/
 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
  */
index 2aca411788c39698362401a60395c28df1b26deb..4a6f019d69c0ff22571b8e6a6b1eca6f08c2c22f 100644 (file)
  *******************************************************************************/
 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
index 2368c97ae0a700dfd178db55cea235035b7c446a..c0bd95645ae553ffada349996e0cd6e8a3dce164 100644 (file)
  *******************************************************************************/
 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");
index d65112024eac67d773cc3f80c22365737832112e..f474af49c0fd9e3889b2a0a6869bf6d3d27e0588 100644 (file)
@@ -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;
index 4505da24051910274713ffd4da95d3d224056d10..6b366c15d4141e69d0e2ae0bdf39f63cf76a65f1 100644 (file)
  *******************************************************************************/
 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
index 24332e998132d1980d18bdbe1d53bf7b02788e6c..80056f9ba402b6b0845c9cc099750f5a66a72708 100644 (file)
  *******************************************************************************/
 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
index 0f05155e5b0aba977e94d045c86cb6c2fef82292..6b8923e2ab4791f89fdab18c2ec6e29d0d6737e9 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc165;
 
-import java.io.File;
 import java.util.List;
 
 import org.aspectj.bridge.IMessage;
index 37d6e09fe1a4e3e54f9967723a074e1c9e2e1fc6..ebf440b3ee3758fdbd34ec85cf59dc9af8364cdd 100644 (file)
  *******************************************************************************/
 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() {
index 20f34b8e3571e53e746f96d3dee01ecd0f638e79..3c8399e0c6bdcd732f1fd64bc4f1166c901a62d9 100644 (file)
  *******************************************************************************/
 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() {
index 2c944f645c1ad92ea899d8c1f94fe4ba0a380250..7f02f00779c63a48cab7253c99c3812c9003e97f 100644 (file)
  *******************************************************************************/
 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.
  * 
index 9d80409447dfd6de44d1bf0ea152ee640fdb77a8..09d4f21089a5edd2d89227d07666936126eb5516 100644 (file)
  *******************************************************************************/
 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
index 3dd0046e57eb51caefb99a02cf10413d9c1ce143..1f9f18e2db831d594289573d5ca17b49516fd334 100644 (file)
  *******************************************************************************/
 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() {
index 64bf7c822f3b957978cd01d66bf0ecfa379b5653..a91b3a13e7075f9b48f1c6ec3a30ab8270beeef0 100644 (file)
@@ -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.
  * 
index 61e32b98f6e23b790f94cd4093c73c1fa57300e9..cea518175754d0f3208a554a7485af439a20ba01 100644 (file)
  *******************************************************************************/
 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
index 94471ca5a014aa065b37fd922d34ad21fbe73d39..b28ddbafa4886dda4da3b2b484969883188ba2d8 100644 (file)
  *******************************************************************************/
 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
  */ 
index 3089fcaa7248f5b6ca91aedeb4b2fd2ddc781722..53b9aed3818b1076cb83f0a590a7e9af27841b8a 100644 (file)
  *******************************************************************************/
 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
  */ 
index 74f40c7bfd8e67927072ec01ca465fafd0f675b7..68ff45345bf5625bb231178d287b359de1bb45b6 100644 (file)
  *******************************************************************************/
 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
  */ 
index 61b2e9985901e3b09a4e92f3ea574eacf83c0825..deec8651b03d83ae8cd3f3eb92f10f6eebf946d5 100644 (file)
  *******************************************************************************/
 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
  */
index c51ed28ba43b1ddfac5cd02e81ca1a17902d1b45..98d16daae80270e94ded9180d061da119d6ad064 100644 (file)
  *******************************************************************************/
 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
  */
index 6063efc89bc71a70b7be3969944ab57b3a27c74f..72d7dac08c9c981100e74f1ca783bafba38588a5 100644 (file)
  *******************************************************************************/
 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
  */
index 2a44a0a6aff3d8e44567ba818cb1cae0b94ff395..9ce61ddab85edb369812c9de72df2c290ee72864 100644 (file)
  *******************************************************************************/
 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
  */
index f83f5efef13ee14b060a21228e592bfe7b462c8e..4ce10c9cdca953863c858f2ed249c7643536b5d8 100644 (file)
  *******************************************************************************/
 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
  */
index b3a34c79586237d9d3fe07677cf35e121317245a..56955f3582801a7a216197a9ef52e23789f94dc8 100644 (file)
  *******************************************************************************/
 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
  */
index a6c89f895c6995fc998d59f9952cb73a2062aff2..ea1c9a9262f88696145b8fea57439b270129cac1 100644 (file)
  *******************************************************************************/
 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 {
 
index b8ceb98364e6a2b46a4f03f693455d38811795df..89f0e01466c0a13ddb8af5782035b40aaadc3bd6 100644 (file)
@@ -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;
index 07096cfc01472570a907dc9b9577cea63afd2b7a..eaa86ad792d8c234c446132c5d17c187e71bea49 100644 (file)
@@ -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;
index dadd926a0dfd6006f278d24feef795905cf6e736..210d6ee37921ef5894a155396abcdd68418d596a 100644 (file)
  *******************************************************************************/
 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
  */
index d0822e40bd69ee6ba08b26124ee763faa364ada3..e9a168d20e55caa768596aa3a6bc656a1b75518d 100644 (file)
  *******************************************************************************/
 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
  */
index 86cda03b37d12271575d7fb31b09bb2f5bc45d1f..708238746b78491c1639dc0155015a00f3265ac1 100644 (file)
  *******************************************************************************/
 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
  */
index 64b0042224eef9acd10d6d006252325581389ac4..6d57f64f6edb7861f1b74d50be1740e464821d42 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc185;
 
-import java.io.File;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
index 31627ebaa2072293031e81b9020ce5e71164d115..379c54333641fcd63ec552534498bfee73d4e513 100644 (file)
  *******************************************************************************/
 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
  */
index e2d2f1b63ecfb269f53f1bdfa55d1d3bb365570f..5c87bd187b3031b94683d99e40ee6d1949871656 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc187;
 
-import java.io.File;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
index f53d4241d4e53b9d8c31efebe86fd3adb4b4e222..40f4cd4d6ea5231a599ba380f212b555d1863183 100644 (file)
  *******************************************************************************/
 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
  */
index 7aace8d1ef0a20c45e0668bd75f8a9e5a603273d..267f3fdad334b4b9d7310ae2c600769b4d9b9250 100644 (file)
  *******************************************************************************/
 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
  */
index cd7ff2f7972b21c73f1566c8aa34b77d7ae6da8e..971e534356510ca5f06da7159e8cfb857be42050 100644 (file)
@@ -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.
index 0506f90a17c6417a954770797f9fe992c411119b..7167249fd1046fcedec86771c5c11fa154aa3a64 100644 (file)
@@ -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;
 
index af9d8af9c7314b365a6ab955c7946154ce5c95fb..3b6430c38a74a019e2b265bac5115a0b6a99171d 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.aspectj.systemtest.apt;
 
-import java.io.File;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.util.LangUtil;
 
index 4b5a4d449f4d8561730eaa75a97e40897a1e3cae..ac8af3a8633089afcec7075e64669e85c7ab286f 100644 (file)
@@ -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() {
index 76c4e164a114d88b8c13cbba835792016be66d0f..ffccd307cddcb047de2e54ba2327f7a7ac966d2b 100644 (file)
@@ -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() {
index 7af3476eec2fa857ea77b2b1bc741a91b1cad160..7ef4c838f3e62743b108bed23683e72b6e9765ac 100644 (file)
  *******************************************************************************/
 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.
  */
index a187c9619987a26ba325174d5ffab53a318d9b59..d33ef643db8c825a4cdb53ee9bc76eba4167a24c 100644 (file)
@@ -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() {
index 55e624d092561eaab00e9e271cbdf2a584b75af0..fc1fa68d80d3cc1302fb4421c8e1dde0ce916832 100644 (file)
@@ -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() {
index 68d9d6d3ac1083a997a995e709a05ba4e1858eac..521248ddba6d88a7f4f2da2c02a688d639a41afa 100644 (file)
@@ -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() {
index 1a2d53c026f95aae8ff1fc2f01afb607a64b67ae..0fe276f46cac8787fd0d141dcc92d84b1c6a2232 100644 (file)
@@ -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.
index 3b243d5b84075db08380489f27cf3746a2d5369b..78caba4eac4e770d4458799aa25bf99c308a2d72 100644 (file)
@@ -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;
index 895438dfd975e9e6bf0d2191ae976efb82d5ca6a..f858b118b689a51d5076b1af10ac636c25047980 100644 (file)
@@ -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() {
index 94c3f79d976d3c521000fddebd7df74bfb3e2463..edfd9ad719c636f3d8302d2ed827910f287b015d 100644 (file)
@@ -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() {
index b40099a8953daa171255b906cda4663c8c113d9c..3997291c0946e5d909b782de28439519495dfae3 100644 (file)
 * ******************************************************************/
 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 {
 
 
index b6672698a76d67c7670604aa5732c8f856a25470..4115ff90e38be7b294631fb17b3e2f28dc6253d8 100644 (file)
@@ -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() {
index b8a000d718a3b39fa1a6c08370cdb048bdf5ee9a..5222261d58127ed043b8ee8164c6043ec672bd15 100644 (file)
  *******************************************************************/
 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.
  * 
index aa57f1abfa139f9634145cf6c8574b3f3e55c6a9..86cb1c1df419379fbd6b1e8c2f8ded9f2459c7ed 100644 (file)
  *******************************************************************/
 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.
  * 
index d1309442cd1e352ff29fdb3fb667a58bf95c1d70..6b67bc0d7ce509d257879fe80efb8e72e6ab277b 100644 (file)
@@ -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() {
index 33eb1169141dc1e3804fd7b58b7ddf845a3045f4..e82c9134912f231d7bd18d0d3f388525b78110bc 100644 (file)
@@ -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() {
index 4d5a0d2b8812b9212097a43e12ce04443fdb299d..7802f4c93b110272e2943d1c4257b7f13a963c15 100644 (file)
@@ -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() {
index 24028f16420e7cddb642a375784b8f134fcf02cd..08c291a56ccf2f0e1ad1ac5a8943a106522e39d3 100644 (file)
@@ -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() {
index 909cb025b056b6e90d13df0cf0e0d4fb3601924d..24995306924a54d94d58dad0d6d9606f56a8225c 100644 (file)
@@ -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() {
index 2df75fd6f6ed8dbadc1149ed99969bf3ea51849e..51f225ba2725de6a195d20b4ef92214a503bc158 100644 (file)
  *******************************************************************************/
 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() {
index c50a0e6bb83d430720b5ee9123ebc3044b42d5bd..b14ba5882dae1502e1d1778adafb7a25bfafefb9 100644 (file)
@@ -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() {
index 524ac71864c5d91aa53655e67ad9ae403007bb10..c2acd649d60e247e05bd78cb6a0426c9048e583b 100644 (file)
@@ -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..
index 672a952997ea2c54f4c3f79506efb364ac469178..da75267b2006dc4a5928773f74b6b80e1a7afeee 100644 (file)
@@ -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() {