svn commit: r666938 - in /cxf/trunk/rt/core/src/test/java/org/apache/cxf: bus/spring/SpringBusFactoryTest.java wsdl11/WSDLDefinitionBuilderTest.java

[dkulp]

Author: dkulp
Date: Wed Jun 11 17:55:29 2008
New Revision: 666938

URL: http://svn.apache.org/viewvc?rev=666938&view=rev
Log:
Add some cleanup things so tests will pass.

Modified:
    
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
    
cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java

Modified: 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=666938&r1=666937&r2=666938&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
 (original)
+++ 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
 Wed Jun 11 17:55:29 2008
@@ -30,6 +30,7 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
@@ -49,11 +50,17 @@
 import org.apache.cxf.workqueue.WorkQueueManager;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.easymock.EasyMock;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class SpringBusFactoryTest extends Assert {
 
+    @After
+    public void tearDown() {
+        BusFactory.setDefaultBus(null);
+    }
+    
     @Test
     public void testDefault() {
         Bus bus = new SpringBusFactory().createBus();

Modified: 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?rev=666938&r1=666937&r2=666938&view=diff
==============================================================================
--- 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
 (original)
+++ 
cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
 Wed Jun 11 17:55:29 2008
@@ -32,10 +32,16 @@
 
 import org.apache.cxf.BusFactory;
 import org.junit.Assert;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class WSDLDefinitionBuilderTest extends Assert {
-
+    @BeforeClass
+    public static void ensureNewBus() {
+        BusFactory.setDefaultBus(null);
+    }
+    
+    
     @Test
     public void testBuildSimpleWSDL() throws Exception {
         String qname = "http://apache.org/hello_world_soap_http";;