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

[antelder]

Author: antelder
Date: Sat Mar 18 00:14:45 2006
New Revision: 386823

URL: http://svn.apache.org/viewcvs?rev=386823&view=rev
Log:
Apply patch from Daniel Kulpfor to fix JIRA TUSCANY-121

Modified:
    
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
    
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
    
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java

Modified: 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java?rev=386823&r1=386822&r2=386823&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/impl/JavaScriptImplementationTestCase.java
 Sat Mar 18 00:14:45 2006
@@ -27,6 +27,7 @@
 
     private JavaScriptImplementationImpl impl = (JavaScriptImplementationImpl) 
new JavaScriptAssemblyFactoryImpl()
             .createJavaScriptImplementation();
+    private ClassLoader origLoader;
 
     public void testDummy(){} // remove when tests added back
     
@@ -65,11 +66,12 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        origLoader = Thread.currentThread().getContextClassLoader();
         
Thread.currentThread().setContextClassLoader(JavaScriptImplementationTestCase.class.getClassLoader());
     }
 
     protected void tearDown() throws Exception {
-        Thread.currentThread().setContextClassLoader(null);
+        Thread.currentThread().setContextClassLoader(origLoader);
         super.tearDown();
     }
 }

Modified: 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java?rev=386823&r1=386822&r2=386823&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/assembly/tests/JavaScriptAssemblyLoaderTestCase.java
 Sat Mar 18 00:14:45 2006
@@ -28,6 +28,7 @@
 public class JavaScriptAssemblyLoaderTestCase extends TestCase {
 
     private AssemblyModelContext modelContext;
+    private ClassLoader origLoader;
 
     /**
      *
@@ -68,9 +69,15 @@
 
     protected void setUp() throws Exception {
         super.setUp();
-
+        origLoader = Thread.currentThread().getContextClassLoader();
+        
         
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
         modelContext = new AssemblyModelContextImpl(null,null);
+    }
+    
+    protected void tearDown() throws Exception {
+        Thread.currentThread().setContextClassLoader(origLoader);
+        super.tearDown();
     }
 
 }

Modified: 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java?rev=386823&r1=386822&r2=386823&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/container.js/src/test/java/org/apache/tuscany/container/js/config/ModuleComponentConfigurationLoaderTestCase.java
 Sat Mar 18 00:14:45 2006
@@ -45,6 +45,7 @@
  */
 public class ModuleComponentConfigurationLoaderTestCase extends TestCase {
     private ModuleComponentConfigurationLoader loader;
+    private ClassLoader origLoader;
 
     public void testFoo() throws ConfigurationException {
         URL xml = 
ModuleComponentConfigurationLoaderTestCase.class.getResource("ModuleComponentLoaderTest1.module");
@@ -66,6 +67,7 @@
 
     protected void setUp() throws Exception {
         super.setUp();
+        origLoader = Thread.currentThread().getContextClassLoader();
         
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
         List<SCDLModelLoader> scdlLoaders=new ArrayList<SCDLModelLoader>();
         JavaScriptSCDLModelLoader jsLoader=new JavaScriptSCDLModelLoader();
@@ -74,5 +76,9 @@
         AssemblyModelContext modelContext=new AssemblyModelContextImpl(
                 new AssemblyFactoryImpl(), modelLoader,new 
ResourceLoaderImpl(this.getClass().getClassLoader()));
           loader = new ModuleComponentConfigurationLoaderImpl(modelContext);
+    }
+    
+    protected void tearDown() throws Exception {
+        Thread.currentThread().setContextClassLoader(origLoader);
     }
 }