cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r545468 - in /incubator/cxf/trunk/tools/javato/src: main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ test/java/org/apache/cxf/tools/java2wsdl/processor/ test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/
Date Fri, 08 Jun 2007 10:04:22 GMT
Author: mmao
Date: Fri Jun  8 03:04:16 2007
New Revision: 545468

URL: http://svn.apache.org/viewvc?view=rev&rev=545468
Log:
* Upgrade tests to Junit4

Modified:
    incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
    incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java

Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java
Fri Jun  8 03:04:16 2007
@@ -52,7 +52,6 @@
             throw new ToolException("Can not find the ServiceBulider for style: " + s, e);
         }
         builder.setServiceClass(serviceClass);
-        //builder.getServiceFactory().setServiceClass(serviceClass);
         return builder;
     }
 

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/FrontendFactoryTest.java
Fri Jun  8 03:04:16 2007
@@ -19,25 +19,29 @@
 
 package org.apache.cxf.tools.java2wsdl.processor;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.tools.fortest.classnoanno.docbare.Stock;
 import org.apache.cxf.tools.fortest.simple.Hello;
+import org.junit.Assert;
+import org.junit.Test;
 
-public class FrontendFactoryTest extends TestCase {
+public class FrontendFactoryTest extends Assert {
 
     FrontendFactory factory = FrontendFactory.getInstance();
-    
+
+    @Test
     public void testDefaultStyle() {
         factory.setServiceClass(null);
         assertEquals(FrontendFactory.Style.Jaxws, factory.discoverStyle());
     }
 
+    @Test
     public void testJaxwsStyle() {
         factory.setServiceClass(Stock.class);
         assertEquals(FrontendFactory.Style.Jaxws, factory.discoverStyle());
     }
 
+    @Test
     public void testSimpleStyle() {
         factory.setServiceClass(Hello.class);
         assertEquals(FrontendFactory.Style.Simple, factory.discoverStyle());

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBeanTest.java
Fri Jun  8 03:04:16 2007
@@ -22,12 +22,12 @@
 
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
 import org.apache.cxf.tools.common.model.JavaField;
 import org.apache.cxf.tools.java2wsdl.generator.wsdl11.model.WrapperBeanClass;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class FaultBeanTest extends TestCase {
+public class FaultBeanTest extends Assert {
 
     @Test
     public void testTransform() throws Exception {

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/RequestWrapperTest.java
Fri Jun  8 03:04:16 2007
@@ -22,7 +22,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import junit.framework.TestCase;
 import org.apache.cxf.jaxws.JaxwsServiceBuilder;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.OperationInfo;
@@ -30,9 +29,11 @@
 import org.apache.cxf.tools.common.model.JavaClass;
 import org.apache.cxf.tools.common.model.JavaField;
 import org.apache.cxf.tools.common.model.JavaMethod;
+import org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class RequestWrapperTest extends TestCase {
+public class RequestWrapperTest extends Assert {
     JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
 
     private OperationInfo getOperation(Class clz, String opName) {
@@ -51,7 +52,7 @@
     @Test
     public void testBuildRequestFields() {
         // Test String[]
-        Class testingClass = org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray.class;
+        Class testingClass = GreeterArray.class;
         OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
         assertNotNull(opInfo);
         

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/ResponseWrapperTest.java
Fri Jun  8 03:04:16 2007
@@ -21,15 +21,16 @@
 
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
 import org.apache.cxf.jaxws.JaxwsServiceBuilder;
 import org.apache.cxf.service.model.MessageInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.tools.common.model.JavaField;
+import org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class ResponseWrapperTest extends TestCase {
+public class ResponseWrapperTest extends Assert {
     JaxwsServiceBuilder builder = new JaxwsServiceBuilder();
 
     private OperationInfo getOperation(Class clz, String opName) {
@@ -48,7 +49,7 @@
     @Test
     public void testBuildFields() {
         // Test String[]
-        Class testingClass = org.apache.cxf.tools.fortest.withannotation.doc.GreeterArray.class;
+        Class testingClass = GreeterArray.class;
         OperationInfo opInfo = getOperation(testingClass, "sayStringArray");
         assertNotNull(opInfo);
         

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperTest.java
Fri Jun  8 03:04:16 2007
@@ -22,11 +22,11 @@
 import java.lang.reflect.Method;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
 import org.apache.cxf.tools.common.model.JavaClass;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class WrapperTest extends TestCase {
+public class WrapperTest extends Assert {
     @Test
     public void testGetWrapperBeanClassFromQName() {
         QName qname = new QName("http://cxf.apache.org", "sayHi");

Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java?view=diff&rev=545468&r1=545467&r2=545468
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/WrapperUtilTest.java
Fri Jun  8 03:04:16 2007
@@ -20,14 +20,17 @@
 package org.apache.cxf.tools.java2wsdl.processor.internal.jaxws;
 
 import java.lang.reflect.Method;
-import junit.framework.TestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
-public class WrapperUtilTest extends TestCase {
+public class WrapperUtilTest extends Assert {
     String pkgName = "org.apache.cxf.tools.fortest.classnoanno.docwrapped";
     Class stockClass;
     Method method;
-    
+
+    @Before
     public void setUp() throws Exception {
         stockClass = Class.forName(pkgName + ".Stock");
         assertNotNull(stockClass);



Mime
View raw message