cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r516103 [6/11] - in /incubator/cxf/trunk: ./ common/common/src/test/java/org/apache/cxf/common/annotation/ common/common/src/test/java/org/apache/cxf/common/classloader/ common/common/src/test/java/org/apache/cxf/common/commands/ common/com...
Date Thu, 08 Mar 2007 17:15:05 GMT
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java Thu Mar  8 09:14:44 2007
@@ -36,6 +36,7 @@
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.apache.hello_world_soap_http.HelloImpl;
 import org.apache.hello_world_soap_http.HelloWrongAnnotation;
+import org.junit.Test;
 
 public class EndpointImplTest extends AbstractJaxWsTest {
 
@@ -46,6 +47,7 @@
     }
 
 
+    @Test
     public void testEndpoint() throws Exception {   
         GreeterImpl greeter = new GreeterImpl();
         EndpointImpl endpoint = new EndpointImpl(getBus(), greeter, "anyuri");
@@ -66,6 +68,7 @@
     }
     
 
+    @Test
     public void testEndpointServiceConstructor() throws Exception {   
         GreeterImpl greeter = new GreeterImpl();
         JaxWsServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();
@@ -89,6 +92,7 @@
         assertNotNull(ctx);
     }
     
+    @Test
     public void testWSAnnoWithoutWSDLLocationInSEI() throws Exception {
         HelloImpl hello = new HelloImpl();
         JaxWsServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();
@@ -107,6 +111,7 @@
         }
     }
     
