cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r546410 [3/3] - in /incubator/cxf/trunk: integration/jbi/src/test/java/org/apache/cxf/jbi/se/ integration/jbi/src/test/java/org/apache/cxf/jbi/se/state/ integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/ integration/jca/src/...
Date Tue, 12 Jun 2007 08:08:11 GMT
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java Tue Jun 12 01:08:04 2007
@@ -31,7 +31,6 @@
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.attachment.AttachmentImpl;
 import org.apache.cxf.headers.Header;
@@ -41,8 +40,11 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ContextPropertiesMappingTest extends TestCase {
+public class ContextPropertiesMappingTest extends Assert {
     private static final String ADDRESS = "test address";
     private static final String REQUEST_METHOD = "GET";
     private static final String HEADER = "header";
@@ -52,7 +54,7 @@
     private Map<String, Object> requestContext = new HashMap<String, Object>();
     private Map<String, Object> responseContext = new HashMap<String, Object>();
     
-    
+    @Before
     public void setUp() throws Exception {
         message.clear();
         message.put(Message.ENDPOINT_ADDRESS, ADDRESS);
@@ -65,6 +67,7 @@
         responseContext.clear();
     }
     
+    @Test
     public void testMapRequestfromJaxws2Cxf() {
         Object address = requestContext.get(Message.ENDPOINT_ADDRESS);
         assertNull("address should be null", address);
@@ -80,6 +83,7 @@
         assertEquals("the message PROTOCOL_HEADERS should be updated", header, HEADER + "jaxws");
     }
     
+    @Test
     public void testMapResponseCxf2Jaxws() {        
         responseContext.putAll(message);
         Object requestMethod = responseContext.get(MessageContext.HTTP_REQUEST_METHOD);
@@ -93,6 +97,7 @@
         assertEquals("the HTTP_RESPONSE_HEADERS should be updated", header, HEADER);
     }
     
+    @Test
     public void testCreateWebServiceContext() {
         Exchange exchange = new ExchangeImpl();
         Message inMessage = new MessageImpl();
@@ -119,6 +124,7 @@
         assertTrue("no inbound attachments expected", ((Map)inAttachments).isEmpty());
     }
     
+    @Test
     public void testUpdateWebServiceContext() {
         Exchange xchng = new ExchangeImpl();
         Message outMsg = new MessageImpl();
@@ -151,6 +157,7 @@
         assertEquals("incorrect response code returned", RESPONSE_CODE, respCode);
     }
 
+    @Test
     @SuppressWarnings("unchecked")
     public void testCreateWebServiceContextWithInAttachments() {
         Exchange exchange = new ExchangeImpl();

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfoTest.java Tue Jun 12 01:08:04 2007
@@ -19,10 +19,13 @@
 
 package org.apache.cxf.jaxws.support;
 
-import junit.framework.TestCase;
 import org.apache.cxf.calculator.CalculatorImpl;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class JaxWsImplementorInfoTest extends TestCase {
+public class JaxWsImplementorInfoTest extends Assert {
+    
+    @Test
     public void testGetWSDLLocation() throws Exception {
         JaxWsImplementorInfo info = new JaxWsImplementorInfo(CalculatorImpl.class);
         assertEquals("testutils/calculator.wsdl", info.getWsdlLocation());

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java Tue Jun 12 01:08:04 2007
@@ -32,8 +32,6 @@
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.service.model.MessageInfo;
@@ -44,13 +42,19 @@
 import org.apache.cxf.wsdl11.WSDLServiceBuilder;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class JaxWsServiceConfigurationTest extends Assert {
 
-public class JaxWsServiceConfigurationTest extends TestCase {
 
+    @Before
     public void setUp() throws Exception {
 
     }
 
+    @Test
     public void testGetInPartName() throws Exception {
         QName opName = new QName("http://cxf.com/", "sayHello");
         Method sayHelloMethod = Hello.class.getMethod("sayHello", new Class[]{String.class, String.class});
@@ -73,6 +77,7 @@
         assertEquals("get wrong in partName for first param", new QName("http://cxf.com/", "arg1"), partName);
     }
 
+    @Test
     public void testDefaultStyle() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(HelloDefault.class);
@@ -83,6 +88,7 @@
         assertNull(jwsc.isWrapped());
     }
 
+    @Test
     public void testRPCStyle() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(HelloRPC.class);
@@ -93,6 +99,7 @@
         assertFalse(jwsc.isWrapped());
     }
 
+    @Test
     public void testDocumentWrappedStyle() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(HelloWrapped.class);
@@ -103,6 +110,7 @@
         assertTrue(jwsc.isWrapped());
     }
 
+    @Test
     public void testDocumentBareStyle() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(HelloBare.class);
@@ -113,6 +121,7 @@
         assertFalse(jwsc.isWrapped());
     }
 
+    @Test
     public void testGetOutPartName() throws Exception {
         QName opName = new QName("http://cxf.com/", "sayHi");
         Method sayHiMethod = Hello.class.getMethod("sayHi", new Class[]{});

Modified: incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/AbstractDOMProviderTest.java Tue Jun 12 01:08:04 2007
@@ -20,24 +20,27 @@
 
 package org.apache.cxf.js.rhino;
 
-import junit.framework.TestCase;
 
 import org.easymock.classextension.EasyMock;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.mozilla.javascript.Scriptable;
 
 
-public class AbstractDOMProviderTest extends TestCase {
+public class AbstractDOMProviderTest extends Assert {
 
     private String epAddr = "http://cxf.apache.org/";
 
     private Scriptable scriptMock;
 
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         scriptMock = EasyMock.createMock(Scriptable.class);
     }
 
+    @Test
     public void testNoWsdlLocation() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn(Scriptable.NOT_FOUND);
@@ -54,6 +57,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testNoSvcName() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");
@@ -72,6 +76,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testNoPortName() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");
@@ -92,6 +97,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testNoTgtNamespace() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");
@@ -114,6 +120,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testNoAddr() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");
@@ -138,6 +145,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testNoInvoke() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");
@@ -166,6 +174,7 @@
         EasyMock.verify(scriptMock);
     }
 
+    @Test
     public void testIllegalInvoke() throws Exception {
         EasyMock.expect(scriptMock.get("wsdlLocation", scriptMock))
             .andReturn("found");

Modified: incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ProviderFactoryTest.java Tue Jun 12 01:08:04 2007
@@ -23,23 +23,25 @@
 
 import javax.xml.ws.Service;
 
-import junit.framework.TestCase;
 
 import org.easymock.classextension.EasyMock;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import org.mozilla.javascript.EvaluatorException;
 import org.mozilla.javascript.Scriptable;
 
 
-public class ProviderFactoryTest extends TestCase {
+public class ProviderFactoryTest extends Assert {
 
     private String epAddr = "http://cxf.apache.org/";
 
     private ProviderFactory ph;
     private AbstractDOMProvider dpMock;
 
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         dpMock = EasyMock.createMock(AbstractDOMProvider.class);
         ph = new ProviderFactory(epAddr) {
                 protected AbstractDOMProvider createProvider(Service.Mode mode,
@@ -54,6 +56,7 @@
             };
     }
 
+    @Test
     public void testMsgJSFile() throws Exception {
         dpMock.publish();
         dpMock.publish();
@@ -63,6 +66,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testBadJSFile() throws Exception {
         EasyMock.replay(dpMock);
         final String fname = "broken.js";
@@ -77,6 +81,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testEmptyJSFile() throws Exception {
         EasyMock.replay(dpMock);
         final String fname = "empty.js";
@@ -92,6 +97,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testNoSuchJSFile() throws Exception {
         EasyMock.replay(dpMock);
         final String fname = "none.js";
@@ -107,6 +113,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testIllegalServiceMode() throws Exception {
         EasyMock.replay(dpMock);
         final String fname = "illegal1.js";
@@ -122,6 +129,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testIllegalServiceModeType() throws Exception {
         EasyMock.replay(dpMock);
         final String fname = "illegal2.js";
@@ -137,6 +145,7 @@
         EasyMock.verify(dpMock);
     }
 
+    @Test
     public void testProviderException() throws Exception {
         dpMock.publish();
         EasyMock.expectLastCall()

Modified: incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/js/src/test/java/org/apache/cxf/js/rhino/ServerAppTest.java Tue Jun 12 01:08:04 2007
@@ -23,19 +23,21 @@
 import java.io.File;
 import java.io.PrintStream;
 
-import junit.framework.TestCase;
 
 import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ServerAppTest extends TestCase {
+public class ServerAppTest extends Assert {
 
     private String epAddr = "http://cxf.apache.org/";
 
     private ProviderFactory phMock;
     private String emptyFile;
 
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         phMock = EasyMock.createMock(ProviderFactory.class);
         emptyFile = getClass().getResource("empty/empty.js").toURI().getPath();
     }
@@ -48,6 +50,7 @@
             };
     }
 
+    @Test
     public void testNoArgs() {
         EasyMock.replay(phMock);
         try {
@@ -61,6 +64,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testUknownOption() {
         EasyMock.replay(phMock);
         try {
@@ -74,6 +78,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testMissingOptionA() {
         EasyMock.replay(phMock);
         try {
@@ -87,6 +92,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testBrokenOptionA() {
         EasyMock.replay(phMock);
         try {
@@ -100,6 +106,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testMissingOptionB() {
         EasyMock.replay(phMock);
         try {
@@ -113,6 +120,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testBrokenOptionB() {
         EasyMock.replay(phMock);
         try {
@@ -126,6 +134,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testFileOnly() throws Exception {
         phMock.createAndPublish(new File(emptyFile), null, false);
         EasyMock.replay(phMock);
@@ -135,6 +144,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testOptionsAB() throws Exception {
         phMock.createAndPublish(new File(emptyFile), epAddr, true);
         EasyMock.replay(phMock);
@@ -144,6 +154,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testOptionA() throws Exception {
         phMock.createAndPublish(new File(emptyFile), epAddr, false);
         EasyMock.replay(phMock);
@@ -153,6 +164,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testOptionAWithOptionV() throws Exception {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         PrintStream pout = new PrintStream(bout);
@@ -172,6 +184,7 @@
         }
     }
 
+    @Test
     public void testOptionB() throws Exception {
         phMock.createAndPublish(new File(emptyFile), epAddr, true);
         EasyMock.replay(phMock);
@@ -181,6 +194,7 @@
         EasyMock.verify(phMock);
     }
 
+    @Test
     public void testOptionBWithOptionV() throws Exception {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         PrintStream pout = new PrintStream(bout);
@@ -200,6 +214,7 @@
         }
     }
 
+    @Test
     public void testDirectory() throws Exception {
         File f = new File(emptyFile);
         String dir = f.getParent();

Modified: incubator/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java Tue Jun 12 01:08:04 2007
@@ -25,7 +25,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -33,10 +32,11 @@
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
+import org.junit.Assert;
 import org.junit.Test;
 import org.xmlsoap.schemas.wsdl.http.AddressType;
 
-public class LocalTransportFactoryTest extends TestCase {
+public class LocalTransportFactoryTest extends Assert {
     @Test
     public void testTransportFactory() throws Exception {
         LocalTransportFactory factory = new LocalTransportFactory();

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderImplTest.java Tue Jun 12 01:08:04 2007
@@ -19,16 +19,22 @@
 
 package org.apache.cxf.ws.addressing;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 
-public class AddressingBuilderImplTest extends TestCase {
+
+
+public class AddressingBuilderImplTest extends Assert {
     private AddressingBuilderImpl builder;
 
+    @Before
     public void setUp() {
         builder = new AddressingBuilderImpl();
     }
 
+    @Test
     public void testGetAddressingProperties() throws Exception {
         AddressingProperties properties = builder.newAddressingProperties();
         assertNotNull("expected AddressingProperties ", properties);
@@ -37,6 +43,7 @@
                       properties);
     }
 
+    @Test
     public void testGetAddressingConstants() throws Exception {
         AddressingConstants constants = builder.newAddressingConstants();
         assertNotNull("expected AddressingConstants ", constants);

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingBuilderTest.java Tue Jun 12 01:08:04 2007
@@ -19,10 +19,14 @@
 
 package org.apache.cxf.ws.addressing;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 
-public class AddressingBuilderTest extends TestCase {
+
+public class AddressingBuilderTest extends Assert {
+    
+    @Test
     public void testGetAddressingBuilder() throws Exception {
         AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
         assertNotNull("expected AddressingBuilder", builder);

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/AddressingConstantsImplTest.java Tue Jun 12 01:08:04 2007
@@ -22,39 +22,48 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class AddressingConstantsImplTest extends TestCase {
+
+public class AddressingConstantsImplTest extends Assert {
     private AddressingConstants constants;
 
+    @Before
     public void setUp() {
         constants = new AddressingConstantsImpl();
     }
 
+    @Test
     public void testGetNamespaceURI() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing",
                      constants.getNamespaceURI());
     }
 
+    @Test
     public void testGetNamespacePrefix() throws Exception {
         assertEquals("unexpected constant",
                      "wsa",
                      constants.getNamespacePrefix());
     }
 
+    @Test
     public void testGetWSDLNamespaceURI() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing/wsdl",
                      constants.getWSDLNamespaceURI());
     }
 
+    @Test
     public void testGetWSDLNamespacePrefix() throws Exception {
         assertEquals("unexpected constant",
                      "wsaw",
                      constants.getWSDLNamespacePrefix());
     }
 
+    @Test
     public void testGetWSDLExtensibility() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing/wsdl",
@@ -62,6 +71,7 @@
                      constants.getWSDLExtensibilityQName());
     }
 
+    @Test
     public void testGetWSDLActionQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing/wsdl",
@@ -69,18 +79,21 @@
                      constants.getWSDLActionQName());
     }
 
+    @Test
     public void testGetAnonymousURI() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing/anonymous",
                      constants.getAnonymousURI());
     }
 
+    @Test
     public void testGetNoneURI() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing/none",
                      constants.getNoneURI());
     }
 
+    @Test
     public void testGetFromQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -88,6 +101,7 @@
                      constants.getFromQName());
     }
 
+    @Test
     public void testGetToQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -95,6 +109,7 @@
                      constants.getToQName());
     }
 
+    @Test
     public void testGetReplyToQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -102,6 +117,7 @@
                      constants.getReplyToQName());
     }
 
+    @Test
     public void testGetFaultToQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -109,6 +125,7 @@
                      constants.getFaultToQName());
     }
 
+    @Test
     public void testGetActionQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -116,6 +133,7 @@
                      constants.getActionQName());
     }
 
+    @Test
     public void testGetMessageIDQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -123,12 +141,14 @@
                      constants.getMessageIDQName());
     }
 
+    @Test
     public void testGetRelationshipReply() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing/reply",
                      constants.getRelationshipReply());
     }
 
+    @Test
     public void testGetRelatesToQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -136,6 +156,7 @@
                      constants.getRelatesToQName());
     }
 
+    @Test
     public void testGetRelationshipTypeQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -143,6 +164,7 @@
                      constants.getRelationshipTypeQName());
     }
 
+    @Test
     public void testGetMetadataQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -150,6 +172,7 @@
                      constants.getMetadataQName());
     }
 
+    @Test
     public void testGetAddressQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -157,12 +180,14 @@
                      constants.getAddressQName());
     }
 
+    @Test
     public void testGetPackageName() throws Exception {
         assertEquals("unexpected constant",
                      "org.apache.cxf.ws.addressing",
                      constants.getPackageName());
     }
 
+    @Test
     public void testGetIsReferenceParameterQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -170,6 +195,7 @@
                      constants.getIsReferenceParameterQName());
     }
 
+    @Test
     public void testGetInvalidMapQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -177,6 +203,7 @@
                      constants.getInvalidMapQName());
     }
 
