You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/12/04 11:03:38 UTC
svn commit: r723273 - in
/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl:
introspect/ xml/
Author: mcombellack
Date: Thu Dec 4 02:03:36 2008
New Revision: 723273
URL: http://svn.apache.org/viewvc?rev=723273&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/introspect/WSDLInterfaceIntrospectorTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java Thu Dec 4 02:03:36 2008
@@ -35,6 +35,8 @@
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.junit.Before;
+import org.junit.Test;
/**
* Test case for InterfaceWSDLIntrospectorImpl.
@@ -51,7 +53,8 @@
* @see junit.framework.TestCase#setUp()
*/
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
URL url = getClass().getResource("../xml/stockquote.wsdl");
@@ -61,6 +64,7 @@
portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
}
+ @Test
@SuppressWarnings("unchecked")
public final void testIntrospectPortType() throws InvalidInterfaceException {
WSDLInterface contract = wsdlFactory.createWSDLInterface(portType, definition, resolver);
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java Thu Dec 4 02:03:36 2008
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.interfacedef.wsdl.introspect;
+import static org.junit.Assert.fail;
+
import java.net.URI;
import java.net.URL;
import java.util.List;
@@ -35,6 +37,7 @@
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.Test;
/**
* Test case for WSDLOperation.
@@ -47,6 +50,7 @@
@SuppressWarnings("unchecked")
+ @Test
public final void testWrappedOperation() throws Exception {
URL url = getClass().getResource("../xml/stockquote.wsdl");
WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
@@ -77,6 +81,7 @@
Assert.assertEquals(new QName(null, "price"), childType.getLogical().getElementName());
}
+ @Test
public final void testUnwrappedOperation() throws Exception {
URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("unwrapped-stockquote.wsdl"), url);
@@ -94,6 +99,7 @@
Assert.assertEquals(2, op.getInputType().getLogical().size());
}
+ @Test
public final void testInvalidWSDL() throws Exception {
URL url = getClass().getResource("../xml/invalid-stockquote.wsdl");
WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("invalid-stockquote.wsdl"), url);
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java Thu Dec 4 02:03:36 2008
@@ -34,6 +34,8 @@
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.sca.policy.Intent;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test case for InterfaceWSDLIntrospectorImpl.
@@ -50,8 +52,9 @@
/**
* @see junit.framework.TestCase#setUp()
*/
+ @Before
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
URL url = getClass().getResource("/policy/stockquote_policy.wsdl");
@@ -61,6 +64,7 @@
portType = definition.getDefinition().getPortType(PORTTYPE_NAME);
}
+ @Test
public final void testIntrospectPortType() throws InvalidInterfaceException {
WSDLInterface contract = wsdlFactory.createWSDLInterface(portType, definition, resolver);
Assert.assertEquals(contract.getName().getLocalPart(), "StockQuotePortType");
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java Thu Dec 4 02:03:36 2008
@@ -31,6 +31,7 @@
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.Test;
/**
* Test case for WSDLOperation.
@@ -40,6 +41,7 @@
public class WrapperStyleOperationTestCase extends AbstractWSDLTestCase {
private static final QName PORTTYPE_NAME = new QName("http://example.com/stockquote.wsdl", "StockQuotePortType");
+ @Test
public final void testWrappedOperation() throws Exception {
URL url = getClass().getResource("../xml/stockquote.wsdl");
WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("stockquote.wsdl"), url);
@@ -53,6 +55,7 @@
Assert.assertEquals(1, op.getWrapper().getOutputChildElements().size());
}
+ @Test
public final void testUnwrappedOperation() throws Exception {
URL url = getClass().getResource("../xml/unwrapped-stockquote.wsdl");
WSDLDefinition definition = (WSDLDefinition)documentProcessor.read(null, new URI("unwrapped-stockquote.wsdl"), url);
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java Thu Dec 4 02:03:36 2008
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.interfacedef.wsdl.xml;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.ContributionFactory;
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
@@ -34,13 +32,14 @@
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.xsd.XSDFactory;
+import org.junit.Before;
/**
* Test case for WSDLOperation.
*
* @version $Rev$ $Date$
*/
-public abstract class AbstractWSDLTestCase extends TestCase {
+public abstract class AbstractWSDLTestCase {
protected URLArtifactProcessor<Object> documentProcessor;
protected ModelResolver resolver;
protected WSDLFactory wsdlFactory;
@@ -49,8 +48,8 @@
/**
* @see junit.framework.TestCase#setUp()
*/
- @Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java?rev=723273&r1=723272&r2=723273&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java (original)
+++ tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java Thu Dec 4 02:03:36 2008
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.interfacedef.wsdl.xml;
+import static org.junit.Assert.assertNotNull;
+
import java.net.URI;
import java.net.URL;
import java.util.List;
@@ -29,8 +31,6 @@
import junit.framework.Assert;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -38,23 +38,6 @@
*/
public class WSDLDocumentProcessorTestCase extends AbstractWSDLTestCase {
- /**
- * @throws java.lang.Exception
- */
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- @Override
- public void tearDown() throws Exception {
- }
-
@Test
public void testWSDL() throws Exception {