+    @Test
     public void testSOAPBindingOnMethodWithRPC() {
         HelloWrongAnnotation hello = new HelloWrongAnnotation();
         JaxWsServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java Thu Mar  8 09:14:44 2007
@@ -23,7 +23,6 @@
 
 import org.w3c.dom.Node;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
 import org.apache.cxf.service.Service;
@@ -31,18 +30,12 @@
 import org.apache.cxf.service.invoker.BeanInvoker;
 import org.apache.cxf.transport.local.LocalTransportFactory;
 import org.apache.hello_world_soap_http.GreeterImpl;
+import org.junit.Test;
 
 public class GreeterTest extends AbstractJaxWsTest {
 
-    private Bus bus;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        
-        bus = getBus();
-    }
 
+    @Test
     public void testEndpoint() throws Exception {
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         URL resource = getClass().getResource("/wsdl/hello_world.wsdl");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/HeaderTest.java Thu Mar  8 09:14:44 2007
@@ -35,8 +35,11 @@
 import org.apache.header_test.TestHeaderImpl;
 import org.apache.header_test.types.TestHeader5;
 import org.apache.header_test.types.TestHeader5ResponseBody;
+import org.junit.Test;
 
 public class HeaderTest extends AbstractJaxWsTest {
+    
+    @Test
     public void testInvocation() throws Exception {
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JAXWSMethodInvokerTest.java Thu Mar  8 09:14:44 2007
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.jaxws;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.common.util.factory.Factory;
 import org.apache.cxf.jaxws.service.Hello;
@@ -26,12 +25,15 @@
 
 import org.apache.cxf.service.invoker.ScopePolicy;
 import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class JAXWSMethodInvokerTest extends TestCase {
+public class JAXWSMethodInvokerTest {
     Factory factory = EasyMock.createMock(Factory.class);
     Object target = EasyMock.createMock(Hello.class);
     ScopePolicy scope = EasyMock.createMock(ScopePolicy.class);
-           
+        
+    @Test
     public void testFactoryBeans() throws Throwable {
         EasyMock.reset(factory);
         factory.create();
@@ -40,7 +42,7 @@
         JAXWSMethodInvoker jaxwsMethodInvoker = new JAXWSMethodInvoker(factory);
         Exchange ex = EasyMock.createMock(Exchange.class);               
         Object object = jaxwsMethodInvoker.getServiceObject(ex);
-        assertEquals("the target object and service object should be equal ", object, target);
+        Assert.assertEquals("the target object and service object should be equal ", object, target);
         EasyMock.verify(factory);
     }
         

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java Thu Mar  8 09:14:44 2007
@@ -46,6 +46,8 @@
 import org.apache.hello_world_soap_http.BadRecordLitFault;
 import org.apache.hello_world_soap_http.Greeter;
 import org.apache.hello_world_soap_http.GreeterImpl;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JaxWsClientTest extends AbstractJaxWsTest {
 
@@ -55,9 +57,10 @@
                     "SoapPort");
     private final String address = "http://localhost:9000/SoapContext/SoapPort";
     private Destination d;
-    @Override
+    
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
+        super.setUpBus();
 
         EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
         ei.setAddress(address);
@@ -65,6 +68,7 @@
         d = localTransport.getDestination(ei);
     }
 
+    @Test
     public void testCreate() throws Exception {
         javax.xml.ws.Service s = javax.xml.ws.Service
             .create(new QName("http://apache.org/hello_world_soap_http", "SoapPort"));
@@ -78,6 +82,7 @@
         }
     }
     
+    @Test
     public void testRequestContext() throws Exception {
         javax.xml.ws.Service s = javax.xml.ws.Service
         .create(serviceName);
@@ -98,6 +103,7 @@
         }
     }
 
+    @Test
     public void testEndpoint() throws Exception {
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         URL resource = getClass().getResource("/wsdl/hello_world.wsdl");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java Thu Mar  8 09:14:44 2007
@@ -21,8 +21,11 @@
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxws.service.Hello;
 import org.apache.hello_world_doc_lit.GreeterImplDoc;
+import org.junit.Test;
 
 public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest {
+    
+    @Test
     public void testBean() {
         JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
         sf.setBus(getBus());
@@ -34,6 +37,7 @@
         assertNotNull(server);
     }
     
+    @Test
     public void testBareGreeter() throws Exception {
         JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
         sf.setBus(getBus());

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java Thu Mar  8 09:14:44 2007
@@ -18,7 +18,12 @@
  */
 package org.apache.cxf.jaxws;
 
+import org.junit.Ignore;
+import org.junit.Test;
+
 public class ServiceImplTest extends AbstractJaxWsTest {
+    @Test
+    @Ignore
     public void testServiceImpl() throws Exception {
         // new ServiceImpl(getBus(), )
     }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java Thu Mar  8 09:14:44 2007
@@ -40,6 +40,8 @@
 import org.apache.cxf.service.model.ServiceModelUtil;
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ServiceModelUtilsTest extends AbstractJaxWsTest {
    
@@ -47,8 +49,9 @@
     Exchange exchange;
     ReflectionServiceFactoryBean bean;
     
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
+        super.setUpBus();
         
         message = new MessageImpl();        
         exchange = new ExchangeImpl();
@@ -70,6 +73,7 @@
         return service;
     }
 
+    @Test
     public void testGetOperationInputPartNamesWrapped() throws Exception {
         getService(getClass().getResource("/wsdl/hello_world.wsdl"),
                    GreeterImpl.class,
@@ -89,6 +93,7 @@
         assertEquals(0, names.size());
     }
     
+    @Test
     public void testGetOperationInputPartNamesWrapped2() throws Exception {
         getService(getClass().getResource("/wsdl/calculator.wsdl"),
                    CalculatorImpl.class,
@@ -103,6 +108,7 @@
         assertEquals("arg1", names.get(1));
     }
 
+    @Test
     public void testGetOperationInputPartNamesBare() throws Exception {
         getService(getClass().getResource("/wsdl/hello_world_xml_bare.wsdl"),
                    org.apache.hello_world_xml_http.bare.GreeterImpl.class,
@@ -122,6 +128,7 @@
     }
     
     
+    @Test
     public void testGetOperationInputPartNamesRpc() throws Exception {
         getService(getClass().getResource("/wsdl/hello_world_rpc_lit.wsdl"),
                    RPCLitGreeterImpl.class,

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java Thu Mar  8 09:14:44 2007
@@ -23,7 +23,6 @@
 
 import org.w3c.dom.Node;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
@@ -36,17 +35,16 @@
 import org.apache.cxf.service.invoker.BeanInvoker;
 import org.apache.cxf.transport.local.LocalTransportFactory;
 import org.apache.hello_world_soap_http.GreeterImpl;
+import org.junit.Before;
+import org.junit.Test;
 
 public class SoapFaultTest extends AbstractJaxWsTest {
 
-    private Bus bus;
     private Service service;
 
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-
-        bus = getBus();
+        super.setUpBus();
 
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         URL resource = getClass().getResource("/wsdl/hello_world.wsdl");
@@ -68,6 +66,7 @@
         svrFactory.create();
     }
 
+    @Test
     public void testInterceptorThrowingSoapFault() throws Exception {
         service.getInInterceptors().add(new FaultThrowingInterceptor());
 
@@ -85,6 +84,7 @@
      * We need to get the jaxws fault -> soap fault conversion working for this
      * @throws Exception
      */
+    @Test
     public void testWebServiceException() throws Exception {
         Node response = invoke("http://localhost:9000/SoapContext/SoapPort",
                                LocalTransportFactory.TRANSPORT_ID, "GreeterGetFaultMessage.xml");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java Thu Mar  8 09:14:44 2007
@@ -42,14 +42,17 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.test.AbstractCXFTest;
+import org.junit.Before;
+import org.junit.Test;
 
 public class URIMappingInterceptorDocLitTest extends AbstractCXFTest {
     
     Message message;
     String ns = "http://apache.org/cxf/calculator";
     
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
+        super.setUpBus();
         BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", 
                                    new SoapBindingFactory());
@@ -80,6 +83,7 @@
         exchange.put(Endpoint.class, endpoint);        
     }
     
+    @Test
     public void testGetAddFromPath() throws Exception {
         message.put(Message.FIXED_PARAMETER_ORDER, Boolean.TRUE);
         message.put(Message.PATH_INFO, "/CalculatorService/SoapPort/add/arg0/1/arg1/0");
@@ -92,6 +96,7 @@
         assertion();        
     }
     
+    @Test
     public void testGetAddFromQuery() throws Exception {
         message.put(Message.FIXED_PARAMETER_ORDER, Boolean.TRUE);
         message.put(Message.PATH_INFO, "/CalculatorService/SoapPort/add");
@@ -104,6 +109,7 @@
         assertion();
     }
     
+    @Test
     public void testGetAddFromQueryOrdered() throws Exception {
         message.put(Message.PATH_INFO, "/CalculatorService/SoapPort/add");
         message.put(Message.QUERY_STRING, "arg1=0&arg0=1");
@@ -115,6 +121,7 @@
         assertion();
     }
     
+    @Test
     public void testGetAddFromPathOrdered() throws Exception {
         message.put(Message.PATH_INFO, "/CalculatorService/SoapPort/add/arg1/0/arg0/1");
         
@@ -125,6 +132,7 @@
         assertion();
     }    
     
+    @Test
     public void testGetAddFromQueryOrderedFault() throws Exception {        
         message.put(Message.PATH_INFO, "/CalculatorService/SoapPort/add");
         message.put(Message.QUERY_STRING, "one=1&two=2");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java Thu Mar  8 09:14:44 2007
@@ -42,14 +42,17 @@
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.test.AbstractCXFTest;
 import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
+import org.junit.Before;
+import org.junit.Test;
 
 public class URIMappingInterceptorRPCTest extends AbstractCXFTest {
     
     Message message;
     String ns = "http://apache.org/hello_world_rpclit";
     
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
+        super.setUpBus();
         BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class);
         bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", 
                                    new SoapBindingFactory());
@@ -79,6 +82,7 @@
         exchange.put(Endpoint.class, endpoint);
     }
     
+    @Test
     public void testGetSayHiFromPath() throws Exception {
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/sayHi");       
         
@@ -95,6 +99,7 @@
         assertEquals(new QName(ns, "sayHi"), boi.getName());
     }
     
+    @Test
     public void testGetGreetMeFromPath() throws Exception {
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/greetMe/in/king+author");
         
@@ -110,6 +115,7 @@
         assertEquals("king author", value);
     }
     
+    @Test
     public void testGetSayHiFromQueryFixedOrder() throws Exception {
         message.put(Message.FIXED_PARAMETER_ORDER, Boolean.TRUE);
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/greetMe");
@@ -123,6 +129,7 @@
         assertion();
     }
     
+    @Test
     public void testGetSayHiFromQueryRandomOrder() throws Exception {
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/greetMe");
         message.put(Message.QUERY_STRING, "in=king");
@@ -134,6 +141,7 @@
         assertion();
     }
     
+    @Test
     public void testGetSayHiFromQueryRandomOrderFault() throws Exception {
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/greetMe");
         message.put(Message.QUERY_STRING, "me=king");
@@ -157,6 +165,7 @@
         assertEquals("king", value);        
     }
     
+    @Test
     public void testGetSayHiFromQueryEncoded() throws Exception {
         message.put(Message.PATH_INFO, "/SOAPServiceRPCLit/SoapPort/greetMe");
         message.put(Message.QUERY_STRING, "in=king+author");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java Thu Mar  8 09:14:44 2007
@@ -38,6 +38,8 @@
 import org.apache.hello_world_soap_http.SOAPService;
 import org.apache.hello_world_soap_http.types.SayHi;
 import org.apache.hello_world_soap_http.types.SayHiResponse;
+import org.junit.Before;
+import org.junit.Test;
 
 
 public class DispatchTest extends AbstractJaxWsTest {
@@ -46,16 +48,15 @@
     private final String address = "http://localhost:9000/SoapContext/SoapPort";
     private Destination d;
 
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-
         EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
         ei.setAddress(address);
 
         d = localTransport.getDestination(ei);
     }
     
+    @Test
     public void testJAXB() throws Exception {
         d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
         
@@ -75,6 +76,7 @@
         assertTrue(response instanceof SayHiResponse);
     }
     
+    @Test
     public void testDOMSource() throws Exception {
         ServiceImpl service = 
             new ServiceImpl(getBus(), 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java Thu Mar  8 09:14:44 2007
@@ -50,6 +50,8 @@
 import org.apache.header_test.types.TestHeader5ResponseBody;
 import org.apache.header_test.types.TestHeader6;
 import org.apache.header_test.types.TestHeader6Response;
+import org.junit.Before;
+import org.junit.Test;
 
 
 public class HeaderClientServerTest extends AbstractJaxWsTest {
@@ -58,8 +60,8 @@
     private final QName portName = new QName("http://apache.org/header_test",
                                              "SoapHeaderPort");
 
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
         BusFactory.setDefaultBus(getBus());
         
         Object implementor = new TestHeaderImpl();
@@ -76,6 +78,7 @@
         
     }
 
+    @Test
     public void testInHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -95,6 +98,7 @@
         }
     } 
 
+    @Test
     public void testOutHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -121,6 +125,7 @@
         } 
     } 
 
+    @Test
     public void testInOutHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -156,6 +161,7 @@
         } 
     }
 
+    @Test
     public void testReturnHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -180,6 +186,7 @@
         } 
     } 
     
+    @Test
     public void testHeaderPartBeforeBodyPart() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -211,6 +218,7 @@
         }
     }
     
+    @Test
     public void testHeader4() {
         URL wsdl = getClass().getResource("/wsdl/soapheader.wsdl");
         assertNotNull(wsdl);
@@ -226,6 +234,7 @@
         }
     }
 
+    @Test
     public void testRPCInHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader_rpc.wsdl");
         assertNotNull(wsdl);
@@ -249,6 +258,7 @@
         }
     } 
     
+    @Test
     public void testRPCInOutHeader() throws Exception {
         URL wsdl = getClass().getResource("/wsdl/soapheader_rpc.wsdl");
         assertNotNull(wsdl);
@@ -274,9 +284,4 @@
             throw (Exception)ex.getCause();
         }
     } 
-    
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(HeaderClientServerTest.class);
-    }
 }

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/holder/HolderTest.java Thu Mar  8 09:14:44 2007
@@ -29,10 +29,12 @@
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Test;
 
 public class HolderTest extends AbstractJaxWsTest {
     private final String address = "http://localhost:9000/HolderService";
 
+    @Test
     public void testClient() throws Exception {
         EndpointInfo ei = new EndpointInfo(null, "http://schemas.xmlsoap.org/soap/http");
         ei.setAddress(address);
@@ -51,6 +53,7 @@
         assertEquals("two", holder.value);
     }
     
+    @Test
     public void testServer() throws Exception {
         JaxWsServerFactoryBean svr = new JaxWsServerFactoryBean();
         svr.setBus(getBus());

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderServiceFactoryTest.java Thu Mar  8 09:14:44 2007
@@ -38,8 +38,10 @@
 import org.apache.cxf.service.model.InterfaceInfo;
 import org.apache.cxf.transport.local.LocalTransportFactory;
 import org.apache.hello_world_soap_http.HWSoapMessageProvider;
+import org.junit.Test;
 
 public class ProviderServiceFactoryTest extends AbstractJaxWsTest {
+    @Test
     public void testFromWSDL() throws Exception {
         URL resource = getClass().getResource("/wsdl/hello_world.wsdl");
         assertNotNull(resource);
@@ -74,6 +76,7 @@
             .getProperty(AbstractBindingFactory.DATABINDING_DISABLED));
     }
 
+    @Test
     public void testXMLBindingFromCode() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(DOMSourcePayloadProvider.class);
@@ -107,6 +110,7 @@
         assertValid("/j:sayHi", res);
     }
 
+    @Test
     public void testSOAPBindingFromCode() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(SOAPSourcePayloadProvider.class);
@@ -147,6 +151,7 @@
         assertValid("/s:Envelope/s:Body/j:sayHi", res);
     }
     