+    @Test
     public void testMapRequiredQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -184,6 +211,7 @@
                      constants.getMapRequiredQName());
     }
 
+    @Test
     public void testDestinationUnreachableQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -191,6 +219,7 @@
                      constants.getDestinationUnreachableQName());
     }
 
+    @Test
     public void testActionNotSupportedQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -198,6 +227,7 @@
                      constants.getActionNotSupportedQName());
     }
 
+    @Test
     public void testEndpointUnavailableQName() throws Exception {
         assertEquals("unexpected constant",
                      new QName("http://www.w3.org/2005/08/addressing",
@@ -205,30 +235,35 @@
                      constants.getEndpointUnavailableQName());
     }
 
+    @Test
     public void testDefaultFaultAction() throws Exception {
         assertEquals("unexpected constant",
                      "http://www.w3.org/2005/08/addressing/fault",
                      constants.getDefaultFaultAction());
     }
 
+    @Test
     public void testActionNotSupportedText() throws Exception {
         assertEquals("unexpected constant",
                      "Action {0} not supported",
                      constants.getActionNotSupportedText());
     }
 
+    @Test
     public void testDestinationUnreachableText() throws Exception {
         assertEquals("unexpected constant",
                      "Destination {0} unreachable",
                      constants.getDestinationUnreachableText());
     }
 
+    @Test
     public void testEndpointUnavailableText() throws Exception {
         assertEquals("unexpected constant",
                      "Endpoint {0} unavailable",
                      constants.getEndpointUnavailableText());
     }
 
+    @Test
     public void testGetInvalidMapText() throws Exception {
         assertEquals("unexpected constant",
                      "Invalid Message Addressing Property {0}",
@@ -236,12 +271,14 @@
     }
 
 
+    @Test
     public void testMapRequiredText() throws Exception {
         assertEquals("unexpected constant",
                      "Message Addressing Property {0} required",
                      constants.getMapRequiredText());
     }
 
+    @Test
     public void testDuplicateMessageIDText() throws Exception {
         assertEquals("unexpected constant",
                      "Duplicate Message ID {0}",

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java Tue Jun 12 01:08:04 2007
@@ -30,7 +30,6 @@
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.binding.Binding;
 import org.apache.cxf.endpoint.Endpoint;
@@ -46,6 +45,10 @@
 import org.apache.cxf.transport.Destination;
 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;
 
 
 import static org.apache.cxf.binding.soap.Soap11.SOAP_NAMESPACE;
@@ -56,7 +59,7 @@
 import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND;
 import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
 
-public class MAPAggregatorTest extends TestCase {
+public class MAPAggregatorTest extends Assert {
 
     private MAPAggregator aggregator;
     private IMocksControl control;
@@ -66,11 +69,13 @@
     private String expectedRelatesTo;
     private String expectedAction;
     
+    @Before
     public void setUp() {
         aggregator = new MAPAggregator();
         control = EasyMock.createNiceControl();
     }
 
+    @After
     public void tearDown() {
         expectedMAPs = null;
         expectedTo = null;
@@ -79,6 +84,7 @@
         expectedAction = null;
     }
 
+    @Test
     public void testRequestorOutboundUsingAddressingMAPsInContext() 
         throws Exception {
         Message message = setUpMessage(true, true, false, true, true);
@@ -87,6 +93,7 @@
         verifyMessage(message, true, true, true);
     }
     
+    @Test
     public void testRequestorOutboundUsingAddressingMAPsInContextZeroLengthAction() 
         throws Exception {
         Message message = setUpMessage(true, true, false, true, true, true);
@@ -95,6 +102,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundUsingAddressingMAPsInContextFault() 
         throws Exception {
         Message message = setUpMessage(true, true, false, true, true);
@@ -103,6 +111,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundUsingAddressingNoMAPsInContext() 
         throws Exception {
         Message message = setUpMessage(true, true, false, true, false);
@@ -111,6 +120,7 @@
         verifyMessage(message, true, true, true);
     }
     
+    @Test
     public void testRequestorOutboundUsingAddressingNoMAPsInContextFault() 
         throws Exception {
         Message message = setUpMessage(true, true, false, true, false);
@@ -119,6 +129,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundNotUsingAddressing() throws Exception {
         Message message = setUpMessage(true, true, false, false);
         aggregator.mediate(message, false);
@@ -126,6 +137,7 @@
         verifyMessage(message, true, true, false);
     }
 
+    @Test
     public void testRequestorOutboundNotUsingAddressingFault() 
         throws Exception {
         Message message = setUpMessage(true, true, false, false);
@@ -134,6 +146,7 @@
         verifyMessage(message, true, true, false);
     }
 
+    @Test
     public void testRequestorOutboundOnewayUsingAddressingMAPsInContext() 
         throws Exception {
         Message message = setUpMessage(true, true, true, true, true);
@@ -142,6 +155,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundOnewayUsingAddressingMAPsInContextFault() 
         throws Exception {
         Message message = setUpMessage(true, true, true, true, true);
@@ -150,6 +164,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundOnewayUsingAddressingNoMAPsInContext() 
         throws Exception {
         Message message = setUpMessage(true, true, true, true, false);
@@ -158,6 +173,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundOnewayUsingAddressingNoMAPsInContextFault() 
         throws Exception {
         Message message = setUpMessage(true, true, true, true, false);
@@ -166,6 +182,7 @@
         verifyMessage(message, true, true, true);
     }
 
+    @Test
     public void testRequestorOutboundOnewayNotUsingAddressing() throws Exception {
         Message message = setUpMessage(true, true, true, false);
         aggregator.mediate(message, false);
@@ -174,6 +191,7 @@
     }
     
 
+    @Test
     public void testRequestorOutboundOnewayNotUsingAddressingFault() 
         throws Exception {
         Message message = setUpMessage(true, true, true, false);
@@ -182,6 +200,7 @@
         verifyMessage(message, true, true, false);
     }
 
+    @Test
     public void testResponderInboundValidMAPs() throws Exception {
         Message message = setUpMessage(false, false, false);
         aggregator.mediate(message, false);
@@ -189,6 +208,7 @@
         verifyMessage(message, false, false, false);
     }
     
+    @Test
     public void testResponderInboundDecoupled() throws Exception {
         Message message = 
             setUpMessage(false, false, false, true, false, true);
@@ -197,6 +217,7 @@
         verifyMessage(message, false, false, true);
     }
     
+    @Test
     public void testResponderInboundOneway() throws Exception {
         Message message = 
             setUpMessage(false, false, true, true, false, true);
@@ -205,6 +226,7 @@
         verifyMessage(message, false, false, true);
     }
 
+    @Test
     public void testResponderInboundValidMAPsFault() throws Exception {
         Message message = setUpMessage(false, false, false);
         aggregator.mediate(message, true);
@@ -212,6 +234,7 @@
         verifyMessage(message, false, false, true);
     }
 
+    @Test
     public void testResponderInboundInvalidMAPs() throws Exception {
         aggregator.messageIDs.put("urn:uuid:12345", "urn:uuid:12345");
         Message message = setUpMessage(false, false, false);
@@ -221,6 +244,7 @@
         verifyMessage(message, false, false, false /*check*/);
     }
 
+    @Test
     public void testResponderInboundInvalidMAPsFault() throws Exception {
         aggregator.messageIDs.put("urn:uuid:12345", "urn:uuid:12345");
         Message message = setUpMessage(false, false, false);
@@ -230,6 +254,7 @@
         verifyMessage(message, false, false, false /*check*/);
     }
 
+    @Test
     public void testResponderOutbound() throws Exception {
         Message message = setUpMessage(false, true, false);
         aggregator.mediate(message, false);
@@ -237,6 +262,7 @@
         verifyMessage(message, false, true, true);
     }
     
+    @Test
     public void testResponderOutboundZeroLengthAction() throws Exception {
         Message message = 
             setUpMessage(false, true, false, false, false, false, false);
@@ -245,6 +271,7 @@
         verifyMessage(message, false, true, true);
     }
 
+    @Test
     public void testResponderOutboundFault() throws Exception {
         Message message = setUpMessage(new boolean[] {false,
                                                       true,
@@ -259,6 +286,7 @@
         verifyMessage(message, false, true, true);
     }
 
+    @Test
     public void testRequestorInbound() throws Exception {
         Message message = setUpMessage(true, false, false);
         aggregator.mediate(message, false);
@@ -266,6 +294,7 @@
         verifyMessage(message, true, false, false /*check*/);
     }
 
+    @Test
     public void testRequestorInboundFault() throws Exception {
         Message message = setUpMessage(true, false, false);
         aggregator.mediate(message, true);
@@ -273,6 +302,7 @@
         verifyMessage(message, true, false, false /*check*/);
     }
 
+    
     private Message setUpMessage(boolean requestor, 
                                  boolean outbound,
                                  boolean oneway) 
@@ -280,6 +310,7 @@
         return setUpMessage(requestor, outbound, oneway, false, false, false);
     }
 
+    
     private Message setUpMessage(boolean requestor, 
                                  boolean outbound,
                                  boolean oneway,
@@ -293,6 +324,7 @@
                             false);
     }
 
+    
     private Message setUpMessage(boolean requestor, 
                                  boolean outbound,
                                  boolean oneway,
@@ -307,6 +339,7 @@
                             false);
     }
 
+    
     private Message setUpMessage(boolean requestor, 
                                  boolean outbound,
                                  boolean oneway,
@@ -323,6 +356,7 @@
                             false);
     }
 
+    
     
     private Message setUpMessage(boolean requestor, 
                                  boolean outbound,

Modified: incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java Tue Jun 12 01:08:04 2007
@@ -35,7 +35,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
@@ -57,6 +56,10 @@
 import org.easymock.IArgumentMatcher;
 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;
 
 import static org.apache.cxf.message.Message.MIME_HEADERS;
 import static org.apache.cxf.message.Message.REQUESTOR_ROLE;
@@ -66,7 +69,7 @@
 import static org.apache.cxf.ws.addressing.JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND;
 
 
-public class MAPCodecTest extends TestCase {
+public class MAPCodecTest extends Assert {
 
     private MAPCodec codec;
     private IMocksControl control;
@@ -79,11 +82,13 @@
     private Exchange correlatedExchange;
     private boolean expectRelatesTo;
 
+    @Before
     public void setUp() {
         codec = new MAPCodec();
         control = EasyMock.createNiceControl();
     }
 
+    @After
     public void tearDown() {
         expectedNames = null;
         expectedDeclaredTypes = null;
@@ -94,6 +99,7 @@
         correlatedExchange = null;
     }
 
+    @Test
     public void testGetHeaders() throws Exception {
         Set<QName> headers = codec.getUnderstoodHeaders();
         assertTrue("expected From header", 
@@ -110,6 +116,7 @@
                    headers.contains(Names.WSA_MESSAGEID_QNAME));
     }
 
+    @Test
     public void testRequestorOutbound() throws Exception {
         SoapMessage message = setUpMessage(true, true);
         codec.handleMessage(message);
@@ -117,6 +124,7 @@
         verifyMessage(message, true, true, true);
     }
     
+    @Test
     public void testRequestorOutboundPreExistingSOAPAction() throws Exception {
         SoapMessage message = setUpMessage(true, true, false, true);
         codec.handleMessage(message);
@@ -125,6 +133,7 @@
         verifyMessage(message, true, true, true);
     }
     
+    @Test
     public void testRequestorOutboundNonNative() throws Exception {
         String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
         SoapMessage message = 
@@ -134,6 +143,7 @@
         verifyMessage(message, true, true, false);
     }
     
+    @Test
     public void testResponderInbound() throws Exception {
         SoapMessage message = setUpMessage(false, false);
         codec.handleMessage(message);
@@ -141,6 +151,7 @@
         verifyMessage(message, false, false, true);
     }
 
+    @Test
     public void testResponderOutbound() throws Exception {
         SoapMessage message = setUpMessage(false, true);
         codec.handleMessage(message);
@@ -148,6 +159,7 @@
         verifyMessage(message, false, true, true);
     }
     
+    @Test
     public void testResponderInboundNonNative() throws Exception {
         String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
         SoapMessage message = 
@@ -157,6 +169,7 @@
         verifyMessage(message, false, false, false);
     }
     
+    @Test
     public void testResponderOutboundInvalidMAP() throws Exception {
         SoapMessage message = setUpMessage(false, true, true);
         try {
@@ -171,6 +184,7 @@
         verifyMessage(message, false, true, true);
     }
     
+    @Test
     public void testResponderOutboundPreExistingSOAPAction() throws Exception {
         SoapMessage message = setUpMessage(false, true, false, true);
         codec.handleMessage(message);
@@ -179,6 +193,7 @@
         verifyMessage(message, false, true, true);
     }
 
+    @Test
     public void testResponderOutboundNonNative() throws Exception {
         String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
         SoapMessage message = 
@@ -188,6 +203,7 @@
         verifyMessage(message, false, true, false);
     }
     
+    @Test
     public void testRequestorInbound() throws Exception {
         SoapMessage message = setUpMessage(true, false);
         codec.handleMessage(message);
@@ -195,6 +211,7 @@
         verifyMessage(message, true, false, true);
     }
     
+    @Test
     public void testRequestorInboundNonNative() throws Exception {
         String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
         SoapMessage message = 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java Tue Jun 12 01:08:04 2007
@@ -99,8 +99,8 @@
             Holder<DataHandler> param = new Holder<DataHandler>();
             byte[] data = new byte[(int) fileSize];
             this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl").read(data);
-            param.value = new DataHandler(new ByteArrayDataSource(data, "application/octet-stream"));
             
+            param.value = new DataHandler(new ByteArrayDataSource(data, "application/octet-stream"));
             Holder<String> name = new Holder<String>("call detail");
             mtomPort.testXop(name, param);
             assertEquals("name unchanged", "return detail + call detail", name.value);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestAttachmentOutInterceptor.java Tue Jun 12 01:08:04 2007
@@ -19,13 +19,13 @@
 
 package org.apache.cxf.systest.mtom;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Attachment;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
+import org.junit.Assert;
 
 public class TestAttachmentOutInterceptor extends AbstractPhaseInterceptor<Message> {
 
@@ -35,10 +35,10 @@
     }
 
     public void handleMessage(Message message) throws Fault {
-        TestCase.assertEquals("check attachment count", message.getAttachments().size(), 1);
+        Assert.assertEquals("check attachment count", message.getAttachments().size(), 1);
         Attachment att = message.getAttachments().iterator().next();
-        TestCase.assertNotNull("Attachment is null", att);
-        TestCase.assertNotNull("Attachment content-type is null", att.getDataHandler().getDataSource()
+        Assert.assertNotNull("Attachment is null", att);
+        Assert.assertNotNull("Attachment content-type is null", att.getDataHandler().getDataSource()
                 .getContentType());
     }
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/TestMultipartMessageInterceptor.java Tue Jun 12 01:08:04 2007
@@ -19,12 +19,12 @@
 
 package org.apache.cxf.systest.mtom;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
+import org.junit.Assert;
 
 public class TestMultipartMessageInterceptor extends AbstractPhaseInterceptor<Message> {
 
@@ -33,7 +33,7 @@
     }
 
     public void handleMessage(Message message) throws Fault {
-        TestCase.assertNotNull(message.getAttachments());
-        TestCase.assertEquals(1, message.getAttachments().size());
+        Assert.assertNotNull(message.getAttachments());
+        Assert.assertEquals(1, message.getAttachments().size());
     }
 }

Modified: incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/rpc/TestRPCHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/rpc/TestRPCHeaderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/rpc/TestRPCHeaderTest.java (original)
+++ incubator/cxf/trunk/testutils/src/test/java/org/apache/header_test/rpc/TestRPCHeaderTest.java Tue Jun 12 01:08:04 2007
@@ -23,11 +23,14 @@
 
 import javax.jws.WebParam;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class TestRPCHeaderTest extends TestCase {
+
+public class TestRPCHeaderTest extends Assert {
     Class<TestRPCHeader> cls = TestRPCHeader.class;
 
+    @Test
     public void testHeader1() {
         Method meths[] = cls.getMethods();
         for (Method m : meths) {
@@ -46,6 +49,7 @@
         
     }
 
+    @Test
     public void testInOutHeader() {
         Method meths[] = cls.getMethods();
         for (Method m : meths) {

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/common/ToolContextTest.java Tue Jun 12 01:08:04 2007
@@ -23,16 +23,21 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class ToolContextTest extends TestCase {
+
+public class ToolContextTest extends Assert {
 
     ToolContext context = new ToolContext();
-    
+
+    @Before
     public void setUp() {        
         context.setParameters(new HashMap<String, Object>());
     }
     
+    @Test
     public void testGetQName() throws Exception {
         assertNull(context.getQName(ToolConstants.CFG_SERVICENAME));
         

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtilTest.java Tue Jun 12 01:08:04 2007
@@ -19,10 +19,14 @@
 
 package org.apache.cxf.tools.util;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class BuiltInTypesJavaMappingUtilTest extends TestCase {
+
+public class BuiltInTypesJavaMappingUtilTest extends Assert {
     private final String xmlSchemaNS = "http://www.w3.org/2000/10/XMLSchema";
+    
+    @Test
     public void testGetJType() {
         String jType = BuiltInTypesJavaMappingUtil.getJType(xmlSchemaNS, "string");
         assertEquals(jType, "java.lang.String");

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/FileWriterUtilTest.java Tue Jun 12 01:08:04 2007
@@ -20,9 +20,11 @@
 package org.apache.cxf.tools.util;
 import java.io.File;
 import java.io.IOException;
-import junit.framework.TestCase;
 
-public class FileWriterUtilTest extends TestCase {
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileWriterUtilTest extends Assert {
 
     private void cleanDir(File dir) {
         try {
@@ -39,6 +41,7 @@
         dir.delete();
     }
 
+    @Test
     public void testGetFile() throws Exception {
         FileWriterUtil fileWriter = null;    
         String tmpDir = System.getProperty("java.io.tmpdir");
@@ -59,6 +62,7 @@
 
     }
 
+    @Test
     public void testGetWriter() throws Exception {
         FileWriterUtil fileWriter = null;
         String tmpDir = System.getProperty("java.io.tmpdir");

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/NameUtilTest.java Tue Jun 12 01:08:04 2007
@@ -19,9 +19,13 @@
 
 package org.apache.cxf.tools.util;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class NameUtilTest extends TestCase {
+
+public class NameUtilTest extends Assert {
+    
+    @Test
     public void testMangleToClassName() {
         assertEquals("Abc100Xyz",
                      NameUtil.mangleNameToClassName("abc100xyz"));
@@ -32,6 +36,7 @@
         assertEquals("Int", NameUtil.mangleNameToClassName("int"));
     }
 
+    @Test
     public void testMangleToVariableName() {
         assertEquals("abc100Xyz",
                      NameUtil.mangleNameToVariableName("abc100xyz"));
@@ -43,6 +48,7 @@
                      NameUtil.mangleNameToVariableName("int"));
     }
 
+    @Test
     public void testIsJavaIdentifier() {
         assertFalse(NameUtil.isJavaIdentifier("int"));
     }

Modified: incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java (original)
+++ incubator/cxf/trunk/tools/common/src/test/java/org/apache/cxf/tools/util/URIParserUtilTest.java Tue Jun 12 01:08:04 2007
@@ -19,17 +19,22 @@
 
 package org.apache.cxf.tools.util;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class URIParserUtilTest extends TestCase {
 
+public class URIParserUtilTest extends Assert {
+
+    @Test
     public void testGetPackageName() {
+        
         String packageName = URIParserUtil.getPackageName("http://www.cxf.iona.com");
         assertEquals(packageName, "com.iona.cxf");
         packageName = URIParserUtil.getPackageName("urn://www.class.iona.com");
         assertEquals(packageName, "com.iona._class");
     }
 
+    @Test
     public void testNormalize() throws Exception {
         String uri = "wsdl/hello_world.wsdl";
         assertEquals("file:wsdl/hello_world.wsdl", URIParserUtil.normalize(uri));
@@ -53,6 +58,7 @@
         assertEquals("file:/c:/hello.wsdl", URIParserUtil.normalize(uri));
     }
 
+    @Test
     public void testGetAbsoluteURI() throws Exception {
         String uri = "wsdl/hello_world.wsdl";
         String uri2 = URIParserUtil.getAbsoluteURI(uri);

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/WSDLGeneratorFactoryTest.java Tue Jun 12 01:08:04 2007
@@ -19,12 +19,14 @@
 
 package org.apache.cxf.tools.java2wsdl.generator;
 
-import junit.framework.TestCase;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.WSDL11Generator;
 import org.apache.cxf.wsdl.WSDLConstants;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WSDLGeneratorFactoryTest extends TestCase {
+public class WSDLGeneratorFactoryTest extends Assert {
 
+    @Test
     public void testNewWSDL11Generator() {
         WSDLGeneratorFactory factory = new WSDLGeneratorFactory();
         factory.setWSDLVersion(WSDLConstants.WSDLVersion.WSDL11);

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanAnnotatorTest.java Tue Jun 12 01:08:04 2007
@@ -22,11 +22,12 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class WrapperBeanAnnotatorTest extends TestCase {
+public class WrapperBeanAnnotatorTest extends Assert {
 
     @Test
     public void testAnnotate() {

Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/annotator/WrapperBeanFieldAnnotatorTest.java Tue Jun 12 01:08:04 2007
@@ -19,13 +19,14 @@
 
 package org.apache.cxf.tools.java2wsdl.generator.wsdl11.annotator;
 
-import junit.framework.TestCase;
+
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaClass;
 import org.apache.cxf.tools.common.model.JavaField;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class WrapperBeanFieldAnnotatorTest extends TestCase {
+public class WrapperBeanFieldAnnotatorTest extends Assert {
 
     @Test
     public void testAnnotate() {

Modified: incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainerTest.java Tue Jun 12 01:08:04 2007
@@ -21,13 +21,16 @@
 
 import java.net.URISyntaxException;
 
-import junit.framework.TestCase;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolException;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WSDLToJavaContainerTest extends TestCase {
+public class WSDLToJavaContainerTest extends Assert {
+    
+    @Test
     public void testNoPlugin() throws Exception {
         WSDLToJavaContainer container = new WSDLToJavaContainer("dummy", null);
 

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java Tue Jun 12 01:08:04 2007
@@ -21,8 +21,6 @@
 
 import java.util.Map;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.tools.common.Processor;
 import org.apache.cxf.tools.plugin.FrontEnd;
 import org.apache.cxf.tools.plugin.Generator;
@@ -32,8 +30,12 @@
 import org.apache.cxf.tools.wsdlto.core.PluginLoader;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.WSDLToJavaProcessor;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class JAXWSProfileTest extends TestCase {
+public class JAXWSProfileTest extends Assert {
+    
+    @Test
     public void testLoadPlugins() {
         PluginLoader loader = PluginLoader.getInstance();
         assertNotNull(loader);

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessorTest.java Tue Jun 12 01:08:04 2007
@@ -19,10 +19,13 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class PortTypeProcessorTest extends TestCase {
+
+public class PortTypeProcessorTest extends Assert {
     
+    @Test
     public void testProcess() throws Exception {
     }
 }

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtilTest.java Tue Jun 12 01:08:04 2007
@@ -19,14 +19,17 @@
 
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class ProcessorUtilTest extends TestCase {
+
+public class ProcessorUtilTest extends Assert {
 
     private boolean isWindows() {
         return System.getProperty("os.name").contains("Windows");
     }
     
+    @Test
     public void testGetAbsolutePath() throws Exception {
         assertEquals("http://cxf.org",
                      ProcessorUtil.getAbsolutePath("http://cxf.org"));

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebMethodAnnotatorTest.java Tue Jun 12 01:08:04 2007
@@ -21,13 +21,15 @@
 
 import java.util.Map;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaMethod;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WebMethodAnnotatorTest extends TestCase {
+public class WebMethodAnnotatorTest extends Assert {
 
+    @Test
     public void testAddWebMethodAnnotation() throws Exception {
         JavaMethod method = new JavaMethod();
         method.setName("echoFoo");
@@ -39,6 +41,7 @@
         assertEquals("WebMethod", annotations.keySet().iterator().next());
     }
 
+    @Test
     public void testAddWebResultAnnotation() throws Exception {
         JavaMethod method = new JavaMethod();
         method.annotate(new WebResultAnnotator());

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/annotator/WebParamAnnotatorTest.java Tue Jun 12 01:08:04 2007
@@ -23,17 +23,20 @@
 
 import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
-import junit.framework.TestCase;
 
 import org.apache.cxf.tools.common.model.JavaAnnotation;
 import org.apache.cxf.tools.common.model.JavaMethod;
 import org.apache.cxf.tools.common.model.JavaParameter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class WebParamAnnotatorTest extends TestCase {
+public class WebParamAnnotatorTest extends Assert {
 
     JavaMethod method;
     JavaParameter parameter;
 
+    @Before
     public void setUp() {
         method = new JavaMethod();
         parameter = new JavaParameter();
@@ -50,6 +53,7 @@
         param.setPartName("y");
     }
     
+    @Test
     public void testAnnotateDOCWrapped() throws Exception {
         init(method, parameter, SOAPBinding.Style.DOCUMENT, true);
         parameter.annotate(new WebParamAnnotator());
@@ -65,6 +69,7 @@
         //             annotation.toString());
     }
 
+    @Test
     public void testAnnotateDOCBare() throws Exception {
         init(method, parameter, SOAPBinding.Style.DOCUMENT, false);
 
@@ -83,6 +88,7 @@
         //             annotation.toString());
     }
 
+    @Test
     public void testAnnotateRPC() throws Exception {
         init(method, parameter, SOAPBinding.Style.RPC, true);
         parameter.annotate(new WebParamAnnotator());

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/InterfaceMapperTest.java Tue Jun 12 01:08:04 2007
@@ -20,15 +20,18 @@
 package org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.mapper;
 
 import javax.xml.namespace.QName;
-import junit.framework.TestCase;
 
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.model.JavaInterface;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class InterfaceMapperTest extends TestCase {
+public class InterfaceMapperTest extends Assert {
+    
+    @Test
     public void testMap() throws Exception {
         InterfaceInfo interfaceInfo = new InterfaceInfo(new ServiceInfo(),
                                                         new QName("http://apache.org/hello_world_soap_http",
@@ -47,6 +50,7 @@
         assertEquals("http://localhost/?wsdl", intf.getLocation());
     }
     
+    @Test
     public void testMapWithUniqueWsdlLoc() throws Exception {
         InterfaceInfo interfaceInfo = new InterfaceInfo(new ServiceInfo(),
                                                         new QName("http://apache.org/hello_world_soap_http",

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/mapper/MethodMapperTest.java Tue Jun 12 01:08:04 2007
@@ -21,13 +21,14 @@
 
 import javax.wsdl.OperationType;
 import javax.xml.namespace.QName;
-import junit.framework.TestCase;
 
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.tools.common.model.JavaMethod;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class MethodMapperTest extends TestCase {
+public class MethodMapperTest extends Assert {
 
     private OperationInfo getOperation() {
         OperationInfo operation = new OperationInfo();
@@ -35,6 +36,7 @@
         return operation;
     }
     
+    @Test
     public void testMap() throws Exception {
         JavaMethod method = new MethodMapper().map(getOperation());
         assertNotNull(method);
@@ -47,6 +49,7 @@
         assertFalse(method.isOneWay());
     }
 
+    @Test
     public void testMapOneWayOperation() throws Exception {
         OperationInfo operation = getOperation();
 
@@ -58,6 +61,7 @@
         assertTrue(method.isOneWay());
     }
 
+    @Test
     public void testMapWrappedOperation() throws Exception {
         OperationInfo operation = getOperation();
         operation.setUnwrappedOperation(operation);

Modified: incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Tue Jun 12 01:08:04 2007
@@ -28,19 +28,22 @@
 import javax.wsdl.extensions.ExtensibilityElement;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.tools.common.ToolConstants;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.customiztion.JAXWSBinding;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JAXWSDefinitionBuilderTest extends TestCase {
+public class JAXWSDefinitionBuilderTest extends Assert {
     private ToolContext env;
 
+    @Before
     public void setUp() {
         env = new ToolContext();
     }
 
+    @Test
     public void testCustomization() {
         env.put(ToolConstants.CFG_WSDLURL, getClass().getResource("resources/hello_world.wsdl").toString());
         env.put(ToolConstants.CFG_BINDING, getClass().getResource("resources/binding2.xml").toString());
@@ -86,7 +89,7 @@
     
     
     
-    
+    @Test
     public void testCustomizationWithDifferentNS() {
         env.put(ToolConstants.CFG_WSDLURL, getClass().getResource("resources/hello_world.wsdl").toString());
         env.put(ToolConstants.CFG_BINDING, getClass().getResource("resources/binding3.xml").toString());
@@ -131,6 +134,7 @@
     }
 
     // tests the error case described in JIRA CXF-556
+    @Test
     public void testCustomizationWhereURINotAnExactStringMatch() {
         // set up a URI with ./../wsdl11/hello_world.wsdl instead of
         // ./hello_world.wsdl 

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/WSDLToJavaTest.java Tue Jun 12 01:08:04 2007
@@ -19,11 +19,13 @@
 
 package org.apache.cxf.tools.wsdlto;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class WSDLToJavaTest extends TestCase {
 
-    
+public class WSDLToJavaTest extends Assert {
+
+    @Test
     public void testGetFrontEndName() throws Exception {
         WSDLToJava w2j = new WSDLToJava();
         assertEquals("jaxws", w2j.getFrontEndName(new String[]{"-frontend", "jaxws"}));
@@ -34,6 +36,7 @@
         assertNull(w2j.getFrontEndName(null));
     }
 
+    @Test
     public void testGetDataBindingName() throws Exception {
         WSDLToJava w2j = new WSDLToJava();
         assertEquals("jaxb", w2j.getDataBindingName(new String[]{"-databinding", "jaxb"}));
@@ -45,6 +48,7 @@
         assertNull(w2j.getDataBindingName(new String[]{"-frontend", "jaxws"}));
     }
 
+    @Test
     public void testIsVerbose() {
         WSDLToJava w2j = new WSDLToJava();
         w2j.setArguments(new String[]{"-V"});

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java Tue Jun 12 01:08:04 2007
@@ -21,16 +21,17 @@
 
 import java.util.Map;
 
-import junit.framework.TestCase;
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.tools.plugin.DataBinding;
 import org.apache.cxf.tools.plugin.FrontEnd;
 import org.apache.cxf.tools.plugin.Generator;
 import org.apache.cxf.tools.plugin.Plugin;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class PluginLoaderTest extends TestCase {
+public class PluginLoaderTest extends Assert {
    
-    
+    @Test
     public void testLoadPlugins() throws Exception {
         PluginLoader loader = PluginLoader.getInstance();
         assertEquals(2, loader.getPlugins().size());

Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java?view=diff&rev=546410&r1=546409&r2=546410
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/wsdl11/JAXWSDefinitionBuilderTest.java Tue Jun 12 01:08:04 2007
@@ -29,20 +29,24 @@
 import javax.wsdl.extensions.http.HTTPAddress;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
 import org.apache.cxf.bindings.xformat.XMLBindingMessageFormat;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11.JAXWSDefinitionBuilder;
 import org.apache.cxf.transport.jms.AddressType;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class JAXWSDefinitionBuilderTest extends TestCase {
+public class JAXWSDefinitionBuilderTest extends Assert {
     private ToolContext env;
 
+    @Before
     public void setUp() {
         env = new ToolContext();
     }
 
 
+    @Test
     public void testBuildDefinitionWithXMLBinding() {
         String qname = "http://apache.org/hello_world_xml_http/bare";
         String wsdlUrl = getClass().getResource("resources/hello_world_xml_bare.wsdl").toString();
@@ -80,6 +84,7 @@
         assertTrue(input.getExtensibilityElements().get(0) instanceof XMLBindingMessageFormat);
     }
 
+    @Test
     public void testBuildDefinitionWithJMSTransport() {
         String qname = "http://cxf.apache.org/hello_world_jms";
         String wsdlUrl = getClass().getResource("resources/jms_test.wsdl").toString();



Mime
View raw message