You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2004/09/02 12:34:07 UTC
cvs commit: ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit JiraTest.java RecursionTest.java BaseTestCase.java
jochen 2004/09/02 03:34:07
Modified: src/jaxme/org/apache/ws/jaxme/junit RecursionTest.java
BaseTestCase.java
Added: src/test/jaxb/jira jaxme-10.xsd
src/jaxme/org/apache/ws/jaxme/junit JiraTest.java
Log:
Closing JAXME-10, unreproducible.
PR: JAXME-10
Obtained from: Nacho G. Mac Dowell, nacho@visual-ma.com
Revision Changes Path
1.1 ws-jaxme/src/test/jaxb/jira/jaxme-10.xsd
Index: jaxme-10.xsd
===================================================================
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://commons.dspc.net/activitymodel"
xmlns="http://commons.dspc.net/activitymodel"
elementFormDefault="qualified">
<xs:element name="TransmissionData">
<xs:complexType>
<xs:attribute name="created"/>
<xs:attribute name="mail-id"/>
<xs:sequence>
<xs:element name="sender">
<xs:complexType>
<xs:attribute name="name"/>
<xs:attribute name="account-id"/>
<xs:sequence>
<xs:element name="e-mail" minOccurs="0" type="xs:string"/>
<xs:element name="phone" type="xs:string"/>
<xs:element name="crypt-signature" minOccurs="0" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="recipient">
<xs:complexType>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="account-id" type="xs:string"/>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
1.4 +1 -33 ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/RecursionTest.java
Index: RecursionTest.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/RecursionTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RecursionTest.java 27 Aug 2004 20:49:30 -0000 1.3
+++ RecursionTest.java 2 Sep 2004 10:34:07 -0000 1.4
@@ -31,7 +31,7 @@
* itself.</li>
* </ol>
*/
-public class RecursionTest extends TestCase {
+public class RecursionTest extends BaseTestCase {
/** Creates a new instance with the given name.
*/
public RecursionTest(String pName) { super(pName); }
@@ -103,36 +103,4 @@
"</rec:Attribute>";
unmarshalMarshalUnmarshal(Attribute.class, xml);
}
-
- private void unmarshalMarshalUnmarshal(Class pClass, String pXML) throws Exception {
- Object o = unmarshal(pClass, pXML);
- assertNotNull(o);
- String s = marshal(o, pClass);
- assertEquals(pXML, s);
- Object comp = unmarshal(pClass, s);
- assertNotNull(comp);
- }
-
- private String getPackageName(Class pClass) {
- String className = pClass.getName();
- int offset = className.lastIndexOf('.');
- return className.substring(0, offset);
- }
-
- private Object unmarshal(Class pClass, String pXML) throws JAXBException {
- JAXBContext context = JAXBContext.newInstance(getPackageName(pClass));
- Unmarshaller unmarshaller = context.createUnmarshaller();
- return unmarshaller.unmarshal(new InputSource(new StringReader(pXML)));
- }
-
- private String marshal(Object o, Class pClass) throws JAXBException {
- JAXBContext context = JAXBContext.newInstance(getPackageName(pClass));
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
- marshaller.setProperty(JMMarshallerImpl.JAXME_XML_DECLARATION, Boolean.FALSE);
- StringWriter sw = new StringWriter();
- marshaller.marshal(o, sw);
- return sw.toString();
- }
-
}
1.5 +43 -1 ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/BaseTestCase.java
Index: BaseTestCase.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/BaseTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseTestCase.java 20 Aug 2004 12:23:08 -0000 1.4
+++ BaseTestCase.java 2 Sep 2004 10:34:07 -0000 1.5
@@ -16,6 +16,17 @@
*/
package org.apache.ws.jaxme.junit;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
+import org.apache.ws.jaxme.impl.JMMarshallerImpl;
+import org.xml.sax.InputSource;
+
import junit.framework.TestCase;
@@ -46,4 +57,35 @@
}
}
}
+
+ protected void unmarshalMarshalUnmarshal(Class pClass, String pXML) throws Exception {
+ Object o = unmarshal(pClass, pXML);
+ assertNotNull(o);
+ String s = marshal(o, pClass);
+ assertEquals(pXML, s);
+ Object comp = unmarshal(pClass, s);
+ assertNotNull(comp);
+ }
+
+ protected String getPackageName(Class pClass) {
+ String className = pClass.getName();
+ int offset = className.lastIndexOf('.');
+ return className.substring(0, offset);
+ }
+
+ protected Object unmarshal(Class pClass, String pXML) throws JAXBException {
+ JAXBContext context = JAXBContext.newInstance(getPackageName(pClass));
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+ return unmarshaller.unmarshal(new InputSource(new StringReader(pXML)));
+ }
+
+ protected String marshal(Object o, Class pClass) throws JAXBException {
+ JAXBContext context = JAXBContext.newInstance(getPackageName(pClass));
+ Marshaller marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ marshaller.setProperty(JMMarshallerImpl.JAXME_XML_DECLARATION, Boolean.FALSE);
+ StringWriter sw = new StringWriter();
+ marshaller.marshal(o, sw);
+ return sw.toString();
+ }
}
1.1 ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java
Index: JiraTest.java
===================================================================
package org.apache.ws.jaxme.junit;
import net.dspc.commons.activitymodel.TransmissionData;
/** Some excerpts from Jira bug reports.
*/
public class JiraTest extends BaseTestCase {
/** Creates a new instance with the given name.
*/
public JiraTest(String pName) {
super(pName);
}
/** Test for <a href="http://nagoya.apache.org/jira/browse/JAXME-10">JAXME-10</a>
*/
public void testJaxMe10() throws Exception {
final String input1 =
"<TransmissionData mail-id=\"mail456.test-account@dspc.net\" xmlns=\"http://commons.dspc.net/activitymodel\">\n" +
" <sender account-id=\"test-account@dspc.net\" name=\"Joe Tester\">\n" +
" <e-mail>test-account@bluprints.com</e-mail>\n" +
" <phone>0793041414141</phone>\n" +
" <crypt-signature/>\n" +
" </sender>\n" +
" <recipient account-id=\"hvendelbo@bluprints.com\" name=\"Henrik Vendelbo\"/>\n" +
"</TransmissionData>";
unmarshalMarshalUnmarshal(TransmissionData.class, input1);
final String input2 =
"<TransmissionData mail-id=\"mail456.test-account@dspc.net\" xmlns=\"http://commons.dspc.net/activitymodel\">\n" +
" <sender account-id=\"test-account@dspc.net\" name=\"Joe Tester\">\n" +
" <e-mail>test-account@bluprints.com</e-mail>\n" +
" <phone>0793041414141</phone>\n" +
" </sender>\n" +
" <recipient account-id=\"hvendelbo@bluprints.com\" name=\"Henrik Vendelbo\"/>\n" +
"</TransmissionData>";
unmarshalMarshalUnmarshal(TransmissionData.class, input2);
final String input3 =
"<TransmissionData mail-id=\"mail456.test-account@dspc.net\" xmlns=\"http://commons.dspc.net/activitymodel\">\n" +
" <sender account-id=\"test-account@dspc.net\" name=\"Joe Tester\"/>\n" +
" <recipient account-id=\"hvendelbo@bluprints.com\" name=\"Henrik Vendelbo\"/>\n" +
"</TransmissionData>";
unmarshalMarshalUnmarshal(TransmissionData.class, input2);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org