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/02 16:40:00 UTC
svn commit: r722501 - in
/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding:
extension/ impl/ xml/
Author: mcombellack
Date: Tue Dec 2 07:39:59 2008
New Revision: 722501
URL: http://svn.apache.org/viewvc?rev=722501&view=rev
Log:
Converted unit tests from JUnit 3 to JUnit 4
Modified:
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java Tue Dec 2 07:39:59 2008
@@ -19,12 +19,14 @@
package org.apache.tuscany.sca.databinding.extension;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.databinding.impl.DOMHelper;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -32,17 +34,10 @@
*
* @version $Rev$ $Date$
*/
-public class DOMHelperTestCase extends TestCase {
+public class DOMHelperTestCase {
private static final QName FOO_NAME = new QName("http://foo", "foo");
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testDOM() throws Exception {
DocumentBuilder builder = DOMHelper.newDocumentBuilder();
assertNotNull(builder);
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java Tue Dec 2 07:39:59 2008
@@ -19,13 +19,18 @@
package org.apache.tuscany.sca.databinding.extension;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
+import org.junit.Test;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -33,16 +38,9 @@
*
* @version $Rev$ $Date$
*/
-public class DataBindingExtensionTestCase extends TestCase {
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
+public class DataBindingExtensionTestCase {
+ @Test
@SuppressWarnings("unchecked")
public void testExtension() {
DataBinding1 binding1 = new DataBinding1(Node.class);
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java Tue Dec 2 07:39:59 2008
@@ -19,35 +19,29 @@
package org.apache.tuscany.sca.databinding.extension;
+import static org.junit.Assert.assertEquals;
+
import java.math.BigInteger;
import java.util.Calendar;
import java.util.GregorianCalendar;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class XSDDataTypeConverterTestCase extends TestCase {
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
+public class XSDDataTypeConverterTestCase {
+ @Test
public void testConvert() throws Exception {
XSDDataTypeConverter c = new XSDDataTypeConverter();
assertEquals("123", c.parseAnySimpleType(c.printAnySimpleType("123")));
assertEquals(true, c.parseBoolean(c.printBoolean(true)));
assertEquals(false, c.parseBoolean(c.printBoolean(false)));
- assertEquals(123.0, c.parseDouble(c.printDouble(123.0)));
- assertEquals(123.0f, c.parseFloat(c.printFloat(123.0f)));
+ assertEquals(123.0, c.parseDouble(c.printDouble(123.0)), 0);
+ assertEquals(123.0f, c.parseFloat(c.printFloat(123.0f)), 0);
assertEquals(64, c.parseByte(c.printByte((byte)64)));
assertEquals(123, c.parseInt(c.printInt(123)));
assertEquals(new BigInteger("123456"), c.parseInteger(c.printInteger(new BigInteger("123456"))));
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java Tue Dec 2 07:39:59 2008
@@ -20,24 +20,23 @@
import java.lang.reflect.Method;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.databinding.annotation.DataBinding;
+import static org.junit.Assert.assertEquals;
/**
*
* @version $Rev$ $Date$
*/
-public class DataBindingTestCase extends TestCase {
+public class DataBindingTestCase {
+ @org.junit.Test
public void testDataType() throws Exception {
Class<Test> testClass = Test.class;
DataBinding d = testClass.getAnnotation(DataBinding.class);
- Assert.assertEquals(d.value(), "sdo");
+ assertEquals(d.value(), "sdo");
Method method = testClass.getMethod("test", new Class[] {Object.class});
DataBinding d2 = method.getAnnotation(DataBinding.class);
- Assert.assertEquals(d2.value(), "jaxb");
+ assertEquals(d2.value(), "jaxb");
}
@DataBinding("sdo")
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java Tue Dec 2 07:39:59 2008
@@ -18,28 +18,32 @@
*/
package org.apache.tuscany.sca.databinding.impl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.List;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.tuscany.sca.databinding.impl.DirectedGraph.Edge;
import org.apache.tuscany.sca.databinding.impl.DirectedGraph.Vertex;
+import org.junit.Before;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class DirectedGraphTestCase extends TestCase {
+public class DirectedGraphTestCase {
private DirectedGraph<String, Object> graph;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
graph = new DirectedGraph<String, Object>();
}
+ @Test
public void testGraph() {
graph.addEdge("a", "b", null, 3, true);
graph.addEdge("b", "c", null, 1, true);
@@ -94,6 +98,7 @@
}
+ @Test
public void testSort() {
graph.addEdge("a", "b");
graph.addEdge("a", "c");
@@ -116,10 +121,4 @@
assertEquals(Arrays.asList("a", "b", "c", "d"), order);
assertTrue(graph.getVertices().isEmpty());
}
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
}
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java Tue Dec 2 07:39:59 2008
@@ -35,6 +35,8 @@
import org.apache.tuscany.sca.databinding.xml.String2SAX;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -44,7 +46,7 @@
*
* @version $Rev$ $Date$
*/
-public class MediatorImplTestCase extends TestCase {
+public class MediatorImplTestCase {
private static final String IPO_XML =
"<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -77,10 +79,8 @@
private MediatorImpl mediator;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
+ @Before
+ public void setUp() throws Exception {
DataBindingExtensionPoint dataBindingRegistry = new DefaultDataBindingExtensionPoint();
TransformerExtensionPoint registry = new DefaultTransformerExtensionPoint();
@@ -101,6 +101,7 @@
return context;
}
+ @Test
public void testTransform1() {
TransformationContext context = createTransformationContext(String.class, Node.class);
Object node =
@@ -111,6 +112,7 @@
Assert.assertEquals(root.getLocalName(), "purchaseOrder");
}
+ @Test
public void testTransform2() {
TransformationContext context = createTransformationContext(String.class, Writer.class);
Writer writer = new StringWriter();
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java Tue Dec 2 07:39:59 2008
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.databinding.xml;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -25,15 +27,14 @@
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.custommonkey.xmlunit.Diff;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class BeanXMLStreamReaderTestCase extends TestCase {
+public class BeanXMLStreamReaderTestCase {
private static final String XML_RESULT =
"<?xml version='1.0' encoding='UTF-8'?>" + "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
+ "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i>"
@@ -53,14 +54,8 @@
+ "<nil xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:nil=\"true\" />"
+ "<str>ABC</str></MyBean>";
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
+ @Test
public void testTransformation() throws Exception {
MyBean bean = new MyBean();
bean.str = "ABC";
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java Tue Dec 2 07:39:59 2008
@@ -18,18 +18,19 @@
*/
package org.apache.tuscany.sca.databinding.xml;
-import javax.xml.stream.XMLStreamReader;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import javax.xml.stream.XMLStreamReader;
import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Test;
import org.w3c.dom.Node;
/**
*
* @version $Rev$ $Date$
*/
-public class DOM2StAXTestCase extends TestCase {
+public class DOM2StAXTestCase {
private static final String IPO_XML =
"<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -63,14 +64,7 @@
private static final String CRAZY_XML =
"<p:e1 xmlns=\"http://ns0\" xmlns:p=\"http://p1\">" + "<p:e2 xmlns:p=\"http://p2\"/><e3/><e4 xmlns=\"\">E4</e4></p:e1>";
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testTransformation() throws Exception {
String2Node t1 = new String2Node();
Node node = t1.transform(IPO_XML, null);
@@ -82,6 +76,7 @@
// assertTrue(xml != null && xml.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
}
+ @Test
public void testTransformation2() throws Exception {
String2Node t1 = new String2Node();
Node node = t1.transform(CRAZY_XML, null);
@@ -94,6 +89,7 @@
assertTrue(xml.contains("<p:e2 xmlns:p=\"http://p2\""));
}
+ @Test
public void testTransformation3() throws Exception {
String2Node t1 = new String2Node();
Node node = t1.transform(IPO_XML, null);
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java Tue Dec 2 07:39:59 2008
@@ -26,12 +26,12 @@
import java.io.Writer;
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.tuscany.sca.databinding.DataPipe;
import org.apache.tuscany.sca.databinding.DataPipeTransformer;
import org.apache.tuscany.sca.databinding.impl.DOMHelper;
import org.apache.tuscany.sca.databinding.impl.PipedTransformer;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -41,8 +41,9 @@
*
* @version $Rev$ $Date$
*/
-public class DataPipeTestCase extends TestCase {
+public class DataPipeTestCase {
+ @Test
public final void testStreamPipe() throws IOException {
byte[] bytes = new byte[] {1, 2, 3};
DataPipeTransformer<OutputStream, InputStream> pipe = new StreamDataPipe();
@@ -57,6 +58,7 @@
}
}
+ @Test
public final void testWriter2ReaderPipe() throws IOException {
String str = "ABC";
Writer2ReaderDataPipe pipe = new Writer2ReaderDataPipe();
@@ -72,6 +74,7 @@
}
}
+ @Test
public final void testPiped() throws Exception {
Node2Writer node2Writer = new Node2Writer();
Writer2ReaderDataPipe pipe = new Writer2ReaderDataPipe();
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java Tue Dec 2 07:39:59 2008
@@ -20,30 +20,22 @@
import javax.xml.stream.XMLStreamReader;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.databinding.javabeans.JavaBean2XMLStreamReaderTransformer;
import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class JavaBean2XMLStreamReaderTestCase extends TestCase {
+public class JavaBean2XMLStreamReaderTestCase {
private static final String XML_RESULT =
"<?xml version='1.0' encoding='UTF-8'?>"
+ "<MyBean xmlns=\"http://xml.databinding.sca.tuscany.apache.org/\">"
+ "<arr>1</arr><arr>2</arr><arr>3</arr><bean><name>Name</name></bean><i>1</i><str>ABC</str>"
+ "</MyBean>";
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testTransformation() throws Exception {
JavaBean2XMLStreamReaderTransformer t2 = new JavaBean2XMLStreamReaderTransformer();
MyBean bean = new MyBean();
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java Tue Dec 2 07:39:59 2008
@@ -18,9 +18,8 @@
*/
package org.apache.tuscany.sca.databinding.xml;
-import junit.framework.TestCase;
-
import org.apache.tuscany.sca.databinding.impl.DOMHelper;
+import org.junit.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -28,7 +27,9 @@
*
* @version $Rev$ $Date$
*/
-public class Node2StringTestCase extends TestCase {
+public class Node2StringTestCase {
+
+ @Test
public void testTransformation() throws Exception {
Document document = DOMHelper.newDocument();
Element element = document.createElementNS("http://ns1", "test");
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java Tue Dec 2 07:39:59 2008
@@ -24,6 +24,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.sca.databinding.impl.PipedTransformer;
+import org.junit.Test;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
@@ -31,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public class PushTransformationTestCase extends TestCase {
+public class PushTransformationTestCase {
private static final String IPO_XML =
"<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -62,14 +63,7 @@
+ " </items>"
+ "</ipo:purchaseOrder>";
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testTransformation() {
String2XMLStreamReader t1 = new String2XMLStreamReader();
XMLStreamReader reader = t1.transform(IPO_XML, null);
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java Tue Dec 2 07:39:59 2008
@@ -19,31 +19,25 @@
package org.apache.tuscany.sca.databinding.xml;
-import javax.xml.stream.XMLStreamReader;
+import static org.junit.Assert.assertNotNull;
-import junit.framework.TestCase;
+import javax.xml.stream.XMLStreamReader;
import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Test;
/**
* Test Case for StAXHelper
*
* @version $Rev$ $Date$
*/
-public class StAXHelperTestCase extends TestCase {
+public class StAXHelperTestCase {
private static final String XML =
"<a:foo xmlns:a='http://a' name='foo'><bar name='bar'>"
+ "<doo a:name='doo' xmlns:a='http://doo'/>"
+ "</bar></a:foo>";
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testHelper() throws Exception {
XMLStreamReader reader = StAXHelper.createXMLStreamReader(XML);
String xml = StAXHelper.save(reader);
Modified: tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java?rev=722501&r1=722500&r2=722501&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java (original)
+++ tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java Tue Dec 2 07:39:59 2008
@@ -30,6 +30,8 @@
import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -40,18 +42,15 @@
*
* @version $Rev$ $Date$
*/
-public class TraxTransformerTestCase extends TestCase {
+public class TraxTransformerTestCase {
private URL url;
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
url = getClass().getResource("foo.xml");
}
+ @Test
public void testTransformDOM() throws IOException {
InputStream is = url.openStream();
InputStream2Node t1 = new InputStream2Node();
@@ -72,6 +71,7 @@
node = t5.transform(inputSource, null);
}
+ @Test
public void testTransformSAX() throws IOException {
MyContentHandler handler = new MyContentHandler();
InputStream is = url.openStream();