+    @Test
     public void testSAAJProviderCodeFirst() throws Exception {
         JaxWsServiceFactoryBean bean = new JaxWsServiceFactoryBean();
         bean.setServiceClass(SAAJProvider.class);
@@ -184,6 +189,7 @@
         assertValid("/s:Envelope/s:Body/j:sayHi", res);
     }
     
+    @Test
     public void testStreamSourceProviderCodeFirst() throws Exception {
         JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
         svrFactory.setServiceClass(StreamSourcePayloadProvider.class);
@@ -200,6 +206,7 @@
     }
     
 
+    @Test
     public void testSourceMessageProviderCodeFirst() throws Exception {
         JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
         svrFactory.setServiceClass(SourceMessageProvider.class);

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/provider/ProviderTest.java Thu Mar  8 09:14:44 2007
@@ -23,8 +23,10 @@
 import org.apache.cxf.jaxws.AbstractJaxWsTest;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Test;
 
 public class ProviderTest extends AbstractJaxWsTest {
+    @Test
     public void testInvocation() throws Exception {
         EndpointImpl ep = new EndpointImpl(getBus(), new PayloadProvider(), (String) null);
         ep.publish("http://localhost:9000/Provider");

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Thu Mar  8 09:14:44 2007
@@ -37,8 +37,11 @@
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.hello_world_soap_http.GreeterImpl;
+import org.junit.Test;
 
 public class JaxWsServiceFactoryBeanTest extends AbstractJaxWsTest {
+
+    @Test
     public void testEndpoint() throws Exception {
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
 
@@ -84,6 +87,7 @@
         assertNotNull(mpi.getTypeClass());
     }
     
+    @Test
     public void testHolder() throws Exception {
         ReflectionServiceFactoryBean bean = new JaxWsServiceFactoryBean();
 

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/AbstractSimpleFrontendTest.java Thu Mar  8 09:14:44 2007
@@ -26,11 +26,13 @@
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.DestinationFactoryManager;
 import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Before;
 
 public abstract class AbstractSimpleFrontendTest extends AbstractCXFTest {
 
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
+        super.setUpBus();
         
         Bus bus = getBus();
         

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java Thu Mar  8 09:14:44 2007
@@ -32,9 +32,11 @@
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
+import org.junit.Test;
 
 public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest {
 
+    @Test
     public void testClientFactoryBean() throws Exception {
         
         ClientFactoryBean cfBean = new ClientFactoryBean();

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Thu Mar  8 09:14:44 2007
@@ -39,10 +39,12 @@
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.junit.Test;
 
 public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest {
     private ReflectionServiceFactoryBean serviceFactory;
 
+    @Test
     public void testUnwrappedBuild() throws Exception {
         Service service = createService(false);
         
@@ -74,6 +76,7 @@
         assertEquals(1, op.getInput().getMessageParts().size());
     }
     
+    @Test
     public void testWrappedBuild() throws Exception {
         Service service = createService(true);
         
@@ -127,6 +130,7 @@
         return serviceFactory.create();        
     }
     
+    @Test
     public void testServerFactoryBean() throws Exception {
         Service service = createService(true);
         assertEquals("test", service.get("test"));

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/RountripTest.java Thu Mar  8 09:14:44 2007
@@ -24,9 +24,11 @@
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.junit.Test;
 
 public class RountripTest extends AbstractSimpleFrontendTest {
 
+    @Test
     public void testServerFactoryBean() throws Exception {
         ServerFactoryBean svrBean = new ServerFactoryBean();
         svrBean.setAddress("http://localhost/Hello");

Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Thu Mar  8 09:14:44 2007
@@ -32,9 +32,11 @@
 import org.apache.cxf.transport.DestinationFactory;
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.junit.Test;
 
 public class ServerFactoryTest extends AbstractSimpleFrontendTest {
 
+    @Test
     public void testSetDF() throws Exception {
         ServerFactoryBean svrBean = new ServerFactoryBean();
         svrBean.setAddress("http://localhost/Hello");

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Thu Mar  8 09:14:44 2007
@@ -24,8 +24,6 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.message.Exchange;
@@ -38,24 +36,40 @@
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.easymock.classextension.EasyMock;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
 
-public class AbstractJMSTester extends TestCase {
+public abstract class AbstractJMSTester extends Assert {
+    private static JMSBrokerSetup broker;
+    
     protected Bus bus;
     protected EndpointInfo endpointInfo;
     protected EndpointReferenceType target;
     protected MessageObserver observer;
     protected Message inMessage;
     
-    public AbstractJMSTester(String name) {
-        super(name);
+    public static void startBroker(JMSBrokerSetup b) throws Exception {
+        assertNotNull(b);
+        broker = b;
+        broker.start();
+    }
+    
+    @AfterClass 
+    public static void stopBroker() throws Exception {
+        broker.stop();
+        broker = null;
     }
     
+    @Before
     public void setUp() {
         BusFactory bf = BusFactory.newInstance();
         bus = bf.createBus();
         BusFactory.setDefaultBus(bus);
     }
     
+    @After
     public void tearDown() {
         bus.shutdown(true);
         if (System.getProperty("cxf.config.file") != null) {

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSBrokerSetup.java Thu Mar  8 09:14:44 2007
@@ -19,33 +19,24 @@
 
 package org.apache.cxf.transport.jms;
 
-import junit.extensions.TestSetup;
-import junit.framework.TestSuite;
-
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
 
 
-class JMSBrokerSetup extends TestSetup {
+class JMSBrokerSetup {
     JMSEmbeddedBroker jmsBrokerThread;
     String jmsBrokerUrl = "tcp://localhost:61616";
     String activeMQStorageDir;
-    public JMSBrokerSetup(TestSuite suite, String url) {
-        super(suite);
+    public JMSBrokerSetup(String url) {
         jmsBrokerUrl = url;
     }
     
-    public JMSBrokerSetup(TestSuite suite) {
-        super(suite);
-    }
-    
-    public void setUp() throws Exception {
-        
+    public void start() throws Exception {
         jmsBrokerThread = new JMSEmbeddedBroker(jmsBrokerUrl);
         jmsBrokerThread.startBroker();
     }
     
-    public void tearDown() throws Exception {
+    public void stop() throws Exception {
         synchronized (this) {
             jmsBrokerThread.shutdownBroker = true;
         }

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Thu Mar  8 09:14:44 2007
@@ -25,27 +25,23 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 
 public class JMSConduitTest extends AbstractJMSTester {
      
     
-    public JMSConduitTest(String name) {
-        super(name);
-    }   
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite(JMSConduitTest.class);
-        return  new JMSBrokerSetup(suite, "tcp://localhost:61500");        
+    @BeforeClass
+    public static void createAndStartBroker() throws Exception {
+        startBroker(new JMSBrokerSetup("tcp://localhost:61500"));
     }
     
+    @Test
     public void testGetConfiguration() throws Exception {
         // setup the new bus to get the configuration file
         SpringBusFactory bf = new SpringBusFactory();
@@ -58,7 +54,7 @@
                          "HelloWorldQueueBinMsgPort");
         JMSConduit conduit = setupJMSConduit(false, false);
         assertEquals("Can't get the right ClientReceiveTimeout",
-                     500,
+                     500L,
                      conduit.getClientConfig().getClientReceiveTimeout());
         assertEquals("Can't get the right SessionPoolConfig's LowWaterMark",
                      10,
@@ -71,6 +67,7 @@
         
     }
     
+    @Test
     public void testPrepareSend() throws Exception {
         setupServiceInfo("http://cxf.apache.org/hello_world_jms", 
                          "/wsdl/jms_test.wsdl", 
@@ -95,6 +92,7 @@
         
     }
     
+    @Test
     public void testSendOut() throws Exception {
         setupServiceInfo("http://cxf.apache.org/hello_world_jms", 
                          "/wsdl/jms_test.wsdl", 

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Thu Mar  8 09:14:44 2007
@@ -23,9 +23,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.message.Exchange;
@@ -36,17 +33,15 @@
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.transport.MessageObserver;
 import org.easymock.classextension.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JMSDestinationTest extends AbstractJMSTester {
     private Message destMessage;
     
-    public JMSDestinationTest(String name) {
-        super(name);        
-    }
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite(JMSDestinationTest.class);
-        return  new JMSBrokerSetup(suite, "tcp://localhost:61500");        
+    @BeforeClass
+    public static void createAndStartBroker() throws Exception {
+        startBroker(new JMSBrokerSetup("tcp://localhost:61500"));
     }
     
     private void waitForReceiveInMessage() {       
@@ -95,6 +90,7 @@
         return jmsDestination;
     }
     
+    @Test    
     public void testGetConfiguration() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         BusFactory.setDefaultBus(null);
@@ -106,7 +102,7 @@
                          "HelloWorldQueueBinMsgPort");
         JMSDestination destination = setupJMSDestination(false);
         assertEquals("Can't get the right ServerConfig's MessageTimeToLive ",
-                     500,
+                     500L,
                      destination.getServerConfig().getMessageTimeToLive());
         assertEquals("Can't get the right Server's MessageSelector",
                      "cxf_message_selector",
@@ -121,6 +117,7 @@
         
     }
     
+    @Test    
     public void testOneWayDestination() throws Exception {
         destMessage = null;
         inMessage = null;
@@ -204,6 +201,7 @@
         
     }
     
+    @Test    
     public void testRoundTripDestination() throws Exception {
        
         inMessage = null;
@@ -252,6 +250,7 @@
     }
     
 
+    @Test    
     public void testPropertyExclusion() throws Exception {
         
         final String customPropertyName = 

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSUtilsTest.java Thu Mar  8 09:14:44 2007
@@ -23,30 +23,15 @@
 
 import javax.naming.Context;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class JMSUtilsTest extends TestCase {
+public class JMSUtilsTest extends Assert {
 
-    public JMSUtilsTest(String name) {
-        super(name);
-    }
-
-    /**
-     * @param args
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(JMSUtilsTest.class);
-    }
-    
-    public void setUp() throws Exception {
-    }
-    
-    public void tearDown() throws Exception {
-        //
-    }
     
     // This is just a place holder for now it will be chaning in next task 
     // when the new JMS address policies and configurations are introdced.
+    @Test
     public void testpopulateIncomingContextNonNull() throws Exception {
         AddressType addrType =  new AddressType();
         

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/PooledSessionTest.java Thu Mar  8 09:14:44 2007
@@ -24,20 +24,13 @@
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import junit.framework.TestCase;
-
 import org.easymock.classextension.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class PooledSessionTest extends TestCase {
-
-    public PooledSessionTest(String arg0) {
-        super(arg0);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(PooledSessionTest.class);
-    }
+public class PooledSessionTest extends Assert {
 
+    @Test
     public void testPooledSession() throws Exception {
             
         Session sess =  EasyMock.createMock(Session.class);

Modified: incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-metadata.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-metadata.xsd?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-metadata.xsd (original)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/resources/schemas/ws-addr-metadata.xsd Thu Mar  8 09:14:44 2007
@@ -30,7 +30,7 @@
     <xs:element name="Addressing">
         <xs:complexType>
             <xs:sequence>
-                <xs:element ref="ref:Policy" />
+                <xs:element ref="tns:AnonymousResponses" />
 	    </xs:sequence>
             <xs:anyAttribute namespace="##other" processContents="lax"/>
         </xs:complexType>

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyInfoTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyInfoTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/EndpointPolicyInfoTest.java Thu Mar  8 09:14:44 2007
@@ -28,8 +28,6 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.interceptor.Interceptor;
@@ -45,18 +43,23 @@
 import org.apache.neethi.Policy;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class EndpointPolicyInfoTest extends TestCase {
+public class EndpointPolicyInfoTest extends Assert {
 
     private IMocksControl control;
     
+    @Before
     public void setUp() {
-        control = EasyMock.createNiceControl();        
+        control = EasyMock.createNiceControl();
     } 
     
+    @Test
     public void testAccessors() {
         EndpointPolicyInfo epi = new EndpointPolicyInfo();
         assertNull(epi.getPolicy());
@@ -87,6 +90,7 @@
         control.verify();
     }
     
+    @Test
     public void testInitialise() throws NoSuchMethodException {
         Method m1 = EndpointPolicyInfo.class.getDeclaredMethod("initialisePolicy",
             new Class[] {EndpointInfo.class, PolicyEngine.class});
@@ -115,6 +119,7 @@
         control.verify();        
     }
     
+    @Test
     public void testInitialisePolicy() {        
         EndpointInfo ei = control.createMock(EndpointInfo.class);
         PolicyEngine engine = control.createMock(PolicyEngine.class);
@@ -135,6 +140,7 @@
         control.verify();
     }
        
+    @Test
     public void testChooseAlternative() {
         EndpointPolicyInfo cpi = new EndpointPolicyInfo();
         cpi.setPolicy(new Policy());
@@ -191,10 +197,12 @@
         control.verify();
     }
     
+    @Test
     public void testInitialiseVocabularyServer() {
         dotestInitialiseVocabulary(false);
     }
     
+    @Test
     public void testInitialiseVocabularyClient() {
         dotestInitialiseVocabulary(true);
     }
@@ -276,10 +284,12 @@
         }
     }
     
+    @Test
     public void testInitialiseInterceptorsServer() {
         doTestInitialiseInterceptors(false);
     }
     
+    @Test
     public void testInitialiseInterceptorsClient() {
         doTestInitialiseInterceptors(true);
     }
@@ -334,12 +344,5 @@
         EasyMock.expect(bus.getExtension(PolicyInterceptorProviderRegistry.class)).andReturn(reg);
     }
     
-    public void testCheckEffectivePolicy() {
-        
-    }
-    
-    public void testCheckeffectiveFaultPolicy() {
-        
-    }
   
 }

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/NormalizeTest.java Thu Mar  8 09:14:44 2007
@@ -23,25 +23,31 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.ws.policy.builder.xml.XMLPrimitiveAssertionBuilder;
 import org.apache.neethi.Policy;
 import org.apache.neethi.util.PolicyComparator;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class NormalizeTest extends TestCase {
+public class NormalizeTest extends Assert {
     
     private String originalNamespace;
     
+    
+    @Before
     public void setUp() {
         originalNamespace = PolicyConstants.getNamespace();
         PolicyConstants.setNamespace("http://schemas.xmlsoap.org/ws/2004/09/policy");
     }
     
+    @After
     public void tearDown() {
         PolicyConstants.setNamespace(originalNamespace);
     }
     
+    @Test
     public void testNormalise() throws Exception {
         
         PolicyBuilderImpl builder = new PolicyBuilderImpl();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/OutPolicyInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/OutPolicyInfoTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/OutPolicyInfoTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/OutPolicyInfoTest.java Thu Mar  8 09:14:44 2007
@@ -27,8 +27,6 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
@@ -45,18 +43,23 @@
 import org.apache.neethi.Policy;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class OutPolicyInfoTest extends TestCase {
+public class OutPolicyInfoTest extends Assert {
 
     private IMocksControl control;
     
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl();        
     } 
     
+    @Test
     public void testAccessors() {
         OutPolicyInfo opi = new OutPolicyInfo();
         assertNull(opi.getPolicy());
@@ -78,6 +81,7 @@
         control.verify();
     }
     
+    @Test
     public void testInitialise() throws NoSuchMethodException {
         Method m1 = OutPolicyInfo.class.getDeclaredMethod("initialisePolicy",
             new Class[] {Endpoint.class, BindingOperationInfo.class, PolicyEngine.class, boolean.class});
@@ -105,6 +109,7 @@
         control.verify();        
     }
     
+    @Test
     public void testInitialiseFault() throws NoSuchMethodException {
         Method m1 = OutPolicyInfo.class.getDeclaredMethod("initialisePolicy",
             new Class[] {Endpoint.class, BindingFaultInfo.class, PolicyEngine.class});
@@ -131,10 +136,12 @@
         control.verify();        
     }
     
+    @Test
     public void testInitialiseClientPolicy() {  
         doTestInitialisePolicy(true);
     }
     
+    @Test
     public void testInitialiseServerPolicy() {  
         doTestInitialisePolicy(false);
     }
@@ -174,6 +181,7 @@
         control.verify();
     }
     
+    @Test
     public void testInitialiseServerFaultPolicy() {        
         Endpoint e = control.createMock(Endpoint.class);
         BindingFaultInfo bfi = control.createMock(BindingFaultInfo.class);
@@ -201,6 +209,7 @@
         control.verify();
     }
     
+    @Test
     public void testChooseAlternative() {
         OutPolicyInfo cpi = new OutPolicyInfo();
         cpi.setPolicy(new Policy());
@@ -257,6 +266,7 @@
         control.verify();
     }
     
+    @Test
     public void testInitialiseOutInterceptors() {
         OutPolicyInfo cpi = new OutPolicyInfo();        
         List<Assertion> alternative = new ArrayList<Assertion>();
@@ -314,6 +324,7 @@
         EasyMock.expect(bus.getExtension(PolicyInterceptorProviderRegistry.class)).andReturn(reg);
     }
     
+    @Test
     public void testCheckEffectivePolicy() {
         OutPolicyInfo opi = new OutPolicyInfo();  
         Policy p = new Policy();
@@ -354,6 +365,7 @@
         opi.checkEffectivePolicy(aim);
     }
     
+    @Test
     public void testAlternativeSupported() {
         Assertion a1 = control.createMock(Assertion.class);
         QName aqn = new QName("http://x.y.z", "a");

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyBuilderTest.java Thu Mar  8 09:14:44 2007
@@ -24,19 +24,21 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.ws.policy.builder.xml.XMLPrimitiveAssertionBuilder;
 import org.apache.neethi.Constants;
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyComponent;
 import org.apache.neethi.PolicyReference;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
-public class PolicyBuilderTest extends TestCase {
+public class PolicyBuilderTest extends Assert {
     
     private PolicyBuilderImpl builder;
     
+    @Before
     public void setUp() {
         builder = new PolicyBuilderImpl();
         AssertionBuilderRegistry abr = new AssertionBuilderRegistryImpl();
@@ -46,6 +48,8 @@
         abr.register(new QName("http://sample.org/Assertions", "B"), ab);
         abr.register(new QName("http://sample.org/Assertions", "C"), ab);
     }
+    
+    @Test
     public void testGetPolicy() throws Exception {
         String name = "/samples/test25.xml";
         InputStream is = PolicyBuilderTest.class.getResourceAsStream(name);        
@@ -59,6 +63,7 @@
         }
     }
     
+    @Test
     public void testGetPolicyReference() throws Exception {
         String name = "/samples/test26.xml";
         InputStream is = PolicyBuilderTest.class.getResourceAsStream(name);        

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineTest.java Thu Mar  8 09:14:44 2007
@@ -29,8 +29,6 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
@@ -41,6 +39,8 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.transport.Conduit;
+import org.apache.cxf.transport.Destination;
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.Constants;
@@ -50,19 +50,25 @@
 import org.apache.neethi.PolicyRegistry;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyEngineTest extends TestCase {
+public class PolicyEngineTest extends Assert {
 
     private IMocksControl control;
     private PolicyEngine engine;
     
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl(); 
     } 
     
+    @Test
     public void testAccessors() {
         engine = new PolicyEngine();
         assertNotNull(engine.getRegistry());
@@ -82,10 +88,12 @@
         assertTrue(engine.getRegisterInterceptors());
     }
     
+    @Test
     public void testDontAddBusInterceptors() {        
         doTestAddBusInterceptors(false);
     }
     
+    @Test
     public void testAddBusInterceptors() {        
         doTestAddBusInterceptors(true);
     }
@@ -139,6 +147,7 @@
         }
     }
     
+    @Test
     public void testGetAggregatedServicePolicy() {
         engine = new PolicyEngine();
         List<PolicyProvider> providers = new ArrayList<PolicyProvider>();
@@ -174,6 +183,7 @@
         control.verify();      
     }
     
+    @Test
     public void testGetAggregatedEndpointPolicy() {
         engine = new PolicyEngine();
         List<PolicyProvider> providers = new ArrayList<PolicyProvider>();
@@ -209,6 +219,7 @@
         control.verify();      
     }
     
+    @Test
     public void testGetAggregatedOperationPolicy() {
         engine = new PolicyEngine();
         List<PolicyProvider> providers = new ArrayList<PolicyProvider>();
@@ -244,6 +255,7 @@
         control.verify();      
     }
     
+    @Test
     public void testGetAggregatedMessagePolicy() {
         engine = new PolicyEngine();
         List<PolicyProvider> providers = new ArrayList<PolicyProvider>();
@@ -279,6 +291,7 @@
         control.verify();      
     }
     
+    @Test
     public void testGetAggregatedFaultPolicy() {
         engine = new PolicyEngine();
         List<PolicyProvider> providers = new ArrayList<PolicyProvider>();
@@ -314,7 +327,8 @@
         control.verify();      
     }
     
-    /*
+    @Ignore
+    @Test
     public void testGetClientOutInterceptors() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getClientRequestPolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -331,11 +345,15 @@
         EasyMock.expect(cpi.getInterceptors()).andReturn(li);        
 
         control.replay();
+        /*
         List<Interceptor> clientInterceptors = engine.getClientOutInterceptors(e, boi, conduit); 
         assertSame(li, clientInterceptors);
+        */
         control.verify();
     }
     
+    @Test
+    @Ignore
     public void testGetClientOutAssertions() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getClientRequestPolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -352,25 +370,34 @@
         EasyMock.expect(cpi.getChosenAlternative()).andReturn(la);        
 
         control.replay();
+        /*
         Collection<Assertion> assertions = engine.getClientOutAssertions(e, boi, conduit); 
         assertSame(la, assertions);
+        */
         control.verify();
     }
-    */
     
-    /*
+    
+    @Test
+    @Ignore
     public void testGetClientInInterceptors() throws NoSuchMethodException { 
         doTestGetInterceptors(false, false);
     }
     
+    @Test
+    @Ignore
     public void testGetClientInFaultInterceptors() throws NoSuchMethodException { 
         doTestGetInterceptors(false, true);
     }
     
+    @Test
+    @Ignore
     public void testGetServerInFaultInterceptors() throws NoSuchMethodException { 
         doTestGetInterceptors(true, false);
     }
     
+    @Test
+    @Ignore
     public void testServerOutInterceptors() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getServerResponsePolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -387,11 +414,15 @@
         EasyMock.expect(opi.getInterceptors()).andReturn(li);
 
         control.replay();
+        /*
         List<Interceptor> interceptors = engine.getServerOutInterceptors(e, boi, destination);
         assertSame(li, interceptors);
+        */
         control.verify();
     }
     
+    @Test
+    @Ignore
     public void testServerOutAssertions() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getServerResponsePolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -408,11 +439,15 @@
         EasyMock.expect(opi.getChosenAlternative()).andReturn(la);
 
         control.replay();
+        /*
         Collection<Assertion> assertions = engine.getServerOutAssertions(e, boi, destination);
         assertSame(la, assertions);
+        */
         control.verify();
     }
     
+    @Test
+    @Ignore
     public void testServerOutFaultInterceptors() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getServerFaultPolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -429,11 +464,15 @@
         EasyMock.expect(opi.getInterceptors()).andReturn(li);
 
         control.replay();
+        /*
         List<Interceptor> interceptors = engine.getServerOutFaultInterceptors(e, bfi, destination);
         assertSame(li, interceptors);
+        */
         control.verify();
     }
     
+    @Test
+    @Ignore
     public void testServerOutFaultAssertions() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getServerFaultPolicyInfo",
                                                         new Class[] {Endpoint.class,
@@ -450,12 +489,15 @@
         EasyMock.expect(opi.getChosenAlternative()).andReturn(la);
 
         control.replay();
+        /*
         Collection<Assertion> assertions = engine.getServerOutFaultAssertions(e, bfi, destination);
         assertSame(la, assertions);
+        */
         control.verify();
     }
-    */
     
+    
+    @Test
     public void testGetAssertions() throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("addAssertions",
             new Class[] {PolicyComponent.class, boolean.class, Collection.class});
@@ -490,6 +532,7 @@
         control.verify();
     }
     
+    @Test
     public void testAddAssertions() {
         engine = new PolicyEngine();
         Collection<Assertion> assertions = new ArrayList<Assertion>();
@@ -524,6 +567,7 @@
         assertSame(a, assertions.iterator().next());       
     }
     
+    @Test
     public void testKeys() {
         engine = new PolicyEngine();
         Endpoint endpoint = control.createMock(Endpoint.class);
@@ -536,7 +580,6 @@
         assertNotNull(bf);      
     }
      
-    /*
     private void doTestGetInterceptors(boolean isServer, boolean fault) throws NoSuchMethodException {
         Method m = PolicyEngine.class.getDeclaredMethod("getEndpointPolicyInfo",
             new Class[] {Endpoint.class, isServer ? Destination.class : Conduit.class});
@@ -563,15 +606,17 @@
         }
 
         control.replay();
+        
+        /*
         List<Interceptor> interceptors = fault 
             ? engine.getClientInFaultInterceptors(e, conduit) 
             : (isServer 
                 ? engine.getServerInInterceptors(e, destination)
                 : engine.getClientInInterceptors(e, conduit));
         assertSame(li, interceptors);
+        */
         control.verify(); 
     }
-    */
     
     private Set<String> getInterceptorIds(List<Interceptor> interceptors) {
         Set<String> ids = new HashSet<String>();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyExtensionsTest.java Thu Mar  8 09:14:44 2007
@@ -26,8 +26,6 @@
 
 import org.w3c.dom.Element;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -37,11 +35,13 @@
 import org.apache.cxf.ws.policy.attachment.external.ExternalAttachmentProvider;
 import org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider;
 import org.apache.neethi.Assertion;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyExtensionsTest extends TestCase {
+public class PolicyExtensionsTest extends Assert {
 
     private static final QName KNOWN = new QName("http://cxf.apache.org/test/policy", "known");
     private static final QName KNOWN_DOMAIN_EXPR_TYPE
@@ -49,6 +49,7 @@
     
     private static final QName UNKNOWN = new QName("http://cxf.apache.org/test/policy", "unknown");
     
+    @Test
     public void testExtensions() {
         Bus bus = null;
         try {

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyInterceptorsTest.java Thu Mar  8 09:14:44 2007
@@ -23,8 +23,6 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.helpers.CastUtils;
@@ -40,11 +38,14 @@
 import org.apache.neethi.Assertion;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyInterceptorsTest extends TestCase {
+public class PolicyInterceptorsTest extends Assert {
     
     private IMocksControl control;
     private Message message;
@@ -56,12 +57,13 @@
     private Conduit conduit;
     private Destination destination;
     
-    
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl();
         bus = control.createMock(Bus.class);       
     } 
     
+    @Test
     public void testAbstractPolicyInterceptor() {
         ClientPolicyOutInterceptor interceptor = new ClientPolicyOutInterceptor();
         assertNull(interceptor.getBus());
@@ -69,6 +71,7 @@
         assertSame(bus, interceptor.getBus());
     }
     
+    @Test
     public void testClientPolicyOutInterceptor() {
         ClientPolicyOutInterceptor interceptor = new ClientPolicyOutInterceptor();
         interceptor.setBus(bus);
@@ -95,6 +98,7 @@
         control.verify();        
     }
     
+    @Test
     public void testClientPolicyInInterceptor() {
         ClientPolicyInInterceptor interceptor = new ClientPolicyInInterceptor();
         interceptor.setBus(bus);
@@ -121,6 +125,7 @@
         control.verify();        
     }
 
+    @Test
     public void testClientPolicyInFaultInterceptor() {
         ClientPolicyInFaultInterceptor interceptor = new ClientPolicyInFaultInterceptor();
         interceptor.setBus(bus);
@@ -147,6 +152,7 @@
         control.verify();        
     }
 
+    @Test
     public void testServerPolicyInInterceptor() {
         ServerPolicyInInterceptor interceptor = new ServerPolicyInInterceptor();
         interceptor.setBus(bus);
@@ -173,6 +179,7 @@
         control.verify();       
     }
     
+    @Test
     public void testServerPolicyOutInterceptor() {
         ServerPolicyOutInterceptor interceptor = new ServerPolicyOutInterceptor();
         interceptor.setBus(bus);
@@ -199,6 +206,7 @@
         control.verify();        
     }
     
+    @Test
     public void testServerPolicyOutFaultInterceptor() throws NoSuchMethodException {
         Method m = ServerPolicyOutFaultInterceptor.class.getDeclaredMethod("getBindingFaultInfo",
             new Class[] {Message.class, Exception.class, BindingOperationInfo.class});
@@ -242,6 +250,7 @@
         control.verify();        
     }
     
+    @Test
     public void testServerPolicyOutFaultInterceptorGetBindingFaultInfo() {
         ServerPolicyOutFaultInterceptor interceptor = new ServerPolicyOutFaultInterceptor();
         message = control.createMock(Message.class);

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyTest.java Thu Mar  8 09:14:44 2007
@@ -24,22 +24,22 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
 import org.apache.neethi.All;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.ExactlyOne;
 import org.apache.neethi.Policy;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyTest extends TestCase {
+public class PolicyTest extends Assert {
  
-    public void testNothing() {
-    }
-    
+    @Test
     public void testContains() {
         List<Assertion> alt1 = new ArrayList<Assertion>();
         Assertion a11 = new PrimitiveAssertion(new QName("http://x.y.z", "a1"));
@@ -55,7 +55,9 @@
                    PolicyUtils.contains(alt1, alt2));    
     }
     
-    public void xtestMergeIdentical() {
+    @Test
+    @Ignore
+    public void testMergeIdentical() {
         Policy p1 = new Policy();
         Assertion a1 = new TestAssertion(new QName("http://x.y.z", "a"));
         p1.addPolicyComponent(a1);
@@ -88,7 +90,9 @@
         PolicyUtils.printPolicyComponent(p.normalize(true));    
     }
     
-    public void xtestNormalisePrimitives() {
+    @Test
+    @Ignore
+    public void testNormalisePrimitives() {
         Policy p;
         /*
         p = getOneOptionalAssertion();
@@ -103,7 +107,9 @@
      
     }  
     
-    public void xtestMergePolciesWithAlternatives() {
+    @Test
+    @Ignore
+    public void testMergePolciesWithAlternatives() {
         String uri1 = "http://x.y.z";
         Policy p1 = new Policy();
         ExactlyOne ea = new ExactlyOne();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInFaultInterceptorTest.java Thu Mar  8 09:14:44 2007
@@ -19,8 +19,6 @@
 
 package org.apache.cxf.ws.policy;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
@@ -28,11 +26,14 @@
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyVerificationInFaultInterceptorTest extends TestCase {
+public class PolicyVerificationInFaultInterceptorTest extends Assert {
  
     private IMocksControl control;
     private Bus bus;
@@ -43,11 +44,13 @@
     private PolicyEngine engine;
     private AssertionInfoMap aim;
     
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl(); 
         bus = control.createMock(Bus.class);  
     } 
     
+    @Test
     public void testHandleMessage() {
         PolicyVerificationInFaultInterceptor interceptor = 
             new PolicyVerificationInFaultInterceptor();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptorTest.java Thu Mar  8 09:14:44 2007
@@ -19,8 +19,6 @@
 
 package org.apache.cxf.ws.policy;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.message.Exchange;
@@ -28,11 +26,14 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyVerificationInInterceptorTest extends TestCase {
+public class PolicyVerificationInInterceptorTest extends Assert {
  
     private IMocksControl control;
     private Bus bus;
@@ -43,11 +44,13 @@
     private PolicyEngine engine;
     private AssertionInfoMap aim;
     
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl(); 
         bus = control.createMock(Bus.class);  
     } 
     
+    @Test
     public void testHandleMessage() {
         PolicyVerificationInInterceptor interceptor = new PolicyVerificationInInterceptor();
         interceptor.setBus(bus);

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyVerificationOutInterceptorTest.java Thu Mar  8 09:14:44 2007
@@ -24,24 +24,27 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.message.Message;
 import org.apache.neethi.Assertion;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class PolicyVerificationOutInterceptorTest extends TestCase {
+public class PolicyVerificationOutInterceptorTest extends Assert {
  
     private IMocksControl control;
     
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl();   
     } 
     
+    @Test
     public void testHandleMessage() {
         PolicyVerificationOutInterceptor interceptor = new PolicyVerificationOutInterceptor();
         

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/DomainExpressionBuilderRegistryTest.java Thu Mar  8 09:14:44 2007
@@ -26,23 +26,27 @@
 
 import org.w3c.dom.Element;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.ws.policy.PolicyException;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class DomainExpressionBuilderRegistryTest extends TestCase {
+public class DomainExpressionBuilderRegistryTest extends Assert {
 
     private IMocksControl control;
     
+    
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl();        
     } 
     
+    @Test
     public void testNoBuilder() {
         DomainExpressionBuilderRegistry reg = new DomainExpressionBuilderRegistry();
         assertEquals(DomainExpressionBuilderRegistry.class, reg.getRegistrationType());
@@ -62,6 +66,7 @@
         
     }
     
+    @Test
     public void testBuild() {
         DomainExpressionBuilder builder = control.createMock(DomainExpressionBuilder.class);
         Map<QName, DomainExpressionBuilder> builders = new HashMap<QName, DomainExpressionBuilder>();

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/external/EndpointReferenceDomainExpressionTest.java Thu Mar  8 09:14:44 2007
@@ -19,8 +19,6 @@
 
 package org.apache.cxf.ws.policy.attachment.external;
 
-import junit.framework.TestCase;
-
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingMessageInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
@@ -30,18 +28,24 @@
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * 
  */
-public class EndpointReferenceDomainExpressionTest extends TestCase {
+public class EndpointReferenceDomainExpressionTest extends Assert {
 
     private IMocksControl control;
     
+    
+    @Before
     public void setUp() {
         control = EasyMock.createNiceControl();        
     } 
     
+    @Test
     public void testEndpointReferenceDomainExpression() {
         EndpointReferenceType epr = control.createMock(EndpointReferenceType.class);
         



Mime
View raw message