Cleanup import ordering
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
index 2136871..461d271 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
@@ -16,12 +16,12 @@
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.TestCase;
-
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class ArrayConstantTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
index 818e048..a15053f 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
@@ -17,8 +17,6 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import com.google.inject.AbstractModule;
import com.google.inject.ConfigurationException;
import com.google.inject.Guice;
@@ -27,6 +25,8 @@
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class BeanConstantTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
index fdcdb5b..6e9e241 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
@@ -10,12 +10,12 @@
*******************************************************************************/
package org.eclipse.sisu.plexus;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.configurator.converters.special.ClassRealmConverter;
+import junit.framework.TestCase;
+
public class ClassRealmConverterTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
index 24a3036..6e000af 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
@@ -21,12 +21,12 @@
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.TestCase;
-
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class CollectionConstantTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
index 8b4b75e..278f746 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
@@ -13,10 +13,10 @@
import java.util.Arrays;
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
+import junit.framework.TestCase;
+
public class ComponentAnnotationTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
index d93f8e3..9aa8fa7 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
@@ -13,10 +13,10 @@
import java.util.Arrays;
import java.util.HashSet;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Configuration;
+import junit.framework.TestCase;
+
public class ConfigurationAnnotationTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
index 5e23e58..222b816 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
@@ -17,8 +17,6 @@
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.TestCase;
-
import com.google.inject.AbstractModule;
import com.google.inject.ConfigurationException;
import com.google.inject.Guice;
@@ -26,6 +24,8 @@
import com.google.inject.Key;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class DateConstantTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
index 04fddfa..6b74086 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
@@ -13,13 +13,13 @@
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.configurator.BasicComponentConfigurator;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import junit.framework.TestCase;
+
public class DefaultValuesTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
index 524181a..5e61886 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
@@ -13,10 +13,10 @@
import java.util.Arrays;
import java.util.Collections;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Requirement;
+import junit.framework.TestCase;
+
public class HintsTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
index 7d534ab..d14ee82 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
@@ -19,12 +19,12 @@
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.TestCase;
-
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class MapConstantTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
index 040c5d6..68d3d10 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
@@ -14,14 +14,14 @@
import java.util.Iterator;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.sisu.bean.BeanProperties;
import org.eclipse.sisu.bean.BeanProperty;
+import junit.framework.TestCase;
+
public class PlexusAnnotatedBeanMetadataTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
index d9e5319..787f625 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
@@ -13,8 +13,6 @@
import java.util.Iterator;
import java.util.Map.Entry;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.ClassWorldException;
import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
@@ -34,6 +32,8 @@
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
@SuppressWarnings( "deprecation" )
public class PlexusBeanLocatorTest
extends TestCase
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
index 0e051bb..899b54a 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
@@ -13,8 +13,6 @@
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Configuration;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.sisu.bean.BeanManager;
@@ -30,6 +28,8 @@
import com.google.inject.Key;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class PlexusBeanMetadataTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
index 0d1b39b..cec8fc8 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
@@ -12,8 +12,6 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Configuration;
import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -26,6 +24,8 @@
import com.google.inject.Injector;
import com.google.inject.ProvisionException;
+import junit.framework.TestCase;
+
public class PlexusConfigurationTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
index 1a18c61..c52bf4d 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
@@ -13,8 +13,6 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
@@ -23,6 +21,8 @@
import com.google.inject.AbstractModule;
+import junit.framework.TestCase;
+
public class PlexusLifecycleTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
index d4723c8..1a4e3ac 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
@@ -12,8 +12,6 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.sisu.bean.BeanManager;
@@ -25,6 +23,8 @@
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
+import junit.framework.TestCase;
+
public class PlexusLoggingTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
index 0a60daa..6997914 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
@@ -23,8 +23,6 @@
import javax.inject.Inject;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.sisu.inject.DeferredClass;
@@ -40,6 +38,8 @@
import com.google.inject.Scopes;
import com.google.inject.name.Names;
+import junit.framework.TestCase;
+
public class PlexusRequirementTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
index 0730773..945522f 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
@@ -21,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.sisu.bean.BeanProperty;
@@ -37,6 +35,8 @@
import com.google.inject.TypeLiteral;
+import junit.framework.TestCase;
+
public class PlexusXmlScannerTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RealmDisposalTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RealmDisposalTest.java
index 91e489a..18dc834 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RealmDisposalTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RealmDisposalTest.java
@@ -12,11 +12,11 @@
import java.io.File;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import junit.framework.TestCase;
+
public class RealmDisposalTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
index 177c1f6..d378607 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
@@ -16,10 +16,10 @@
import java.util.HashSet;
import java.util.List;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Requirement;
+import junit.framework.TestCase;
+
public class RequirementAnnotationTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
index 538cf1b..cc5b951 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
@@ -13,8 +13,6 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -24,6 +22,8 @@
import com.google.inject.name.Names;
import com.google.inject.util.Types;
+import junit.framework.TestCase;
+
public class RolesTest
extends TestCase
{
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
index 43407de..d79631a 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
@@ -16,13 +16,13 @@
import java.io.InputStream;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.DefaultContext;
+import junit.framework.TestCase;
+
public abstract class PlexusTestCase
extends TestCase
{
