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 17:00:02 UTC
svn commit: r722505 - in
/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb:
JAXBDataBindingTestCase.java JAXBReflectionTestCase.java JAXBTestCase.java
JAXBWrapperHandlerTestCase.java POJOTestCase.java
Author: mcombellack
Date: Tue Dec 2 08:00:01 2008
New Revision: 722505
URL: http://svn.apache.org/viewvc?rev=722505&view=rev
Log:
Converted unit tests from JUnit 3 to JUnit 4
Modified:
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java?rev=722505&r1=722504&r2=722505&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java Tue Dec 2 08:00:01 2008
@@ -19,16 +19,18 @@
package org.apache.tuscany.sca.databinding.jaxb;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
+import org.junit.Before;
+import org.junit.Test;
import com.example.ipo.jaxb.ObjectFactory;
import com.example.ipo.jaxb.PurchaseOrderType;
@@ -39,15 +41,11 @@
*
* @version $Rev$ $Date$
*/
-public class JAXBDataBindingTestCase extends TestCase {
+public class JAXBDataBindingTestCase {
private JAXBDataBinding binding;
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
binding = new JAXBDataBinding();
}
@@ -55,6 +53,7 @@
* Test method for
* {@link org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding#introspect(java.lang.Class, Operation)}.
*/
+ @Test
public final void testIntrospect() {
DataType dataType = new DataTypeImpl<Class>(JAXBElement.class, null);
Operation op = null;
@@ -99,6 +98,7 @@
}
@SuppressWarnings("unchecked")
+ @Test
public void testCopy() {
ObjectFactory factory = new ObjectFactory();
PurchaseOrderType poType = factory.createPurchaseOrderType();
@@ -107,6 +107,7 @@
assertEquals(new QName("http://www.example.com/IPO", "purchaseOrder"), copy.getName());
}
+ @Test
public void testCopyNonElement() {
ObjectFactory factory = new ObjectFactory();
PurchaseOrderType poType = factory.createPurchaseOrderType();
@@ -116,6 +117,7 @@
assertEquals("Comment", (copy).getComment());
}
+ @Test
public void testCopyNonRoot() {
ObjectFactory factory = new ObjectFactory();
USAddress address = factory.createUSAddress();
Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java?rev=722505&r1=722504&r2=722505&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java Tue Dec 2 08:00:01 2008
@@ -23,13 +23,14 @@
import javax.xml.bind.JAXBContext;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* @version $Rev$ $Date$
*/
-public class JAXBReflectionTestCase extends TestCase {
+public class JAXBReflectionTestCase {
+ @Test
public void testGenerateSchema() throws Exception {
JAXBContext context = JAXBContext.newInstance("com.example.ipo.jaxb");
Map<String, String> schemas = JAXBTypeHelper.generateSchema(context);
Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java?rev=722505&r1=722504&r2=722505&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java Tue Dec 2 08:00:01 2008
@@ -30,6 +30,7 @@
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
+import org.junit.Test;
import org.w3c.dom.Node;
import com.example.ipo.jaxb.ObjectFactory;
@@ -39,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class JAXBTestCase extends TestCase {
+public class JAXBTestCase {
private static final String IPO_XML =
"<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -70,11 +71,7 @@
+ " </items>"
+ "</ipo:purchaseOrder>";
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @Test
public void testTransform() throws Exception {
Reader2JAXB t0 = new Reader2JAXB();
@@ -101,6 +98,7 @@
}
+ @Test
public void testTransform2() throws Exception {
Reader2JAXB t0 = new Reader2JAXB();
@@ -129,6 +127,7 @@
}
+ @Test
public void testTransform3() throws Exception {
DataType sourceDataType = new DataTypeImpl<Class>(PurchaseOrderType.class, null);
@@ -144,10 +143,4 @@
Assert.assertNotNull(node);
}
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
}
Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java?rev=722505&r1=722504&r2=722505&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java Tue Dec 2 08:00:01 2008
@@ -19,22 +19,24 @@
package org.apache.tuscany.sca.databinding.jaxb;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
import junit.framework.Assert;
-import junit.framework.TestCase;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBDataBinding;
-import org.apache.tuscany.sca.databinding.jaxb.JAXBWrapperHandler;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
import org.apache.tuscany.sca.interfacedef.util.ElementInfo;
import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
import org.apache.tuscany.sca.interfacedef.util.XMLType;
+import org.junit.Before;
+import org.junit.Test;
import com.example.stock.StockQuoteOffer;
@@ -43,20 +45,17 @@
*
* @version $Rev$ $Date$
*/
-public class JAXBWrapperHandlerTestCase extends TestCase {
+public class JAXBWrapperHandlerTestCase {
private static final QName ELEMENT = new QName("http://www.example.com/stock", "stockQuoteOffer");
private static final QName INPUT = new QName("", "input");
private JAXBWrapperHandler handler;
- /**
- * @see junit.framework.TestCase#setUp()
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
this.handler = new JAXBWrapperHandler();
}
+ @Test
public void testCreate() {
ElementInfo element = new ElementInfo(ELEMENT, null);
Operation op = new OperationImpl();
@@ -68,12 +67,14 @@
Assert.assertTrue(offer instanceof StockQuoteOffer);
}
+ @Test
public void testSetChild() {
StockQuoteOffer wrapper = new StockQuoteOffer();
handler.setChild(wrapper, 0, new ElementInfo(INPUT, null), "IBM");
Assert.assertEquals("IBM", wrapper.getInput());
}
+ @Test
public void testGetChildren() {
StockQuoteOffer wrapper = new StockQuoteOffer();
wrapper.setInput("IBM");
Modified: tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java?rev=722505&r1=722504&r2=722505&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java (original)
+++ tuscany/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java Tue Dec 2 08:00:01 2008
@@ -18,6 +18,10 @@
*/
package org.apache.tuscany.sca.databinding.jaxb;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.StringReader;
import java.io.StringWriter;
import java.util.Map;
@@ -27,14 +31,16 @@
import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
*
* @version $Rev$ $Date$
*/
-public class POJOTestCase extends TestCase {
+public class POJOTestCase {
+
+ @Test
public void testAdapter() throws Exception {
JAXBContext context = JAXBContext.newInstance(MyJaxbBean.class, MyInterfaceImpl.class);
StringWriter writer = new StringWriter();
@@ -53,6 +59,7 @@
System.out.println(schemas);
}
+ @Test
public void testPOJO() throws Exception {
JAXBContext context = JAXBContext.newInstance(MyBean.class, MyInterfaceImpl.class);
StringWriter writer = new StringWriter();
@@ -78,6 +85,7 @@
assertEquals(bean, newBean);
}
+ @Test
public void testPOJOArray() throws Exception {
JAXBContext context = JAXBContext.newInstance(MyBean[].class, MySubBean.class);
StringWriter writer = new StringWriter();
@@ -136,6 +144,7 @@
}
*/
+ @Test
public void testString() throws Exception {
JAXBContext context = JAXBContext.newInstance(String.class);
StringWriter writer = new StringWriter();
@@ -149,6 +158,7 @@
assertEquals("ABC", e2.getValue());
}
+ @Test
public void testNull() throws Exception {
JAXBContext context = JAXBContext.newInstance(String.class);
StringWriter writer = new StringWriter();
@@ -163,6 +173,7 @@
assertNull(e2.getValue());
}
+ @Test
public void testArray() throws Exception {
JAXBContext context = JAXBContext.newInstance(String[].class);
StringWriter writer = new StringWriter();
@@ -177,6 +188,7 @@
assertTrue(e2.getValue() instanceof String[]);
}
+ @Test
public void testByteArray() throws Exception {
JAXBContext context = JAXBContext.newInstance(byte[].class);
StringWriter writer = new StringWriter();
@@ -193,6 +205,7 @@
assertTrue(e2.getValue() instanceof byte[]);
}
+ @Test
public void testPrimitive() throws Exception {
JAXBContext context = JAXBContext.newInstance(int.class);
StringWriter writer = new StringWriter();