polish

27 files changed, 74 insertions, 111 deletions

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java
index aa77443a1..a1e7fc648 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AccBridgeMethods.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM 
+ * Copyright (c) 2004 IBM
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,32 +10,30 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 
 /**
  * <b>These tests check binary weaving of code compiled with the 1.5 compiler.  If you need to rebuild
  * the class files then you will have to run tests/java5/bridgeMethods/build.xml.</b>
- * 
- * <p>Bridge methods are generated when a type extends or implements a parameterized class or interface and 
+ *
+ * <p>Bridge methods are generated when a type extends or implements a parameterized class or interface and
  * type erasure changes the signature of any inherited method.
- * 
+ *
  * <p>They impact AspectJ in two ways:
  * <ol>
  * <li>They exist as a method execution join point, and their 'body' exists as a set of new join points
  *   (although their body is normally coded simply to delegate to the method they are bridging too).
  * <li> They create a potential call join point where a call can be made to the bridge method.
- * </ol>  
- * 
- * <p>The principal things we have to do are avoid weaving their body and ignore their existence 
+ * </ol>
+ *
+ * <p>The principal things we have to do are avoid weaving their body and ignore their existence
  * as a method execution join point.  Their existence as a potential target for a call join point are
  * more complicated.  Although they exist in the code, a 1.5 compiler will prevent a call to them with
  * an error like this:
- * 
+ *
  * M.java:3: compareTo(Number) in Number cannot be applied to (java.lang.String)
  * new Number(5).compareTo("abc");
  *
@@ -43,7 +41,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
  * and it will let them through.
  */
 public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase {
-	  
+
   public static Test suite() {
     return XMLBasedAjcTestCase.loadSuite(AccBridgeMethods.class);
   }
@@ -52,7 +50,7 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase {
     return getClassResource("ajc150.xml");
   }
 
-  
+
   /**
    * AspectX attempts to weave call and execution of the method for which a 'bridge method' is also created.
    * If the test works then only two weaving messages come out.  If it fails then usually 4 messages come out
@@ -62,6 +60,6 @@ public class AccBridgeMethods extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void test001_bridgeMethodIgnored() {
   	runTest("Ignore bridge methods");
   }
-  
- 
+
+
 }
\ No newline at end of file
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 3fc84da3b..cde62fe51 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM 
+ * Copyright (c) 2004 IBM
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,12 +11,9 @@
 package org.aspectj.systemtest.ajc150;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import junit.framework.Test;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.Signature;
@@ -24,6 +21,8 @@ import org.aspectj.asm.AsmManager;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.util.LangUtil;
 
+import junit.framework.Test;
+
 public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
 	public static Test suite() {
@@ -845,7 +844,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		if (LangUtil.is17VMOrGreater()) {
 			runTest("java 5 pointcuts and declares at pre-java 5 compliance levels - 1.7");
 		} else {
-			runTest("java 5 pointcuts and declares at pre-java 5 compliance levels");	
+			runTest("java 5 pointcuts and declares at pre-java 5 compliance levels");
 		}
 	}
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java
index 1d750bb94..47aeae0e8 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AllTestsAspectJ150.java
@@ -10,15 +10,15 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.aspectj.systemtest.ajc150.ataspectj.AtAjLTWTests;
 import org.aspectj.systemtest.ajc150.ataspectj.AtAjMisuseTests;
 import org.aspectj.systemtest.ajc150.ataspectj.AtAjSyntaxTests;
 import org.aspectj.systemtest.ajc150.ltw.LTWServerTests;
 import org.aspectj.systemtest.ajc150.ltw.LTWTests;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * This pulls together tests we have written for AspectJ 1.5.0 that don't need Java 1.5 to run
  */
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java
index a8a578d38..6c4f21bd5 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationBinding.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM 
+ * Copyright (c) 2004 IBM
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,11 +10,8 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
 import java.util.List;
 
-import junit.framework.Test;
-
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
@@ -22,6 +19,8 @@ import org.aspectj.asm.IRelationship;
 import org.aspectj.asm.internal.Relationship;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 public class AnnotationBinding extends XMLBasedAjcTestCase {
 
 	public static Test suite() {
@@ -326,7 +325,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase {
 
 			Relationship rel = (Relationship) l.get(0);
 			assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1);
-			String tgt = (String) rel.getTargets().get(0);
+			String tgt = rel.getTargets().get(0);
 			int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt);
 			assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10);
 		}
@@ -356,7 +355,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase {
 
 			Relationship rel = (Relationship) l.get(0);
 			assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1);
