Author: mcombellack
Date: Thu Dec 4 01:48:12 2008
New Revision: 723270
URL: http://svn.apache.org/viewvc?rev=723270&view=rev
Log:
Converted unit tests from JUnit 3 to JUnit 4
Modified:
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
Modified:
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java?rev=723270&r1=723269&r2=723270&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
(original)
+++
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
Thu Dec 4 01:48:12 2008
@@ -19,13 +19,13 @@
package org.apache.tuscany.sca.interfacedef.wsdl.xml;
+import static org.junit.Assert.assertNotNull;
+
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
@@ -37,19 +37,21 @@
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test reading WSDL interfaces.
*
* @version $Rev$ $Date$
*/
-public class ReadTestCase extends TestCase {
+public class ReadTestCase {
private XMLInputFactory inputFactory;
private StAXArtifactProcessor<Object> staxProcessor;
private CompositeBuilder compositeBuilder;
- @Override
+ @Before
public void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
@@ -60,6 +62,7 @@
compositeBuilder =
extensionPoints.getExtensionPoint(CompositeBuilderExtensionPoint.class).getCompositeBuilder("org.apache.tuscany.sca.assembly.builder.CompositeBuilder");
}
+ @Test
public void testReadComponentType() throws Exception {
InputStream is =
getClass().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
@@ -67,6 +70,7 @@
assertNotNull(componentType);
}
+ @Test
public void testReadConstrainingType() throws Exception {
InputStream is =
getClass().getResourceAsStream("CalculatorComponent.constrainingType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
@@ -74,6 +78,7 @@
assertNotNull(constrainingType);
}
+ @Test
public void testReadComposite() throws Exception {
InputStream is =
getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Modified:
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java?rev=723270&r1=723269&r2=723270&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
(original)
+++
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
Thu Dec 4 01:48:12 2008
@@ -19,31 +19,35 @@
package org.apache.tuscany.sca.interfacedef.wsdl.xml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import java.net.URI;
import java.net.URL;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
-
import
org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test reading WSDL interfaces.
*
* @version $Rev$ $Date$
*/
-public class WSDLTestCase extends TestCase {
+public class WSDLTestCase {
private ExtensibleURLArtifactProcessor documentProcessor;
private WSDLModelResolver wsdlResolver;
- @Override
+ @Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
URLArtifactProcessorExtensionPoint documentProcessors =
extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
@@ -53,6 +57,7 @@
wsdlResolver = new WSDLModelResolver(null, modelFactories);
}
+ @Test
public void testReadWSDLDocument() throws Exception {
URL url = getClass().getResource("example.wsdl");
WSDLDefinition definition = documentProcessor.read(null, new
URI("example.wsdl"), url, WSDLDefinition.class);
@@ -61,6 +66,7 @@
assertEquals(definition.getNamespace(), "http://www.example.org";);
}
+ @Test
public void testReadWSDLImports() throws Exception {
QName aBinding = new QName("http://helloworld";,
"HelloWorldSoapBinding");
QName aPortType = new QName("http://helloworld";, "HelloWorld");
@@ -76,6 +82,7 @@
assertNotNull(test1Defn.getDefinition().getPortType(aPortType));
}
+ @Test
public void testReadSameNamespaceWSDLDocument() throws Exception {
QName aBinding = new QName("http://helloworld";,
"HelloWorldSoapBinding");
QName aPortType = new QName("http://helloworld";, "HelloWorld");
Modified:
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java?rev=723270&r1=723269&r2=723270&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
(original)
+++
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
Thu Dec 4 01:48:12 2008
@@ -19,14 +19,14 @@
package org.apache.tuscany.sca.interfacedef.wsdl.xml;
+import static org.junit.Assert.assertNotNull;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.ComponentType;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
@@ -35,19 +35,21 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test reading/write WSDL interfaces.
*
* @version $Rev$ $Date$
*/
-public class WriteTestCase extends TestCase {
+public class WriteTestCase {
private XMLInputFactory inputFactory;
private XMLOutputFactory outputFactory;
private StAXArtifactProcessor<Object> staxProcessor;
- @Override
+ @Before
public void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
@@ -56,6 +58,7 @@
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
inputFactory, outputFactory, null);
}
+ @Test
public void testReadWriteComponentType() throws Exception {
InputStream is =
getClass().getResourceAsStream("CalculatorImpl.componentType");
ComponentType componentType =
(ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
@@ -64,6 +67,7 @@
staxProcessor.write(componentType,
outputFactory.createXMLStreamWriter(bos));
}
+ @Test
public void testReadWriteConstrainingType() throws Exception {
InputStream is =
getClass().getResourceAsStream("CalculatorComponent.constrainingType");
ConstrainingType constrainingType =
(ConstrainingType)staxProcessor.read(inputFactory.createXMLStreamReader(is));
@@ -72,6 +76,7 @@
staxProcessor.write(constrainingType,
outputFactory.createXMLStreamWriter(bos));
}
+ @Test
public void testReadWriteComposite() throws Exception {
InputStream is =
getClass().getResourceAsStream("Calculator.composite");
Composite composite =
(Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
