Author: mcombellack
Date: Tue Dec 2 07:08:26 2008
New Revision: 722491
URL: http://svn.apache.org/viewvc?rev=722491&view=rev
Log:
Converted unit tests from JUnit 3 to JUnit 4
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteUnknownElementTestCase.java
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java?rev=722491&r1=722490&r2=722491&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
Tue Dec 2 07:08:26 2008
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.assembly.xml;
+import static org.junit.Assert.assertNotNull;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -25,22 +27,22 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.Composite;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-public class AnyElementReadWriteTestCase extends TestCase {
+public class AnyElementReadWriteTestCase {
private XMLInputFactory inputFactory;
String XML = "<?xml version='1.0' encoding='UTF-8'?><composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"; targetNamespace=\"http://calc\";
name=\"Calculator\"><service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\"><interface.java
interface=\"calculator.CalculatorService\" /></service><component
name=\"CalculatorServiceComponent\"><reference name=\"addService\"
multiplicity=\"0..1\" target=\"AddServiceComponent\" /><reference
name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference
name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference
name=\"divideService\" target=\"DivideServiceComponent\"
/></component><component name=\"AddServiceComponent\" /><component
name=\"SubtractServiceComponent\" /><component
name=\"MultiplyServiceComponent\" /><component name=\"DivideServiceComponent\"
/><x:unknownElement xmlns:x=\"http://x\";
uknAttr=\"attribute1\"><y:subUnknownElement1 xmlns:y
=\"http://y\"; uknAttr1=\"attribute2\" /><x:subUnknownElement2
/></x:unknownElement></composite>";
private ExtensibleStAXArtifactProcessor staxProcessor;
- @Override
+ @Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
@@ -51,7 +53,7 @@
inputFactory, XMLOutputFactory.newInstance(),
null);
}
- @Override
+ @After
public void tearDown() throws Exception {
}
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java?rev=722491&r1=722490&r2=722491&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
Tue Dec 2 07:08:26 2008
@@ -19,6 +19,10 @@
package org.apache.tuscany.sca.assembly.xml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -26,21 +30,23 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.Composite;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* Test reading SCA XML assemblies.
*
* @version $Rev: 711584 $ $Date: 2008-11-05 15:07:03 +0000 (Wed, 05 Nov 2008)
$
*/
-public class ReadWriteLocalCompositeTestCase extends TestCase {
+public class ReadWriteLocalCompositeTestCase {
private XMLInputFactory inputFactory;
private ExtensibleStAXArtifactProcessor staxProcessor;
@@ -49,7 +55,7 @@
"<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\";
targetNamespace=\"http://localcalc\"; name=\"LocalCalculator\" local=\"true\">"+
"</composite>";
- @Override
+ @Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
@@ -61,11 +67,12 @@
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors,
XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
}
- @Override
+ @After
public void tearDown() throws Exception {
}
+ @Test
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("local.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
@@ -75,6 +82,7 @@
is.close();
}
+ @Test
public void testWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("local.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
Modified:
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteUnknownElementTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteUnknownElementTestCase.java?rev=722491&r1=722490&r2=722491&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteUnknownElementTestCase.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteUnknownElementTestCase.java
Tue Dec 2 07:08:26 2008
@@ -1,5 +1,8 @@
package org.apache.tuscany.sca.assembly.xml;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -7,23 +10,23 @@
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.assembly.Composite;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
-public class ReadWriteUnknownElementTestCase extends TestCase {
+public class ReadWriteUnknownElementTestCase {
private XMLInputFactory inputFactory;
//String XML = "<?xml version='1.0' encoding='UTF-8'?><composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"; targetNamespace=\"http://calc\";
name=\"Calculator\"><service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\" /><component
name=\"CalculatorServiceComponent\"><reference name=\"addService\"
target=\"AddServiceComponent\" /><reference name=\"subtractService\"
target=\"SubtractServiceComponent\" /><reference name=\"multiplyService\"
target=\"MultiplyServiceComponent\" /><reference name=\"divideService\"
target=\"DivideServiceComponent\" /></component><component
name=\"AddServiceComponent\" /><component name=\"SubtractServiceComponent\"
/><component name=\"MultiplyServiceComponent\" /><component
name=\"DivideServiceComponent\" /><x:unknownElement xmlns:x=\"http://x\";
uknAttr=\"attribute1\"><x:subUnknownElement1 uknAttr1=\"attribute1\"
/><x:subUnknownElement2 /></x:unknownElement></composite>";
String XML = "<?xml version='1.0' encoding='UTF-8'?><composite
xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:ns1=\"http://www.osoa.org/xmlns/sca/1.0\"; targetNamespace=\"http://calc\";
name=\"Calculator\"><service name=\"CalculatorService\"
promote=\"CalculatorServiceComponent\" /><component
name=\"CalculatorServiceComponent\"><reference name=\"addService\"
multiplicity=\"0..1\" target=\"AddServiceComponent\" /><reference
name=\"subtractService\" target=\"SubtractServiceComponent\" /><reference
name=\"multiplyService\" target=\"MultiplyServiceComponent\" /><reference
name=\"divideService\" target=\"DivideServiceComponent\"
/></component><component name=\"AddServiceComponent\" /><component
name=\"SubtractServiceComponent\" /><component
name=\"MultiplyServiceComponent\" /><component name=\"DivideServiceComponent\"
/></composite>";
private ExtensibleStAXArtifactProcessor staxProcessor;
- @Override
+ @Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new
DefaultExtensionPointRegistry();
inputFactory = XMLInputFactory.newInstance();
@@ -31,7 +34,7 @@
staxProcessor = new
ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(),
XMLOutputFactory.newInstance(), null);
}
- @Override
+ @After
public void tearDown() throws Exception {
}
