From 6c09053104ced5a303b59771a4a07d296a4596fe Mon Sep 17 00:00:00 2001 From: mcombellack Date: Thu, 4 Dec 2008 10:14:09 +0000 Subject: Converted from JUnit 3 style imports (junit.framework) to JUnit 4 style imports (org.junit) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723274 13f79535-47bb-0310-9956-ffa450edef68 --- .../wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java | 8 ++------ .../wsdl/introspect/WSDLOperationIntrospectorTestCase.java | 3 +-- .../WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java | 8 ++------ .../wsdl/introspect/WrapperStyleOperationTestCase.java | 3 +-- .../tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java | 3 --- .../sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java | 3 +-- .../sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java | 3 +-- 7 files changed, 8 insertions(+), 23 deletions(-) (limited to 'java/sca/modules/interface-wsdl-xml/src') diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java index de59964422..bd8f1c5e56 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java @@ -26,15 +26,14 @@ import java.util.List; import javax.wsdl.PortType; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; +import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -49,9 +48,6 @@ public class WSDLInterfaceIntrospectorTestCase extends AbstractWSDLTestCase { private PortType portType; private WSDLDefinition definition; - /** - * @see junit.framework.TestCase#setUp() - */ @Override @Before public void setUp() throws Exception { diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java index d4f624ad90..666763fe71 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java @@ -28,8 +28,6 @@ import java.util.List; import javax.wsdl.PortType; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.util.XMLType; @@ -37,6 +35,7 @@ import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation; import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; +import org.junit.Assert; import org.junit.Test; /** diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java index 39c8247206..877ca60c13 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java @@ -25,15 +25,14 @@ import java.net.URL; import javax.wsdl.PortType; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.tuscany.sca.interfacedef.ConversationSequence; import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; +import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; import org.apache.tuscany.sca.policy.Intent; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -49,9 +48,6 @@ public class WSDLPolicyAnnotatedInterfaceIntrospectorTestCase extends AbstractWS private PortType portType; private WSDLDefinition definition; - /** - * @see junit.framework.TestCase#setUp() - */ @Before @Override public void setUp() throws Exception { diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java index 9fbd955e12..f03d7d6628 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java @@ -25,12 +25,11 @@ import java.net.URL; import javax.wsdl.PortType; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLOperation; import org.apache.tuscany.sca.interfacedef.wsdl.xml.AbstractWSDLTestCase; +import org.junit.Assert; import org.junit.Test; /** diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java index 32a205a2be..d91e206183 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java @@ -45,9 +45,6 @@ public abstract class AbstractWSDLTestCase { protected WSDLFactory wsdlFactory; protected XSDFactory xsdFactory; - /** - * @see junit.framework.TestCase#setUp() - */ @Before public void setUp() throws Exception { ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java index 14eb6456ca..4f85bb8f1c 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java @@ -28,9 +28,8 @@ import java.util.List; import javax.wsdl.Import; import javax.xml.namespace.QName; -import junit.framework.Assert; - import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; +import org.junit.Assert; import org.junit.Test; /** diff --git a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java index 105b3da7fa..4558bafdb8 100644 --- a/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java +++ b/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/XMLDocumentHelperTestCase.java @@ -23,9 +23,8 @@ import java.net.URL; import javax.xml.stream.XMLInputFactory; -import junit.framework.Assert; - import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -- cgit v1.2.3