3 files changed, 41 insertions, 36 deletions
diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index c33b31b550..c527e0920b 100644
--- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
@@ -18,14 +18,15 @@
  */
 package org.apache.tuscany.sca.contribution.processor;
 
+import static junit.framework.Assert.assertNotNull;
+
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProcessor;
+import org.junit.Test;
 
 /**
  * Folder Package Processor test case
@@ -33,9 +34,10 @@ import org.apache.tuscany.sca.contribution.processor.impl.FolderContributionProc
  * 
  * @version $Rev$ $Date$
  */
-public class FolderContributionPackageProcessorTestCase extends TestCase {
+public class FolderContributionPackageProcessorTestCase {
     private static final String FOLDER_CONTRIBUTION = ".";
-    
+
+    @Test
     public final void testProcessPackageArtifacts() throws Exception {
         FolderContributionProcessor folderProcessor = new FolderContributionProcessor();
         URL contributionURL = new File(FOLDER_CONTRIBUTION).toURL().toURI().toURL();
diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 9b3dce7029..a59465340c 100644
--- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
@@ -18,15 +18,16 @@
  */
 package org.apache.tuscany.sca.contribution.processor;
 
+import static junit.framework.Assert.assertNotNull;
+
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.tuscany.sca.contribution.processor.impl.JarContributionProcessor;
 import org.apache.tuscany.sca.contribution.service.util.IOHelper;
+import org.junit.Test;
 
 /**
  * JAR Package Processor test case
@@ -35,9 +36,10 @@ import org.apache.tuscany.sca.contribution.service.util.IOHelper;
  * @version $Rev$ $Date$
  */
 
-public class JarContributionPackageProcessorTestCase extends TestCase {
+public class JarContributionPackageProcessorTestCase {
     private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
-    
+
+    @Test
     public final void testProcessPackageArtifacts() throws Exception {
         JarContributionProcessor jarProcessor = new JarContributionProcessor();
 
@@ -49,7 +51,7 @@ public class JarContributionPackageProcessorTestCase extends TestCase {
         } finally {
             IOHelper.closeQuietly(jarStream);
         }
-        
+
         assertNotNull(artifacts);
     }
 }
diff --git a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 46b4183380..7b3d8dadc0 100644
--- a/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/branches/sca-equinox/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
@@ -19,17 +19,18 @@
 
 package org.apache.tuscany.sca.contribution.processor;
 
+import static junit.framework.Assert.assertNotNull;
+
 import java.net.URI;
 import java.net.URL;
 
-import junit.framework.TestCase;
-
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 /**
  * URL Artifact Processor Extension Point test case
@@ -37,78 +38,78 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry;
  * 
  * @version $Rev$ $Date$
  */
-public class URLartifactProcessorExtensionPointTestCase extends TestCase {
-    
-    private URLArtifactProcessorExtensionPoint artifactProcessors;
-    
-    @Override
-    protected void setUp() throws Exception {
+public class URLartifactProcessorExtensionPointTestCase {
+
+    private static URLArtifactProcessorExtensionPoint artifactProcessors;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
         ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
         artifactProcessors = new DefaultURLArtifactProcessorExtensionPoint(extensionPoints);
         artifactProcessors.addArtifactProcessor(new FileTypeArtifactProcessor());
         artifactProcessors.addArtifactProcessor(new FileNameArtifactProcessor());
     }
-    
-    
+
+    @Test
     public final void testFileTypeProcessor() {
         assertNotNull(artifactProcessors.getProcessor(".m1"));
     }
-    
-    
+
+    @Test
     public final void testFileNameProcessor() {
         assertNotNull(artifactProcessors.getProcessor("file.m2"));
-        
+
     }
-    
+
     /**
      * Internal mock classes
      *
      */
-    
+
     private class M1 {
     }
-    
+
     private class M2 {
     }
-    
-    private class FileTypeArtifactProcessor implements URLArtifactProcessor<M1> {
+
+    private static class FileTypeArtifactProcessor implements URLArtifactProcessor<M1> {
         public FileTypeArtifactProcessor() {
         }
 
         public M1 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
             return null;
         }
-        
+
         public void resolve(M1 m1, ModelResolver resolver) throws ContributionResolveException {
         }
 
         public String getArtifactType() {
             return ".m1";
         }
-        
+
         public Class<M1> getModelType() {
             return M1.class;
-        }        
+        }
     }
-    
-    private class FileNameArtifactProcessor implements URLArtifactProcessor<M2> {
+
+    private static class FileNameArtifactProcessor implements URLArtifactProcessor<M2> {
         public FileNameArtifactProcessor() {
         }
 
         public M2 read(URL contributionURL, URI uri, URL url) throws ContributionReadException {
             return null;
         }
-        
+
         public void resolve(M2 m2, ModelResolver resolver) throws ContributionResolveException {
         }
 
         public String getArtifactType() {
             return "file.m2";
         }
-        
+
         public Class<M2> getModelType() {
             return M2.class;
-        }        
+        }
     }
 
 }