polish

37 files changed, 136 insertions, 81 deletions

diff --git a/weaver/src/test/java/org/aspectj/weaver/AbstractTraceTest.java b/weaver/src/test/java/org/aspectj/weaver/AbstractTraceTest.java
index 334690b62..1f54c6791 100644
--- a/weaver/src/test/java/org/aspectj/weaver/AbstractTraceTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/AbstractTraceTest.java
@@ -12,12 +12,12 @@ package org.aspectj.weaver;
 
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.AbstractTrace;
 import org.aspectj.weaver.tools.DefaultTrace;
 import org.aspectj.weaver.tools.Traceable;
 
+import junit.framework.TestCase;
+
 public abstract class AbstractTraceTest extends TestCase {
 
 	protected AbstractTrace trace;
diff --git a/weaver/src/test/java/org/aspectj/weaver/BoundedReferenceTypeTestCase.java b/weaver/src/test/java/org/aspectj/weaver/BoundedReferenceTypeTestCase.java
index 403b2ecb1..0db381439 100644
--- a/weaver/src/test/java/org/aspectj/weaver/BoundedReferenceTypeTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/BoundedReferenceTypeTestCase.java
@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class BoundedReferenceTypeTestCase extends TestCase {
 
 	ReferenceType javaLangClass;
diff --git a/weaver/src/test/java/org/aspectj/weaver/CommonsTraceFactoryTest.java b/weaver/src/test/java/org/aspectj/weaver/CommonsTraceFactoryTest.java
index ecdaf63de..b8b451329 100644
--- a/weaver/src/test/java/org/aspectj/weaver/CommonsTraceFactoryTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/CommonsTraceFactoryTest.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.CommonsTraceFactory;
 import org.aspectj.weaver.tools.Trace;
 
+import junit.framework.TestCase;
+
 public class CommonsTraceFactoryTest extends TestCase {
 
 	public void testGetTraceFactory() {
diff --git a/weaver/src/test/java/org/aspectj/weaver/DumpTestCase.java b/weaver/src/test/java/org/aspectj/weaver/DumpTestCase.java
index affd39c2c..752473533 100644
--- a/weaver/src/test/java/org/aspectj/weaver/DumpTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/DumpTestCase.java
@@ -15,13 +15,13 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessageHolder;
 import org.aspectj.bridge.Message;
 import org.aspectj.bridge.MessageHandler;
 
+import junit.framework.TestCase;
+
 /**
  * @author websterm
  *
diff --git a/weaver/src/test/java/org/aspectj/weaver/GenericSignatureParserTest.java b/weaver/src/test/java/org/aspectj/weaver/GenericSignatureParserTest.java
index e5948eb40..433eb2c1f 100644
--- a/weaver/src/test/java/org/aspectj/weaver/GenericSignatureParserTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/GenericSignatureParserTest.java
@@ -10,13 +10,13 @@
  * ******************************************************************/
  package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.util.GenericSignatureParser;
 
+import junit.framework.TestCase;
+
 /**
  * @author Adrian Colyer
  * @author Andy Clement
diff --git a/weaver/src/test/java/org/aspectj/weaver/Jdk14TraceFactoryTest.java b/weaver/src/test/java/org/aspectj/weaver/Jdk14TraceFactoryTest.java
index cec4d6a3d..a6ef8f91c 100644
--- a/weaver/src/test/java/org/aspectj/weaver/Jdk14TraceFactoryTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/Jdk14TraceFactoryTest.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.tools.Jdk14TraceFactory;
 import org.aspectj.weaver.tools.Trace;
 
+import junit.framework.TestCase;
+
 public class Jdk14TraceFactoryTest extends TestCase {
 
 	public void testJdk14TraceFactory() {
diff --git a/weaver/src/test/java/org/aspectj/weaver/JoinPointSignatureIteratorTest.java b/weaver/src/test/java/org/aspectj/weaver/JoinPointSignatureIteratorTest.java
index 143de7333..30d653b89 100644
--- a/weaver/src/test/java/org/aspectj/weaver/JoinPointSignatureIteratorTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/JoinPointSignatureIteratorTest.java
@@ -17,10 +17,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.reflect.ReflectionWorld;
 
+import junit.framework.TestCase;
+
 /**
  * @author Andy Clement
  */
diff --git a/weaver/src/test/java/org/aspectj/weaver/LocaleTest.java b/weaver/src/test/java/org/aspectj/weaver/LocaleTest.java
index e69a4df93..a79afef72 100644
--- a/weaver/src/test/java/org/aspectj/weaver/LocaleTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/LocaleTest.java
@@ -13,11 +13,11 @@ package org.aspectj.weaver;
 import java.io.IOException;
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.generic.Instruction;
 import org.aspectj.apache.bcel.util.ByteSequence;
 
+import junit.framework.TestCase;
+
 public class LocaleTest extends TestCase {
 
 	public LocaleTest(String name) {
diff --git a/weaver/src/test/java/org/aspectj/weaver/MemberTestCase.java b/weaver/src/test/java/org/aspectj/weaver/MemberTestCase.java
index c4755a3db..9b5171a3f 100644
--- a/weaver/src/test/java/org/aspectj/weaver/MemberTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/MemberTestCase.java
@@ -16,10 +16,10 @@ package org.aspectj.weaver;
 
 import java.lang.reflect.Modifier;
 
-import junit.framework.TestCase;
-
 import org.aspectj.testing.util.TestUtil;
 
+import junit.framework.TestCase;
+
 /**
  * This is a test case for all the portions of Member that don't require a world.
  */
diff --git a/weaver/src/test/java/org/aspectj/weaver/ReferenceTypeTestCase.java b/weaver/src/test/java/org/aspectj/weaver/ReferenceTypeTestCase.java
index 5fbc530e7..d4ed852d2 100644
--- a/weaver/src/test/java/org/aspectj/weaver/ReferenceTypeTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/ReferenceTypeTestCase.java
@@ -16,11 +16,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.PartialOrder;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 // test cases for Adrian's additions to ReferenceType
 // XXX - couldn't find any unit test cases for the rest of the ReferenceType class
 public class ReferenceTypeTestCase extends TestCase {
diff --git a/weaver/src/test/java/org/aspectj/weaver/TypeVariableReferenceTypeTestCase.java b/weaver/src/test/java/org/aspectj/weaver/TypeVariableReferenceTypeTestCase.java
index 367a4fc93..d746b302c 100644
--- a/weaver/src/test/java/org/aspectj/weaver/TypeVariableReferenceTypeTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/TypeVariableReferenceTypeTestCase.java
@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /**
  * @author colyer
  * 
diff --git a/weaver/src/test/java/org/aspectj/weaver/TypeVariableTestCase.java b/weaver/src/test/java/org/aspectj/weaver/TypeVariableTestCase.java
index 8ef8f70c1..8a9e63740 100644
--- a/weaver/src/test/java/org/aspectj/weaver/TypeVariableTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/TypeVariableTestCase.java
@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class TypeVariableTestCase extends TestCase {
 
 	private UnresolvedType javaLangNumber;
diff --git a/weaver/src/test/java/org/aspectj/weaver/TypeXTestCase.java b/weaver/src/test/java/org/aspectj/weaver/TypeXTestCase.java
index dc4c2e3d1..d6b60eb5f 100644
--- a/weaver/src/test/java/org/aspectj/weaver/TypeXTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/TypeXTestCase.java
@@ -13,12 +13,12 @@
 
 package org.aspectj.weaver;
 
-import junit.framework.TestCase;
-
 import org.aspectj.testing.util.TestUtil;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /**
  * This is a test case for all the portions of UnresolvedType that don't require a world.
  */
diff --git a/weaver/src/test/java/org/aspectj/weaver/WeaverModuleTests.java b/weaver/src/test/java/org/aspectj/weaver/WeaverModuleTests.java
index ffbe329df..78566e523 100644
--- a/weaver/src/test/java/org/aspectj/weaver/WeaverModuleTests.java
+++ b/weaver/src/test/java/org/aspectj/weaver/WeaverModuleTests.java
@@ -13,12 +13,58 @@ package org.aspectj.weaver;
 
 import org.aspectj.matcher.tools.ReflectionWorldAdvancedPointcutExpressionTest;
 import org.aspectj.util.LangUtil;
-import org.aspectj.weaver.bcel.*;
-import org.aspectj.weaver.patterns.*;
-import org.aspectj.weaver.patterns.bcel.*;
-import org.aspectj.weaver.reflect.*;
-import org.aspectj.weaver.tools.*;
-import org.aspectj.weaver.tools.cache.*;
+import org.aspectj.weaver.bcel.AfterReturningWeaveTestCase;
+import org.aspectj.weaver.bcel.AfterThrowingWeaveTestCase;
+import org.aspectj.weaver.bcel.AfterWeaveTestCase;
+import org.aspectj.weaver.bcel.ArgsWeaveTestCase;
+import org.aspectj.weaver.bcel.AroundArgsWeaveTestCase;
+import org.aspectj.weaver.bcel.AroundWeaveTestCase;
+import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXTestCase;
+import org.aspectj.weaver.bcel.BcelWorldReferenceTypeTest;
+import org.aspectj.weaver.bcel.BeforeWeaveTestCase;
+import org.aspectj.weaver.bcel.CheckerTestCase;
+import org.aspectj.weaver.bcel.ClassLoaderRepositoryTest;
+import org.aspectj.weaver.bcel.FieldSetTestCase;
+import org.aspectj.weaver.bcel.HierarchyDependsTestCase;
+import org.aspectj.weaver.bcel.IdWeaveTestCase;
+import org.aspectj.weaver.bcel.JImageTestCase;
+import org.aspectj.weaver.bcel.MegaZipTestCase;
+import org.aspectj.weaver.bcel.MoveInstructionsWeaveTestCase;
+import org.aspectj.weaver.bcel.NonstaticWeaveTestCase;
+import org.aspectj.weaver.bcel.PatternWeaveTestCase;
+import org.aspectj.weaver.bcel.PointcutResidueTestCase;
+import org.aspectj.weaver.bcel.TjpWeaveTestCase;
+import org.aspectj.weaver.bcel.TraceJarWeaveTestCase;
+import org.aspectj.weaver.bcel.UtilityTestCase;
+import org.aspectj.weaver.bcel.WeaveOrderTestCase;
+import org.aspectj.weaver.bcel.WorldTestCase;
+import org.aspectj.weaver.bcel.ZipTestCase;
+import org.aspectj.weaver.patterns.AnnotationPatternMatchingTestCase;
+import org.aspectj.weaver.patterns.AnnotationPatternTestCase;
+import org.aspectj.weaver.patterns.ConcretizationTestCase;
+import org.aspectj.weaver.patterns.WildTypePatternResolutionTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelAndOrNotTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelBindingTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelModifiersPatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelParserTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelSignaturePatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelTypePatternListTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelTypePatternTestCase;
+import org.aspectj.weaver.patterns.bcel.BcelWithinTestCase;
+import org.aspectj.weaver.reflect.ReflectionWorldReferenceTypeTest;
+import org.aspectj.weaver.reflect.ReflectionWorldTest;
+import org.aspectj.weaver.tools.Java15PointcutExpressionTest;
+import org.aspectj.weaver.tools.PointcutDesignatorHandlerTest;
+import org.aspectj.weaver.tools.PointcutExpressionTest;
+import org.aspectj.weaver.tools.PointcutParserTest;
+import org.aspectj.weaver.tools.ReadingAttributesTest;
+import org.aspectj.weaver.tools.TypePatternMatcherTest;
+import org.aspectj.weaver.tools.cache.DefaultCacheKeyResolverTest;
+import org.aspectj.weaver.tools.cache.DefaultFileCacheBackingTest;
+import org.aspectj.weaver.tools.cache.FlatFileCacheBackingTest;
+import org.aspectj.weaver.tools.cache.SimpleClassCacheTest;
+import org.aspectj.weaver.tools.cache.WeavedClassCacheTest;
+import org.aspectj.weaver.tools.cache.ZippedFileCacheBackingTest;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/weaver/src/test/java/org/aspectj/weaver/WeaverTestCase.java b/weaver/src/test/java/org/aspectj/weaver/WeaverTestCase.java
index 152cae782..6cbc8e7ee 100644
--- a/weaver/src/test/java/org/aspectj/weaver/WeaverTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/WeaverTestCase.java
@@ -14,12 +14,10 @@ package org.aspectj.weaver;
 
 import java.io.File;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
 import org.aspectj.util.FileUtil;
 
+import junit.framework.TestCase;
+
 public abstract class WeaverTestCase extends TestCase {
 
 	public static final String TESTDATA_PATH = "../weaver/testdata";
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/AfterWeaveTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
index a51c69b9a..04c68afde 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/AfterWeaveTestCase.java
@@ -13,7 +13,7 @@
 
 package org.aspectj.weaver.bcel;
 
-import java.io.*;
+import java.io.IOException;
 
 public class AfterWeaveTestCase extends WeaveTestCase {
 	{
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
index 03ded4f6d..5e44c0080 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
@@ -11,19 +11,19 @@
  * ******************************************************************/
 package org.aspectj.weaver.bcel;
 
-import junit.framework.TestCase;
-
 import java.util.Arrays;
 
 import org.aspectj.apache.bcel.Repository;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Signature;
 import org.aspectj.util.GenericSignature;
+import org.aspectj.util.GenericSignature.ClassSignature;
 import org.aspectj.util.GenericSignatureParser;
 import org.aspectj.util.LangUtil;
-import org.aspectj.util.GenericSignature.ClassSignature;
 import org.aspectj.weaver.UnresolvedType;
 
+import junit.framework.TestCase;
+
 /**
  * @author colyer
  * 
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/CheckerTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/CheckerTestCase.java
index b503e9593..7ec480c87 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/CheckerTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/CheckerTestCase.java
@@ -15,10 +15,10 @@ package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
 
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.MessageHandler;
 import org.aspectj.weaver.Checker;
 import org.aspectj.weaver.patterns.DeclareErrorOrWarning;
-import org.aspectj.bridge.*;
-import org.aspectj.bridge.MessageHandler;
 
 public class CheckerTestCase extends WeaveTestCase {
 	{
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
index 2af341d22..a65a25c54 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ClassLoaderRepositoryTest.java
@@ -23,10 +23,10 @@ import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.util.ClassLoaderRepository;
 
+import junit.framework.TestCase;
+
 /** NOT YET INCLUDED IN A FULL TEST RUN - WORK IN PROGRESS CHECKING CLASSLOADERREPOSITORY OPTIMIZATIONS */
 public class ClassLoaderRepositoryTest extends TestCase {
 	private File f;
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/MegaZipTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/MegaZipTestCase.java
index ba71761b4..4e24bb555 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/MegaZipTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/MegaZipTestCase.java
@@ -19,12 +19,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.aspectj.weaver.AdviceKind;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.MemberImpl;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.ShadowMunger;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 
 public class MegaZipTestCase extends WeaveTestCase {
 
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
index 1f67a6249..29e1ac8d7 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/NonstaticWeaveTestCase.java
@@ -15,8 +15,13 @@ package org.aspectj.weaver.bcel;
 
 import java.io.IOException;
 
-import org.aspectj.weaver.*;
-import org.aspectj.weaver.patterns.*;
+import org.aspectj.weaver.CrosscuttingMembers;
+import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.ShadowMunger;
+import org.aspectj.weaver.patterns.PatternParser;
+import org.aspectj.weaver.patterns.PerClause;
+import org.aspectj.weaver.patterns.PerSingleton;
+import org.aspectj.weaver.patterns.TestScope;
 
 public class NonstaticWeaveTestCase extends WeaveTestCase {
 	{
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/UtilityTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/UtilityTestCase.java
index 8083c1532..4fe6fb661 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/UtilityTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/UtilityTestCase.java
@@ -12,7 +12,7 @@
 
 
 package org.aspectj.weaver.bcel;
-import java.io.*;
+import java.io.IOException;
 
 import junit.framework.TestCase;
 
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/WeaveOrderTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
index f22805f11..6847fb9d2 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
@@ -13,8 +13,14 @@
 
 package org.aspectj.weaver.bcel;
 
-import org.aspectj.weaver.patterns.*;
-import org.aspectj.weaver.*;
+import org.aspectj.weaver.Advice;
+import org.aspectj.weaver.AdviceKind;
+import org.aspectj.weaver.CrosscuttingMembers;
+import org.aspectj.weaver.MemberImpl;
+import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.patterns.Declare;
+import org.aspectj.weaver.patterns.PatternParser;
 
 /**.
  */
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/WorldTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/WorldTestCase.java
index 65d079543..8e7aa1448 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/WorldTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/WorldTestCase.java
@@ -15,7 +15,6 @@ package org.aspectj.weaver.bcel;
 import java.lang.reflect.Modifier;
 
 import org.aspectj.weaver.Advice;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.CommonWorldTests;
 import org.aspectj.weaver.Member;
 import org.aspectj.weaver.MemberImpl;
@@ -24,6 +23,7 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ShadowMunger;
 import org.aspectj.weaver.TestUtils;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.World;
 
 /**
diff --git a/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java b/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
index 71f3bc926..bf1453a49 100644
--- a/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/bcel/ZipTestCase.java
@@ -16,10 +16,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
 
-import junit.framework.TestCase;
-
 import org.aspectj.weaver.WeaverTestCase;
 
+import junit.framework.TestCase;
+
 public class ZipTestCase extends TestCase {
 
 	File outDir;
diff --git a/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java b/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
index 753e7a6b0..6852da6b7 100644
--- a/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
@@ -14,18 +14,18 @@ package org.aspectj.weaver.patterns;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessage.Kind;
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.util.LangUtil;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 /*
  * Sample types that this program uses are:
 
diff --git a/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java b/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
index 899b40b8e..fdf8d5424 100644
--- a/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
@@ -9,17 +9,17 @@
  * ******************************************************************/
 package org.aspectj.weaver.patterns;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.AnnotatedElement;
 import org.aspectj.weaver.AnnotationAJ;
-import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.WeaverTestCase;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public class AnnotationPatternTestCase extends TestCase {
 
 	public void testParseSimpleAnnotationPattern() {
diff --git a/weaver/src/test/java/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java b/weaver/src/test/java/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
index 5eda5d577..73f4854af 100644
--- a/weaver/src/test/java/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
+++ b/weaver/src/test/java/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
@@ -15,8 +15,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
+import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 import org.aspectj.weaver.BoundedReferenceType;
 import org.aspectj.weaver.CompressingDataOutputStream;
 import org.aspectj.weaver.ResolvedType;
@@ -24,9 +23,10 @@ import org.aspectj.weaver.TypeFactory;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.VersionedDataInputStream;
 import org.aspectj.weaver.World;
-import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 // TODO write test cases for instanceof matching
 
 public class WildTypePatternResolutionTestCase extends TestCase {
diff --git a/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java b/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
index 72c7c85f7..a0465b34a 100644
--- a/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java
@@ -15,8 +15,6 @@ import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.weaver.ReferenceType;
 import org.aspectj.weaver.ResolvedMember;
@@ -24,6 +22,8 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.bcel.BcelWorld;
 
+import junit.framework.TestCase;
+
 public abstract class ReflectionBasedReferenceTypeDelegateTest extends TestCase {
 
 	protected ReflectionWorld world;
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java
index f651a2f29..e1a140803 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java
@@ -39,12 +39,11 @@ import org.aspectj.weaver.patterns.TypePattern;
 import org.aspectj.weaver.patterns.TypePatternList;
 import org.aspectj.weaver.patterns.WildAnnotationTypePattern;
 
-import test.A1AnnotatedType;
-import test.A2AnnotatedType;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import test.A1AnnotatedType;
+import test.A2AnnotatedType;
 
 /**
  * Test parameter pointcut parsing.  Extended by Andy Clement to cover parameter annotation matching.
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutDesignatorHandlerTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutDesignatorHandlerTest.java
index 83d7b461d..ca9835c29 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutDesignatorHandlerTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutDesignatorHandlerTest.java
@@ -11,10 +11,10 @@
  * ******************************************************************/
 package org.aspectj.weaver.tools;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.LangUtil;
 
+import junit.framework.TestCase;
+
 /**
  * @author Adrian Colyer
  * 
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutExpressionTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutExpressionTest.java
index 46189fd32..ab7762525 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutExpressionTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutExpressionTest.java
@@ -14,10 +14,10 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.LangUtil;
 
+import junit.framework.TestCase;
+
 public class PointcutExpressionTest extends TestCase {
 
 	PointcutParser p;
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java
index 4654b049d..9488a5e90 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/PointcutParserTest.java
@@ -13,9 +13,6 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.aspectj.bridge.AbortException;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.IMessage.Kind;
@@ -25,6 +22,9 @@ import org.aspectj.weaver.patterns.PatternParser;
 import org.aspectj.weaver.patterns.Pointcut;
 import org.aspectj.weaver.patterns.PointcutRewriter;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 /**
  * Test cases for the PointcutParser class
  */
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/ReadingAttributesTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/ReadingAttributesTest.java
index 5814aa90f..11f74ebc1 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/ReadingAttributesTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/ReadingAttributesTest.java
@@ -15,8 +15,6 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.TestCase;
-
 import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Unknown;
@@ -25,6 +23,8 @@ import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.weaver.VersionedDataInputStream;
 import org.aspectj.weaver.WeaverStateInfo;
 
+import junit.framework.TestCase;
+
 public class ReadingAttributesTest extends TestCase {
 
 	public void testSkip() {} // Review what to do about these tests
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/cache/AbstractCacheBackingTestSupport.java b/weaver/src/test/java/org/aspectj/weaver/tools/cache/AbstractCacheBackingTestSupport.java
index d66626f5c..3539ede2a 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/cache/AbstractCacheBackingTestSupport.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/cache/AbstractCacheBackingTestSupport.java
@@ -27,12 +27,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
-import junit.framework.TestCase;
-
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 import org.aspectj.weaver.tools.cache.AbstractIndexedFileCacheBacking.IndexEntry;
 
+import junit.framework.TestCase;
+
 /**
  */
 public abstract class AbstractCacheBackingTestSupport extends TestCase {
diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java
index 139488b3c..1e240eee3 100644
--- a/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java
+++ b/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java
@@ -12,13 +12,13 @@
 
 package org.aspectj.weaver.tools.cache;
 
-import junit.framework.TestCase;
-
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.Collections;
 
+import junit.framework.TestCase;
+
 /**
  */
 public class DefaultCacheKeyResolverTest extends TestCase {
diff --git a/weaver/src/test/java/test/A3.java b/weaver/src/test/java/test/A3.java
index ab54388ae..71678c531 100644
--- a/weaver/src/test/java/test/A3.java
+++ b/weaver/src/test/java/test/A3.java
@@ -11,7 +11,8 @@
  * ******************************************************************/
 package test;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
 public @interface A3 {