svn commit: r388238 - in /incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java: assembly/impl/ assembly/tests/ config/

[jboynes]

Author: jboynes
Date: Thu Mar 23 11:25:31 2006
New Revision: 388238

URL: http://svn.apache.org/viewcvs?rev=388238&view=rev
Log:
apply patch for TUSCANY-129 from Daniel Kulp

Modified:
    
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
    
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
    
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java

Modified: 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java?rev=388238&r1=388237&r2=388238&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/impl/JavaImplementationTestCase.java
 Thu Mar 23 11:25:31 2006
@@ -38,7 +38,8 @@
  */
 public class JavaImplementationTestCase extends TestCase {
     private JavaImplementationImpl impl = (JavaImplementationImpl) new 
JavaAssemblyFactoryImpl().createJavaImplementation();
-
+    private ClassLoader origLoader;
+    
     public void testFoo() {
         impl.setImplementationClass(HelloWorldImpl.class);
 
@@ -127,11 +128,12 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        origLoader = Thread.currentThread().getContextClassLoader();
         
Thread.currentThread().setContextClassLoader(JavaImplementationTestCase.class.getClassLoader());
     }
 
     protected void tearDown() throws Exception {
-        Thread.currentThread().setContextClassLoader(null);
+        Thread.currentThread().setContextClassLoader(origLoader);
         super.tearDown();
     }
 }

Modified: 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java?rev=388238&r1=388237&r2=388238&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/assembly/tests/JavaAssemblyLoaderTestCase.java
 Thu Mar 23 11:25:31 2006
@@ -40,7 +40,8 @@
 /**
  */
 public class JavaAssemblyLoaderTestCase extends TestCase {
-
+    ClassLoader origLoader;
+    
     /**
      *
      */
@@ -82,7 +83,12 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        origLoader = Thread.currentThread().getContextClassLoader();
         
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+    }
+    protected void tearDown() throws Exception {
+        Thread.currentThread().setContextClassLoader(origLoader);
+        super.tearDown();
     }
 
 }

Modified: 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java?rev=388238&r1=388237&r2=388238&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.java/src/test/java/org/apache/tuscany/container/java/config/ModuleComponentConfigurationLoaderTestCase.java
 Thu Mar 23 11:25:31 2006
@@ -46,6 +46,7 @@
 public class ModuleComponentConfigurationLoaderTestCase extends TestCase {
     private ModuleComponentConfigurationLoader loader;
     private AssemblyModelContext modelContext;
+    private ClassLoader origLoader;
 
     public void testFoo() throws ConfigurationException {
         URL xml = 
ModuleComponentConfigurationLoaderTestCase.class.getResource("ModuleComponentLoaderTest1.module");
@@ -68,6 +69,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        origLoader = Thread.currentThread().getContextClassLoader();
         
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
         List<SCDLModelLoader> scdlLoaders=new ArrayList<SCDLModelLoader>();
         JavaSCDLModelLoader javaLoader=new JavaSCDLModelLoader();
@@ -76,5 +78,9 @@
         modelContext=new AssemblyModelContextImpl(new AssemblyFactoryImpl(), 
modelLoader,
                 new ResourceLoaderImpl(this.getClass().getClassLoader()));
           loader = new ModuleComponentConfigurationLoaderImpl(modelContext);
+    }
+    protected void tearDown() throws Exception {
+        Thread.currentThread().setContextClassLoader(origLoader);
+        super.tearDown();
     }
 }