Author: dkulp
Date: Wed Jun 11 18:05:40 2008
New Revision: 666939
URL: http://svn.apache.org/viewvc?rev=666939&view=rev
Log:
Merged revisions 666938 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r666938 | dkulp | 2008-06-11 20:55:29 -0400 (Wed, 11 Jun 2008) | 2 lines
Add some cleanup things so tests will pass.
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=666939&r1=666938&r2=666939&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
Wed Jun 11 18:05:40 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/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?rev=666939&r1=666938&r2=666939&view=diff
==============================================================================
---
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
(original)
+++
cxf/branches/2.0.x-fixes/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
Wed Jun 11 18:05:40 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";;
