cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r533999 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/binding/ api/src/main/java/org/apache/cxf/message/ api/src/main/java/org/apache/cxf/wsdl/ api/src/test/java/org/apache/cxf/ api/src/test/java/org/apache/cxf/phase/ api/src/...
Date Tue, 01 May 2007 10:42:21 GMT
Author: andreasmyth
Date: Tue May  1 03:42:19 2007
New Revision: 533999

URL: http://svn.apache.org/viewvc?view=rev&rev=533999
Log:
JUnit4

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingFactory.java
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
    incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStreamTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingFactory.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingFactory.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/binding/BindingFactory.java Tue May  1 03:42:19 2007
@@ -41,7 +41,7 @@
      * @param service
      * @param namespace
      * @param configObject - binding specific configuration object
-     * @return
+     * @return the BindingInfo object
      */
     BindingInfo createBindingInfo(Service service, String namespace, Object configObject);
     

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageUtils.java Tue May  1 03:42:19 2007
@@ -101,7 +101,7 @@
     /**
      * Returns true if a value is either the String "true" or Boolean.TRUE.
      * @param value
-     * @return
+     * @return true iff value is either the String "true" or Boolean.TRUE
      */
     public static boolean isTrue(Object value) {
         if (Boolean.TRUE.equals(value) || "true".equals(value)) {

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Tue May  1 03:42:19 2007
@@ -562,7 +562,7 @@
     
     /**
      * Create a duplicate endpoint reference sharing all atributes
-     * @param ret to duplicate
+     * @param ref the reference to duplicate
      * @return EndpointReferenceType - the duplicate endpoint reference
      */
     public static EndpointReferenceType duplicate(EndpointReferenceType ref) {
@@ -656,7 +656,7 @@
     
     /**
      * Obtain the id String from the endpoint reference of the current dispatch. 
-     * @param contextMap the current message context 
+     * @param messageContext the current message context 
      * @return the id embedded in the current endpoint reference or null if not found
      */
     public static String getEndpointReferenceId(Map messageContext) {

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java Tue May  1 03:42:19 2007
@@ -19,22 +19,25 @@
 
 package org.apache.cxf;
 
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 
-public class BusFactoryTest extends TestCase {
+public class BusFactoryTest extends Assert {
     
+    @After
     public void tearDown() {
         System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);        
     }
     
+    @Test
     public void testGetInstance() {
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, TestBusFactory.class.getName());
         BusFactory factory = BusFactory.newInstance();
         assertTrue(factory instanceof TestBusFactory);
     }
-    
     
     public static class TestBusFactory extends BusFactory {
 

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java Tue May  1 03:42:19 2007
@@ -25,14 +25,16 @@
 import java.util.List;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.message.Message;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class PhaseInterceptorChainTest extends TestCase {
+public class PhaseInterceptorChainTest extends Assert {
 
     private IMocksControl control;
 
@@ -40,6 +42,7 @@
 
     private Message message;
 
+    @Before
     public void setUp() {
 
         control = EasyMock.createNiceControl();
@@ -56,10 +59,12 @@
         chain = new PhaseInterceptorChain(phases);
     }
 
+    @After
     public void tearDown() {
         control.verify();
     }
 
+    @Test
     public void testAddOneInterceptor() {
         AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
         control.replay();
@@ -69,6 +74,7 @@
         assertTrue(!it.hasNext());
     }
     
+    @Test
     public void testForceAddSameInterceptor() {
 
         AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
@@ -85,6 +91,7 @@
         assertTrue(!it.hasNext()); 
     }
     
+    @Test
     public void testForceAddSameInterceptorType() {
 
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
@@ -102,6 +109,7 @@
         assertTrue(!it.hasNext()); 
     }
 
+    @Test
     public void testAddTwoInterceptorsSamePhase() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         Set<String> after = new HashSet<String>();
@@ -132,6 +140,7 @@
         return p;
     }
     
+    @Test
     public void testThreeInterceptorSamePhaseWithOrder() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         Set<String> before = new HashSet<String>();
@@ -153,6 +162,7 @@
         assertTrue(!it.hasNext());
     }
 
+    @Test
     public void testSingleInterceptorPass() {
         AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, false, false);
@@ -161,6 +171,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testSingleInterceptorFail() {
         AbstractPhaseInterceptor p = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p, true, true);
@@ -169,6 +180,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testTwoInterceptorsInSamePhasePass() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, false);
@@ -180,6 +192,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testThreeInterceptorsInSamePhaseSecondFail() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
@@ -193,6 +206,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testTwoInterceptorsInSamePhaseSecondFail() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
@@ -204,6 +218,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testTwoInterceptorsInDifferentPhasesPass() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, false);
@@ -215,6 +230,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testTwoInterceptorsInDifferentPhasesSecondFail() {
         AbstractPhaseInterceptor p1 = setUpPhaseInterceptor("phase1", "p1");
         setUpPhaseInterceptorInvocations(p1, false, true);
@@ -226,6 +242,7 @@
         chain.doIntercept(message);
     }
 
+    @Test
     public void testInsertionInDifferentPhasePass() {
 
         AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase2", "p2");
@@ -242,6 +259,7 @@
         assertEquals(0, p1.faultInvoked);
     }
 
+    @Test
     public void testInsertionInSamePhasePass() {
 
         AbstractPhaseInterceptor p2 = setUpPhaseInterceptor("phase1", "p2");
@@ -262,6 +280,7 @@
         assertEquals(0, p1.faultInvoked);
     }
 
+    @Test
     public void testWrappedInvocation() throws Exception {
         CountingPhaseInterceptor p1 = new CountingPhaseInterceptor("phase1",
                 "p1");
@@ -283,6 +302,7 @@
         assertEquals(1, p3.invoked);
     }
 
+    @Test
     public void testChainInvocationStartFromSpecifiedInterceptor() throws Exception {
         CountingPhaseInterceptor p1 = new CountingPhaseInterceptor("phase1",
                 "p1");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java Tue May  1 03:42:19 2007
@@ -21,18 +21,22 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class BindingFaultInfoTest extends TestCase {
+public class BindingFaultInfoTest extends Assert {
     
     private BindingFaultInfo bindingFaultInfo;
     
+    @Before
     public void setUp() throws Exception {
         FaultInfo faultInfo = new FaultInfo(new QName("http://faultns/", "fault"), new QName(
             "http://apache.org/hello_world_soap_http", "faultMessage"), null);
         bindingFaultInfo = new BindingFaultInfo(faultInfo, null);
     }
 
+    @Test
     public void testBindingFaultInfo() {
         assertNotNull(bindingFaultInfo.getFaultInfo());
         assertNull(bindingFaultInfo.getBindingOperation());

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingMessageInfoTest.java Tue May  1 03:42:19 2007
@@ -21,18 +21,22 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class BindingMessageInfoTest extends TestCase {
+public class BindingMessageInfoTest extends Assert {
 
     private BindingMessageInfo bindingMessageInfo;
     
+    @Before
     public void setUp() throws Exception {
         MessageInfo messageInfo = new MessageInfo(null, new QName(
               "http://apache.org/hello_world_soap_http", "testMessage"));
         bindingMessageInfo = new BindingMessageInfo(messageInfo, null);
     }
     
+    @Test
     public void testMessage() {
         assertNotNull(bindingMessageInfo.getMessageInfo());
         assertEquals(bindingMessageInfo.getMessageInfo().getName().getLocalPart(), "testMessage");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java Tue May  1 03:42:19 2007
@@ -21,12 +21,15 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class BindingOperationInfoTest extends TestCase {
+public class BindingOperationInfoTest extends Assert {
     private static final String TEST_NS = "urn:test:ns";
     private BindingOperationInfo bindingOperationInfo;
     
+    @Before
     public void setUp() throws Exception {
         OperationInfo operationInfo = new OperationInfo(null, new QName(TEST_NS, "operationTest"));
         MessageInfo inputMessage = operationInfo.createMessage(new QName(
@@ -41,14 +44,17 @@
         bindingOperationInfo = new BindingOperationInfo(null, operationInfo);
     }
     
+    @Test
     public void testName() throws Exception {
         assertEquals(bindingOperationInfo.getName(), new QName(TEST_NS, "operationTest"));
     }
     
+    @Test
     public void testBinding() throws Exception {
         assertNull(bindingOperationInfo.getBinding());
     }
     
+    @Test
     public void testOperation() throws Exception {
         assertEquals(bindingOperationInfo.getOperationInfo().getName(), new QName(TEST_NS, "operationTest"));
         assertTrue(bindingOperationInfo.getOperationInfo().hasInput());
@@ -60,6 +66,7 @@
         assertEquals(1, bindingOperationInfo.getFaults().size());
     }
     
+    @Test
     public void testInputMessage() throws Exception {
         BindingMessageInfo inputMessage = bindingOperationInfo.getInput();
         assertNotNull(inputMessage);
@@ -68,6 +75,7 @@
                      "http://apache.org/hello_world_soap_http");
     }
     
+    @Test
     public void testOutputMessage() throws Exception {
         BindingMessageInfo outputMessage = bindingOperationInfo.getOutput();
         assertNotNull(outputMessage);
@@ -76,6 +84,7 @@
                      "http://apache.org/hello_world_soap_http");
     }
     
+    @Test
     public void testFaultMessage() throws Exception {
         BindingFaultInfo faultMessage = bindingOperationInfo.getFaults().iterator().next();
         assertNotNull(faultMessage);

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java Tue May  1 03:42:19 2007
@@ -21,21 +21,21 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class FaultInfoTest extends TestCase {
+public class FaultInfoTest extends Assert {
     
     private FaultInfo faultInfo;
     
+    @Before
     public void setUp() throws Exception {
         faultInfo = new FaultInfo(new QName("urn:test:ns", "fault"), new QName(
              "http://apache.org/hello_world_soap_http", "faultMessage"), null);
     }
     
-    public void tearDown() throws Exception {
-        
-    }
-    
+    @Test
     public void testName() throws Exception {
         assertEquals(faultInfo.getFaultName(), new QName("urn:test:ns", "fault"));
         assertEquals(faultInfo.getName().getLocalPart(), "faultMessage");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java Tue May  1 03:42:19 2007
@@ -21,17 +21,21 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class InterfaceInfoTest extends TestCase {
+public class InterfaceInfoTest extends Assert {
     
     private InterfaceInfo interfaceInfo;
 
+    @Before
     public void setUp() throws Exception {
         interfaceInfo = new InterfaceInfo(new ServiceInfo(), new QName(
             "http://apache.org/hello_world_soap_http", "interfaceTest"));
     }
     
+    @Test
     public void testName() throws Exception {
         assertEquals(interfaceInfo.getName().getLocalPart(), "interfaceTest");
         assertEquals(interfaceInfo.getName().getNamespaceURI(),
@@ -44,7 +48,7 @@
                      "http://apache.org/hello_world_soap_http1");
     }
  
-    
+    @Test
     public void testOperation() throws Exception {
         QName name = new QName("urn:test:ns", "sayHi");
         interfaceInfo.addOperation(name);

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java Tue May  1 03:42:19 2007
@@ -21,27 +21,28 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class MessageInfoTest extends TestCase {
+public class MessageInfoTest extends Assert {
     
     private MessageInfo messageInfo;
     
+    @Before
     public void setUp() throws Exception {
         messageInfo = new MessageInfo(null, new QName(
             "http://apache.org/hello_world_soap_http", "testMessage"));
     }
     
-    public void tearDown() throws Exception {
-        
-    }
-    
+    @Test
     public void testName() throws Exception {
         assertEquals(messageInfo.getName().getLocalPart(), "testMessage");
         assertEquals(messageInfo.getName().getNamespaceURI(),
                      "http://apache.org/hello_world_soap_http");
     }
     
+    @Test
     public void testMessagePartInfo() throws Exception {
         QName qname = new QName(
                                 "http://apache.org/hello_world_soap_http", "testMessagePart");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java Tue May  1 03:42:19 2007
@@ -22,13 +22,16 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class MessagePartInfoTest extends TestCase {
+public class MessagePartInfoTest extends Assert {
     
         
     private MessagePartInfo messagePartInfo;
         
+    @Before
     public void setUp() throws Exception {
         
         MessageInfo msg = new MessageInfo(null, 
@@ -39,10 +42,7 @@
         messagePartInfo.setElement(true);
     }
     
-    public void tearDown() throws Exception {
-        
-    }
-    
+    @Test
     public void testName() throws Exception {
         assertEquals(messagePartInfo.getName().getLocalPart(), "testMessagePart");
         assertEquals(messagePartInfo.getName().getNamespaceURI()
@@ -55,6 +55,7 @@
         
     }
 
+    @Test
     public void testElement() {
         messagePartInfo.setElementQName(new QName("http://apache.org/hello_world_soap_http/types",
                                                   "testElement"));
@@ -65,6 +66,7 @@
         assertNull(messagePartInfo.getTypeQName());
     }
     
+    @Test
     public void testType() {
         messagePartInfo.setTypeQName(new QName(
             "http://apache.org/hello_world_soap_http/types", "testType"));

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java Tue May  1 03:42:19 2007
@@ -21,20 +21,20 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class OperationInfoTest extends TestCase {
+public class OperationInfoTest extends Assert {
 
     private OperationInfo operationInfo;
     
+    @Before
     public void setUp() throws Exception {
         operationInfo = new OperationInfo(null, new QName("urn:test:ns", "operationTest"));
     }
     
-    public void tearDown() throws Exception {
-        
-    }
-    
+    @Test
     public void testName() throws Exception {
         assertNull(operationInfo.getInterface());
         assertEquals("operationTest", operationInfo.getName().getLocalPart());
@@ -48,6 +48,7 @@
         }
     }
     
+    @Test
     public void testInput() throws Exception {
         assertFalse(operationInfo.hasInput());
         MessageInfo inputMessage = operationInfo.createMessage(new QName(
@@ -61,6 +62,7 @@
         assertEquals(operationInfo.getInputName(), "input");
     }
     
+    @Test
     public void testOutput() throws Exception {
         assertFalse(operationInfo.hasOutput());
         MessageInfo outputMessage = operationInfo.createMessage(new QName(
@@ -74,6 +76,7 @@
         assertEquals(operationInfo.getOutputName(), "output");
     }
     
+    @Test
     public void testOneWay() throws Exception {
         assertFalse(operationInfo.isOneWay());
         MessageInfo inputMessage = operationInfo.createMessage(new QName(
@@ -82,6 +85,7 @@
         assertTrue(operationInfo.isOneWay());
     }
     
+    @Test
     public void testFault() throws Exception {
         assertEquals(operationInfo.getFaults().size(), 0);
         QName faultName = new QName("urn:test:ns", "fault");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/service/model/SchemaInfoTest.java Tue May  1 03:42:19 2007
@@ -19,26 +19,27 @@
 
 package org.apache.cxf.service.model;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class SchemaInfoTest extends TestCase {
+public class SchemaInfoTest extends Assert {
     
     private SchemaInfo schemaInfo;
     
+    @Before
     public void setUp() throws Exception {
         schemaInfo = new SchemaInfo(null, "http://apache.org/hello_world_soap_http/types");
     }
-    
-    public void tearDown() throws Exception {
-        
-    }
-    
+  
+    @Test
     public void testConstructor() throws Exception {
         assertNull(schemaInfo.getElement());
         assertEquals(schemaInfo.getNamespaceURI(),
                      "http://apache.org/hello_world_soap_http/types");
     }
     
+    @Test
     public void testNamespaceURI() throws Exception {
         schemaInfo.setNamespaceURI("http://apache.org/hello_world_soap_http/types1");
         assertEquals(schemaInfo.getNamespaceURI(), "http://apache.org/hello_world_soap_http/types1");

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/wsdl/JAXBExtensionHelperTest.java Tue May  1 03:42:19 2007
@@ -33,13 +33,14 @@
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.abc.test.AnotherPolicyType;
 import org.apache.cxf.abc.test.NewServiceType;
 import org.apache.cxf.abc.test.TestPolicyType;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JAXBExtensionHelperTest extends TestCase {
+public class JAXBExtensionHelperTest extends Assert {
 
     private WSDLFactory wsdlFactory;
 
@@ -49,6 +50,7 @@
 
     private ExtensionRegistry registry;
 
+    @Before
     public void setUp() throws Exception {
 
         wsdlFactory = WSDLFactory.newInstance();
@@ -60,10 +62,7 @@
         }
     }
 
-    public void tearDown() {
-
-    }
-
+    @Test
     public void testAddTestExtension() throws Exception {
 
         JAXBExtensionHelper.addExtensions(registry, "javax.wsdl.Port",
@@ -107,6 +106,7 @@
             Math.abs(0.1F - ap.getFloatAttr()) < 0.5E-5);
     }
 
+    @Test
     public void testPrettyPrintXMLStreamWriter() throws Exception {
         JAXBExtensionHelper.addExtensions(registry, "javax.wsdl.Definition",
                         "org.apache.cxf.abc.test.NewServiceType", Thread.currentThread()

Modified: incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java (original)
+++ incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java Tue May  1 03:42:19 2007
@@ -26,15 +26,16 @@
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.configuration.foo.Foo;
 import org.apache.ws.jaxme.impl.DatatypeConverterImpl;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 
-public class DefaultValueTest extends TestCase {
+public class DefaultValueTest extends Assert {
 
+    @Test
     public void testFooDefaultValues() throws Exception {
 
         DatatypeConverter.setDatatypeConverter(new DatatypeConverterImpl());

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java Tue May  1 03:42:19 2007
@@ -24,14 +24,16 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class AttachmentDeserializerTest extends TestCase {
+public class AttachmentDeserializerTest extends Assert {
+    
+    @Test
     public void testDeserializerMtom() throws Exception {
         InputStream is = getClass().getResourceAsStream("mimedata");
         String ct = "multipart/related; type=\"application/xop+xml\"; "
@@ -79,6 +81,7 @@
 //        assertTrue(attIs instanceof ByteArrayInputStream);
     }
 
+    @Test
     public void testDeserializerMtomWithAxis2StyleBoundaries() throws Exception {
         InputStream is = getClass().getResourceAsStream("axis2_mimedata");
         String ct = "multipart/related; type=\"application/xop+xml\"; "
@@ -126,6 +129,7 @@
 //        assertTrue(attIs instanceof ByteArrayInputStream);
     }
     
+    @Test
     public void testDeserializerSwA() throws Exception {
         InputStream is = getClass().getResourceAsStream("swadata");
         String ct = "multipart/related; type=\"text/xml\"; "
@@ -173,6 +177,7 @@
         assertTrue(attIs.read() == -1);
     }
     
+    @Test
     public void testDeserializerSwAWithoutBoundryInContentType() throws Exception {
         InputStream is = getClass().getResourceAsStream("swadata");
         String ct = "multipart/related; type=\"text/xml\"; ";

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java Tue May  1 03:42:19 2007
@@ -33,14 +33,16 @@
 import javax.mail.internet.MimeMultipart;
 import javax.mail.util.ByteArrayDataSource;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class AttachmentSerializerTest extends TestCase {
+public class AttachmentSerializerTest extends Assert {
+    
+    @Test
     public void testMessageWrite() throws Exception {
         MessageImpl msg = new MessageImpl();
         
@@ -102,6 +104,7 @@
         
     }
     
+    @Test
     public void testMessageMTOM() throws Exception {
         MessageImpl msg = new MessageImpl();
         

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Tue May  1 03:42:19 2007
@@ -22,8 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.BusException;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.bus.extension.ExtensionManagerBus;
@@ -37,10 +35,12 @@
 import org.apache.cxf.wsdl.WSDLManager;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class CXFBusImplTest extends TestCase {
+public class CXFBusImplTest extends Assert {
 
-    
+    @Test
     public void testConstructionWithoutExtensions() throws BusException {
         
         CXFBusImpl bus = new ExtensionManagerBus();
@@ -51,6 +51,7 @@
         assertNotNull(bus.getExtension(PhaseManager.class));
     }
     
+    @Test
     public void testConstructionWithExtensions() throws BusException {
         
         IMocksControl control;
@@ -85,6 +86,7 @@
   
     }
 
+    @Test
     public void testExtensions() {
         CXFBusImpl bus = new CXFBusImpl();
         String extension = "CXF";
@@ -92,6 +94,7 @@
         assertSame(extension, bus.getExtension(String.class));
     }
     
+    @Test
     public void testBusID() {
         CXFBusImpl bus = new CXFBusImpl();
         String id = bus.getId();
@@ -100,6 +103,7 @@
         assertEquals("The bus id should be changed", bus.getId(), "test");
     }
     
+    @Test
     public void testRun() {
         final CXFBusImpl bus = new CXFBusImpl();
         Thread t = new Thread() {
@@ -121,6 +125,7 @@
         assertEquals(BusState.RUNNING, bus.getState());
     }
     
+    @Test
     public void testShutdown() {
         final CXFBusImpl bus = new CXFBusImpl();
         Thread t = new Thread() {
@@ -144,6 +149,7 @@
         
     }
     
+    @Test
     public void testShutdownWithBusLifecycle() {
         final CXFBusImpl bus = new ExtensionManagerBus();
         BusLifeCycleManager lifeCycleManager = bus.getExtension(BusLifeCycleManager.class);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java Tue May  1 03:42:19 2007
@@ -23,10 +23,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class ExtensionFragmentParserTest extends TestCase {
+public class ExtensionFragmentParserTest extends Assert {
 
+    @Test
     public void testGetExtensions() {
         InputStream is = ExtensionFragmentParserTest.class.getResourceAsStream("extension1.xml");
         List<Extension> extensions = new ExtensionFragmentParser().getExtensions(is);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java Tue May  1 03:42:19 2007
@@ -22,20 +22,22 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.resource.DefaultResourceManager;
 import org.apache.cxf.resource.ResourceManager;
 import org.apache.cxf.resource.ResourceResolver;
 import org.apache.cxf.resource.SinglePropertyResolver;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ExtensionManagerTest extends TestCase {
+public class ExtensionManagerTest extends Assert {
 
     private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest";
     private ExtensionManagerImpl manager;
     private MyService myService;
     private Map<Class, Object> extensions;
     
+    @Before
     public  void setUp() {
         ResourceResolver resolver = new SinglePropertyResolver(EXTENSIONMANAGER_TEST_RESOURECE_NAME, this);
         ResourceManager rm = new DefaultResourceManager(resolver);
@@ -48,6 +50,7 @@
         myService = null;
     }
     
+    @Test
     public void testLoadAndRegister() {
         Extension e = new Extension();
         e.setClassname("java.lang.String");
@@ -73,6 +76,7 @@
          
     }
     
+    @Test
     public void testActivateViaNS() {        
         
         Extension e = new Extension();

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java Tue May  1 03:42:19 2007
@@ -19,11 +19,12 @@
 
 package org.apache.cxf.bus.extension;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class ExtensionTest extends TestCase {
+public class ExtensionTest extends Assert {
 
+    @Test
     public void testMutators() {
         Extension e = new Extension();
         
@@ -43,6 +44,7 @@
         assertEquals("Unexpected size of namespace list.", 0, e.getNamespaces().size());
     }
     
+    @Test
     public void testLoad() throws ExtensionException {
         Extension e = new Extension();
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -73,6 +75,7 @@
         assertTrue("Object is not type String", obj instanceof String);        
     }
     
+    @Test
     public void testLoadInterface() {
         Extension e = new Extension();
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -84,7 +87,7 @@
                        ex.getCause() instanceof ClassNotFoundException);
         }
         
-        e.setInterfaceName(Test.class.getName());
+        e.setInterfaceName(Assert.class.getName());
         Class<?> cls = e.loadInterface(cl);
         assertTrue("Object is not type Class", cls instanceof Class); 
     }

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java Tue May  1 03:42:19 2007
@@ -19,10 +19,12 @@
 
 package org.apache.cxf.bus.spring;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class BusApplicationContextTest extends TestCase {
+public class BusApplicationContextTest extends Assert {
        
+    @Test
     public void testGetResources() {
         BusApplicationContext ctx = new BusApplicationContext("nowhere.xml", false);
         assertNull("Unexpected number of resources", ctx.getConfigResources());

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Tue May  1 03:42:19 2007
@@ -25,8 +25,6 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.binding.BindingFactoryManager;
@@ -46,10 +44,12 @@
 import org.apache.cxf.workqueue.WorkQueueManager;
 import org.apache.cxf.wsdl.WSDLManager;
 import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class SpringBusFactoryTest extends TestCase {
+public class SpringBusFactoryTest extends Assert {
 
-    
+    @Test
     public void testDefault() {
         Bus bus = new SpringBusFactory().createBus();
         assertNotNull(bus);
@@ -78,12 +78,14 @@
 
     }
     
+    @Test
     public void testCustomFileName() {
         String cfgFile = "org/apache/cxf/bus/spring/resources/bus-overwrite.xml";
         Bus bus = new SpringBusFactory().createBus(cfgFile, true);
         checkCustomerConfiguration(bus);
     }
     
+    @Test
     public void testCustomFileURLFromSystemProperty() {
         URL cfgFileURL = this.getClass().getResource("resources/bus-overwrite.xml");        
         System.setProperty(Configurer.USER_CFG_FILE_PROPERTY_URL, cfgFileURL.toString());
@@ -92,6 +94,7 @@
         System.clearProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
     }
     
+    @Test
     public void testCustomFileURL() {
         URL cfgFileURL = this.getClass().getResource("resources/bus-overwrite.xml");
         Bus bus = new SpringBusFactory().createBus(cfgFileURL, true);
@@ -115,6 +118,7 @@
         assertEquals("Unexpected interceptor", "out", interceptors.get(0).toString());
     }
     
+    @Test
     public void testForLifeCycle() {
         BusLifeCycleListener bl = EasyMock.createMock(BusLifeCycleListener.class);
         Bus bus = new SpringBusFactory().createBus();
@@ -131,6 +135,7 @@
         
     }
 
+    @Test
     public void testPhases() {
         Bus bus = new SpringBusFactory().createBus();
         PhaseManager cxfPM = bus.getExtension(PhaseManager.class);
@@ -149,6 +154,7 @@
         }
     }
 
+    @Test
     public void testJsr250() {
         Bus bus = new SpringBusFactory().createBus("org/apache/cxf/bus/spring/testjsr250.xml");
         TestExtension te = bus.getExtension(TestExtension.class);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java Tue May  1 03:42:19 2007
@@ -19,13 +19,14 @@
 
 package org.apache.cxf.buslifecycle;
 
-import junit.framework.TestCase;
-
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class CXFBusLifeCycleManagerTest extends TestCase {
+public class CXFBusLifeCycleManagerTest extends Assert {
 
+    @Test
     public void testListenerNotRegistered() {
 
         BusLifeCycleListener listener1 = EasyMock.createMock(BusLifeCycleListener.class);
@@ -47,6 +48,7 @@
         EasyMock.verify(listener1);
     }
     
+    @Test
     public void testSingleListenerRegistration() {
 
         BusLifeCycleListener listener1 = EasyMock.createMock(BusLifeCycleListener.class);
@@ -73,6 +75,7 @@
         EasyMock.verify(listener1);        
     }
     
+    @Test
     public void testDuplicateRegistration() {
         
         BusLifeCycleListener listener1 = EasyMock.createMock(BusLifeCycleListener.class);
@@ -103,6 +106,7 @@
         EasyMock.verify(listener1);
     }
     
+    @Test
     public void testMultipleListeners() {
        
         IMocksControl ctrl = EasyMock.createStrictControl();
@@ -136,6 +140,7 @@
         ctrl.verify();
     }
     
+    @Test
     public void testDeregistration() {
         
         IMocksControl ctrl = EasyMock.createStrictControl();

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java Tue May  1 03:42:19 2007
@@ -26,19 +26,21 @@
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import com.sun.xml.bind.DatatypeConverterImpl;
 
 import org.apache.cxf.configuration.Configurable;
+import org.junit.Assert;
+import org.junit.Test;
+
 
 
-public class ConfigurerImplTest extends TestCase {
+public class ConfigurerImplTest extends Assert {
     
     static {
         DatatypeConverter.setDatatypeConverter(DatatypeConverterImpl.theInstance);
     }
-     
+    
+    @Test
     public void testConfigureSimpleNoMatchingBean() {
         SimpleBean sb = new SimpleBean("unknown");
         ConfigurerImpl configurer =
@@ -91,6 +93,7 @@
                      new Short((short)11), sb.getUnsignedByteAttr());
     }
     
+    @Test
     public void testConfigureSimple() {
         SimpleBean sb = new SimpleBean("simple");
         ConfigurerImpl configurer =
@@ -149,6 +152,7 @@
                      new Short((short)21), sb.getUnsignedByteAttr());
     }
     
+    @Test
     public void testGetBeanName() {
         ConfigurerImpl configurer = new ConfigurerImpl((String)null);
         Object beanInstance = new Configurable() {

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java Tue May  1 03:42:19 2007
@@ -22,8 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.endpoint.Endpoint;
@@ -40,8 +38,12 @@
 import org.apache.cxf.service.model.OperationInfo;
 import org.easymock.IMocksControl;
 import org.easymock.classextension.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class OutgoingChainInterceptorTest extends TestCase {
+public class OutgoingChainInterceptorTest extends Assert {
 
     private IMocksControl control;
     private Bus bus;
@@ -55,8 +57,8 @@
     private List<Interceptor> empty;
     private Binding binding;
 
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
 
         control = EasyMock.createNiceControl();
 
@@ -93,10 +95,12 @@
 
     }
 
+    @After
     public void tearDown() {
         control.verify();
     }
 
+    @Test
     public void testInterceptor() throws Exception {
         OutgoingChainInterceptor intc = new OutgoingChainInterceptor();
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java Tue May  1 03:42:19 2007
@@ -19,12 +19,11 @@
 
 package org.apache.cxf.interceptor;
 
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
@@ -32,12 +31,14 @@
 import org.apache.cxf.service.ServiceImpl;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
+import org.junit.Assert;
+import org.junit.Test;
 
-import static org.easymock.EasyMock.createNiceControl;
-import static org.easymock.EasyMock.expect;
-
-public class ServiceInvokerInterceptorTest extends TestCase {
+public class ServiceInvokerInterceptorTest extends Assert {
+    
+    @Test
     public void testInterceptor() throws Exception {
         ServiceInvokerInterceptor intc = new ServiceInvokerInterceptor();
         
@@ -65,13 +66,13 @@
     }
     
     Endpoint createEndpoint(Invoker i) throws Exception {
-        IMocksControl control = createNiceControl();
+        IMocksControl control = EasyMock.createNiceControl();
         Endpoint endpoint = control.createMock(Endpoint.class);
 
         ServiceImpl service = new ServiceImpl((ServiceInfo)null);
         service.setInvoker(i);
         service.setExecutor(new SimpleExecutor());
-        expect(endpoint.getService()).andReturn(service).anyTimes();
+        EasyMock.expect(endpoint.getService()).andReturn(service).anyTimes();
         
         control.replay();
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java Tue May  1 03:42:19 2007
@@ -23,13 +23,15 @@
 import java.util.Map;
 
 import org.w3c.dom.Document;
-
 import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
 
 import org.apache.cxf.helpers.DOMUtils;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class XPathAssertTest extends TestCase {
+public class XPathAssertTest extends Assert {
+    
+    @Test
     public void testAssert() throws Exception {
         Document document = DOMUtils.readXml(getClass().getResourceAsStream("test.xml"));
 
@@ -53,6 +55,7 @@
         XPathAssert.assertXPathEquals("//b", "foo", document, null);
     }
 
+    @Test
     public void testAssertNamespace() throws Exception {
         Document document = DOMUtils.readXml(getClass().getResourceAsStream("test2.xml"));
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStreamTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStreamTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/CachedOutputStreamTest.java Tue May  1 03:42:19 2007
@@ -21,10 +21,12 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class CachedOutputStreamTest extends TestCase {    
+public class CachedOutputStreamTest extends Assert {    
     
+    @Test
     public void testResetOut() throws IOException {
         CachedOutputStream cos = new CachedOutputStream();        
         String result = initTestData(16);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java Tue May  1 03:42:19 2007
@@ -21,10 +21,12 @@
 
 import java.net.URL;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class HttpUriMapperTest extends TestCase {
+public class HttpUriMapperTest extends Assert {
 
+    @Test
     public void testGetContext() throws Exception {
         URL url = new URL("http://localhost:8080/SoapContext/SoapPort");
         String path = url.getPath();
@@ -39,7 +41,7 @@
         assertEquals("", HttpUriMapper.getContextName(path));
     }
     
-    
+    @Test
     public void testGetResourceBase() throws Exception {
         URL url = new URL("http://localhost:8080/SoapContext/SoapPort");
         String path = url.getPath();

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java Tue May  1 03:42:19 2007
@@ -24,9 +24,11 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class AutomaticWorkQueueTest extends TestCase {
+public class AutomaticWorkQueueTest extends Assert {
 
     public static final int UNBOUNDED_MAX_QUEUE_SIZE = -1;
     public static final int UNBOUNDED_HIGH_WATER_MARK = -1;
@@ -41,6 +43,8 @@
     public static final int TIMEOUT = 100;
 
     AutomaticWorkQueueImpl workqueue;
+    
+    @After
     public void tearDown() throws Exception {
         if (workqueue != null) {
             workqueue.shutdown(true);
@@ -48,6 +52,7 @@
         }
     }
     
+    @Test
     public void testUnboundedConstructor() {
         workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                UNBOUNDED_HIGH_WATER_MARK,
@@ -59,6 +64,7 @@
         assertEquals(UNBOUNDED_LOW_WATER_MARK, workqueue.getLowWaterMark());
     }
 
+    @Test
     public void testConstructor() {
         workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                DEFAULT_HIGH_WATER_MARK,
@@ -70,6 +76,7 @@
         assertEquals(DEFAULT_LOW_WATER_MARK, workqueue.getLowWaterMark());
     }
 
+    @Test
     public void testEnqueue() {
         workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                DEFAULT_HIGH_WATER_MARK,
@@ -104,6 +111,7 @@
         assertEquals(0, workqueue.getSize());
     }
 
+    @Test
     public void testEnqueueImmediate() {
         workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                DEFAULT_HIGH_WATER_MARK,
@@ -208,6 +216,7 @@
         }
     }
 
+    @Test
     public void testDeadLockEnqueueLoads() {
         workqueue = new AutomaticWorkQueueImpl(500, 1, 2, 2,
                                                DEFAULT_DEQUEUE_TIMEOUT);
@@ -217,6 +226,7 @@
         checkDeadLock(dead);
     }
 
+    @Test
     public void testNonDeadLockEnqueueLoads() {
         workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE,
                                                INITIAL_SIZE,
@@ -228,6 +238,7 @@
         checkDeadLock(dead);
     }
     
+    @Test
     public void testSchedule() throws Exception {
         workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                UNBOUNDED_HIGH_WATER_MARK,
@@ -260,6 +271,7 @@
                    System.currentTimeMillis() - start >= 4950);
     }
 
+    @Test
     public void testThreadPoolShrink() {
         workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, 20, 20, 10, 100L);
 
@@ -287,6 +299,7 @@
 //        }
     }
 
+    @Test
     public void testThreadPoolShrinkUnbounded() {
         workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                UNBOUNDED_HIGH_WATER_MARK,
@@ -312,6 +325,7 @@
         assertTrue("threads_total()", workqueue.getPoolSize() <= DEFAULT_LOW_WATER_MARK);
     }
 
+    @Test
     public void testShutdown() {
         workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
                                                INITIAL_SIZE, INITIAL_SIZE, 250);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java Tue May  1 03:42:19 2007
@@ -40,8 +40,6 @@
 
 import org.w3c.dom.Element;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.helpers.CastUtils;
@@ -51,8 +49,12 @@
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ServiceWSDLBuilderTest extends TestCase {
+public class ServiceWSDLBuilderTest extends Assert {
 
     private static final Logger LOG = Logger.getLogger(ServiceWSDLBuilderTest.class.getName());
     private static final String WSDL_PATH = "hello_world.wsdl";
@@ -70,6 +72,7 @@
     private DestinationFactoryManager destinationFactoryManager;
     private DestinationFactory destinationFactory;
     
+    @Before
     public void setUp() throws Exception {
   
         String wsdlUrl = getClass().getResource(WSDL_PATH).toString();
@@ -110,12 +113,13 @@
         
     }
     
+    @After
     public void tearDown() throws Exception {        
         control.verify();
         newDef = null;
     }
     
-        
+    @Test    
     public void testDefinition() throws Exception {
         assertEquals("http://apache.org/hello_world_soap_http", newDef.getTargetNamespace());
         Service serv = newDef.getService(new QName("http://apache.org/hello_world_soap_http",
@@ -124,6 +128,7 @@
         assertNotNull(serv.getPort("SoapPort"));
     }
     
+    @Test
     public void testPortType() throws Exception {
         assertEquals(newDef.getPortTypes().size(), 1);
         PortType portType = (PortType)newDef.getPortTypes().values().iterator().next();
@@ -132,6 +137,7 @@
         
     }
     
+    @Test
     public void testSayHiOperation() throws Exception {
         PortType portType = newDef.getPortType(new QName(newDef.getTargetNamespace(), 
             "Greeter"));
@@ -165,6 +171,7 @@
               
     }
     
+    @Test
     public void testGreetMeOperation() throws Exception {
         PortType portType = newDef.getPortType(new QName(newDef.getTargetNamespace(), 
             "Greeter"));
@@ -193,6 +200,7 @@
         
     }
     
+    @Test
     public void testGreetMeOneWayOperation() throws Exception {
         PortType portType = newDef.getPortType(new QName(newDef.getTargetNamespace(), 
             "Greeter"));
@@ -213,6 +221,7 @@
         assertTrue(greetMeOneWay.getFaults().size() == 0);
     }
     
+    @Test
     public void testPingMeOperation() throws Exception {
         PortType portType = newDef.getPortType(new QName(newDef.getTargetNamespace(), 
             "Greeter"));
@@ -250,6 +259,7 @@
         assertNull(message.getPart("faultDetail").getTypeName());
     }
     
+    @Test
     public void testBinding() throws Exception {
         assertEquals(newDef.getBindings().size(), 1);
         Binding binding = newDef.getBinding(new QName(newDef.getTargetNamespace(), "Greeter_SOAPBinding"));
@@ -257,6 +267,7 @@
         assertEquals(binding.getBindingOperations().size(), 4);
     }
     
+    @Test
     public void testSchemas() throws Exception {
         Types types = newDef.getTypes();
         assertNotNull(types);

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java Tue May  1 03:42:19 2007
@@ -30,10 +30,12 @@
 import javax.wsdl.Service;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WSDLDefinitionBuilderTest extends TestCase {
+public class WSDLDefinitionBuilderTest extends Assert {
 
+    @Test
     public void testBuildSimpleWSDL() throws Exception {
         String qname = "http://apache.org/hello_world_soap_http";
         String wsdlUrl = getClass().getResource("hello_world.wsdl").toString();
@@ -55,6 +57,7 @@
         assertNotNull(port);        
     }
     
+    @Test
     public void testBuildImportedWSDL() throws Exception {
         String wsdlUrl = getClass().getResource("hello_world_services.wsdl").toString();
         

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java?view=diff&rev=533999&r1=533998&r2=533999
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java Tue May  1 03:42:19 2007
@@ -30,10 +30,12 @@
 import javax.wsdl.Service;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WSDLManagerImplTest extends TestCase {
+public class WSDLManagerImplTest extends Assert {
 
+    @Test
     public void testBuildSimpleWSDL() throws Exception {
         String qname = "http://apache.org/hello_world_soap_http";
         String wsdlUrl = getClass().getResource("hello_world.wsdl").toString();
@@ -55,6 +57,7 @@
         assertNotNull(port);
     }
     
+    @Test
     public void testBuildImportedWSDL() throws Exception {
         String wsdlUrl = getClass().getResource("hello_world_services.wsdl").toString();
         



Mime
View raw message