-			String tgt = (String) rel.getTargets().get(0);
+			String tgt = rel.getTargets().get(0);
 			int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt);
 			assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10);
 
@@ -388,7 +387,7 @@ public class AnnotationBinding extends XMLBasedAjcTestCase {
 
 			Relationship rel = (Relationship) l.get(0);
 			assertTrue("Should have 1 target but has " + rel.getTargets().size(), rel.getTargets().size() == 1);
-			String tgt = (String) rel.getTargets().get(0);
+			String tgt = rel.getTargets().get(0);
 			int lineNumber = asm.getHandleProvider().getLineNumberForHandle(tgt);
 			assertTrue("Should point to line 10 but doesnt: " + lineNumber, lineNumber == 10);
 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java
index 00eea99db..d21c76c52 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationPointcutsTests.java
@@ -10,13 +10,12 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
 import java.net.URL;
 
-import junit.framework.Test;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 
 /**
  * Tests the use of Annotations in pointcuts
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
index d045bb4c9..9358d9c81 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationRuntimeTests.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /**
 * Tests for @this, @target, @args
 */
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
index fb7a30071..0c44996cb 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Annotations.java
@@ -10,14 +10,12 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
-
-import junit.framework.Test;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 public class Annotations extends XMLBasedAjcTestCase {
 
 	  public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java
index 5961f64fa..55f5c9a52 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/AnnotationsBinaryWeaving.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 
 /**
  * Annotations, the rules/tests:
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java
index e03f507d8..3ea9afb17 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Autoboxing.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /**
 This test must be run under a Java5 VM - so it is *not* currently
 in the test suite !!!
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java
index 9231b0130..f5d18e351 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/CovarianceTests.java
@@ -1,21 +1,19 @@
 /*******************************************************************************
  * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Andy Clement - initial implementation
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /*
 
 class Car {}
@@ -67,7 +65,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 	  }
 	private boolean verbose = false;
 
-	
+
 	/**
 	 * call(* getCar()) should match both
 	 */
@@ -75,10 +73,10 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 		runTest("covariance 1");
 	}
 
-	
+
 	/**
 	 * call(* Super.getCar()) should match both
-	 * 
+	 *
 	 * This test required a change to the compiler.  When we are looking at signatures and comparing them we walk up
 	 * the hierarchy looking for supertypes that declare the same method.  The problem is that in the comparison for
 	 * whether to methods are compatible we were including the return type - this meant 'Car getCar()' on Super was
@@ -88,7 +86,7 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 	 * '()LFastCar;' (which includes the return type).  If the full signature comparison fails then it looks at the
 	 * parameter signature - I did it that way to try and preserve some performance.  I haven't changed the
 	 * definition of 'signature' for a member as trimming the return type off it seems rather serious !
-	 * 
+	 *
 	 * What might break:
 	 * - 'matches' can now return true for things that have different return types - I guess whether this is a problem
 	 *   depends on what the caller of matches is expecting, their code will have been written before covariance was
@@ -97,23 +95,23 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 	public void testCOV002() {
 		runTest("covariance 2");
 	}
-	
+
 	/**
 	 * call(Car getCar()) should match both
-	 * 
+	 *
 	 * Had to implement proper covariance support here...
 	 */
 	public void testCOV003() {
 		runTest("covariance 3");
 	}
-	
+
 	/**
 	 * *** Different base program, where Sub does not extend Super.
 	 * call(Car Super.getCar()) should only match first call to getCar()
 	 */
 	public void testCOV004() {
 		runTest("covariance 4");
-	}	
+	}
 
 	/**
 	 * *** Original base program
@@ -121,21 +119,21 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 	 */
 	public void testCOV005() {
 		runTest("covariance 5");
-	}	
+	}
 
 	/**
 	 * call(Car Sub.getCar()) should not match anything
 	 */
 	public void testCOV006() {
 		runTest("covariance 6");
-	}	
+	}
 
 	/**
 	 * call(Car+ Sub.getCar()) should match 2nd call with xlint for the 1st call
 	 */
 	public void testCOV007() {
 		runTest("covariance 7");
-	}	
+	}
 
 	/**
 	 * *** aspect now contains two pointcuts and two pieces of advice
@@ -144,21 +142,21 @@ public class CovarianceTests extends XMLBasedAjcTestCase {
 	 */
 	public void testCOV008() {
 		runTest("covariance 8");
-	}	
-	
+	}
+
 	/**
 	 * call(FastCar Super.getCar()) matches nothing
 	 */
 	public void testCOV009() {
 		runTest("covariance 9");
-	}	
-	
+	}
+
 	/**
 	 * call(Car+ getCar()) matches both
 	 */
 	public void testCOV010() {
 		runTest("covariance 10");
-	}	
+	}
 
 	public void testAJDKExamples() {
 		runTest("ajdk: covariance");
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java
index cc6d446ea..6de83353a 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/DeclareAnnotationTests.java
@@ -10,17 +10,16 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
 import java.util.List;
 
-import junit.framework.Test;
-
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 import org.aspectj.asm.IRelationship;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 public class DeclareAnnotationTests extends XMLBasedAjcTestCase {
 
 	public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java
index f866bfc75..0e88d7b3f 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/Enums.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 
 /**
  * Enums, the rules/tests:
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java
index a0c213462..d6e4b7112 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java
@@ -5,8 +5,6 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.Test;
-
 import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.Field;
 import org.aspectj.apache.bcel.classfile.JavaClass;
@@ -27,6 +25,8 @@ import org.aspectj.weaver.World;
 import org.aspectj.weaver.bcel.BcelTypeMunger;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.Test;
+
 public class GenericITDsDesign extends XMLBasedAjcTestCase {
 
 	private World recentWorld;
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java
index fe1f5649f..9a96d31c6 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/HasMember.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 public class HasMember extends XMLBasedAjcTestCase {
 
 	  public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java
index ed3428c45..16ba5f286 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/MigrationTests.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 
 /**
  * Checks if we are obeying migration rules. 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
index eeef4a4a9..ddd8966a6 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/PerTypeWithinTests.java
@@ -12,11 +12,11 @@ package org.aspectj.systemtest.ajc150;
 
 import java.io.File;
 
-import junit.framework.Test;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.tools.ajc.CompilationResult;
 
+import junit.framework.Test;
+
 
 
 public class PerTypeWithinTests extends XMLBasedAjcTestCase {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java
index 93cfb03ce..44ca53004 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/RuntimeAnnotations.java
@@ -1,11 +1,9 @@
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /**
  *  Checking that runtime visible annotations are visible at runtime (they get into the class file)
  */
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java
index f6002bde7..5b970575d 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/StaticImports.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 public class StaticImports extends XMLBasedAjcTestCase {
 
    public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java
index 490915b48..733c946dd 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/SuppressedWarnings.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 public class SuppressedWarnings extends XMLBasedAjcTestCase {
 
   public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java
index 726688b87..c50c6aa15 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/VarargsTests.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 
 /**
  * Varargs, the rules/tests:
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
index 371823063..796057fa5 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjAnnotationGenTests.java
@@ -12,10 +12,10 @@ package org.aspectj.systemtest.ajc150.ataspectj;
 
 import java.net.URL;
 
-import junit.framework.Test;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
+import junit.framework.Test;
+
 /**
  * A suite for @AspectJ aspects located in java5/ataspectj
  *
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
index 808d14f37..16f7321a9 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
@@ -14,11 +14,11 @@ package org.aspectj.systemtest.ajc150.ataspectj;
 import java.io.File;
 import java.net.URL;
 
-import junit.framework.Test;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.util.FileUtil;
 
+import junit.framework.Test;
+
 /**
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java
index b1b131859..e922075ae 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjMisuseTests.java
@@ -10,12 +10,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150.ataspectj;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /**
  * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
  */
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
index e69219cc4..e556be462 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
@@ -11,12 +11,10 @@
  *******************************************************************************/
 package org.aspectj.systemtest.ajc150.ataspectj;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 /**
  * A suite for @AspectJ aspects located in java5/ataspectj
  * 
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java
index 6f3e032e3..ca8dbbb53 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ataspectj/coverage/CoverageTests.java
@@ -1,6 +1,5 @@
 package org.aspectj.systemtest.ajc150.ataspectj.coverage;
 
-import java.io.File;
 import java.net.URL;
 
 import junit.framework.Test;
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java
index 0f7034ceb..9164c7225 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java
@@ -1,11 +1,9 @@
 package org.aspectj.systemtest.ajc150.ltw;
 
-import java.io.File;
+import org.aspectj.testing.XMLBasedAjcTestCase;
 
 import junit.framework.Test;
 
-import org.aspectj.testing.XMLBasedAjcTestCase;
-
 public class LTWServerTests extends XMLBasedAjcTestCase {
 
 	public static Test suite() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
index c2b75515f..5d469fbd3 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWTests.java
@@ -15,11 +15,11 @@ import java.io.File;
 import java.util.Enumeration;
 import java.util.Properties;
 
-import junit.framework.Test;
-
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.weaver.tools.WeavingAdaptor;
 
+import junit.framework.Test;
+
 public class LTWTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
   public static Test suite() {