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 13:14:22 UTC

cvs commit: ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit JiraTest.java BaseTestCase.java

jochen      2004/09/02 04:14:22

  Modified:    src/jaxme/org/apache/ws/jaxme/junit JiraTest.java
                        BaseTestCase.java
  Added:       src/test/jaxb/jira jaxme-12.xsd
  Log:
  Closing JAXME-12, unreproducible.
  PR: JAXME-12
  Obtained from: Nacho G. Mac Dowell, nacho@visual-ma.com
  
  Revision  Changes    Path
  1.1                  ws-jaxme/src/test/jaxb/jira/jaxme-12.xsd
  
  Index: jaxme-12.xsd
  ===================================================================
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
      targetNamespace="http://commons.dspc.net/activitymodel2"
      xmlns="http://commons.dspc.net/activitymodel2"
      elementFormDefault="qualified">
    <xs:element name="Body1">
      <xs:complexType>
        <xs:simpleContent>
          <xs:extension base="xs:string">
            <xs:attribute name="html-template"/>
            <xs:attribute name="text-template"/>
          </xs:extension>
        </xs:simpleContent>
      </xs:complexType>
    </xs:element>
  
  
    <xs:element name="Body2">
      <xs:complexType>
        <xs:simpleContent>
          <xs:extension base="xs:string"/>
        </xs:simpleContent>
        <xs:attribute name="html-template"/>
        <xs:attribute name="text-template"/>
      </xs:complexType>
    </xs:element>
  </xs:schema>
  
  
  
  1.2       +22 -0     ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java
  
  Index: JiraTest.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JiraTest.java	2 Sep 2004 10:34:07 -0000	1.1
  +++ JiraTest.java	2 Sep 2004 11:14:21 -0000	1.2
  @@ -1,6 +1,9 @@
   package org.apache.ws.jaxme.junit;
   
   import net.dspc.commons.activitymodel.TransmissionData;
  +import net.dspc.commons.activitymodel2.Body1;
  +import net.dspc.commons.activitymodel2.Body2;
  +import net.dspc.commons.activitymodel2.ObjectFactory;
   
   
   /** Some excerpts from Jira bug reports.
  @@ -40,5 +43,24 @@
               "  <recipient account-id=\"hvendelbo@bluprints.com\" name=\"Henrik Vendelbo\"/>\n" +
               "</TransmissionData>";
           unmarshalMarshalUnmarshal(TransmissionData.class, input2);
  +    }
  +
  +    /** Test for <a href="http://nagoya.apache.org/jira/browse/JAXME-12">JAXME-12</a>
  +     */
  +    public void testJaxMe12() throws Exception {
  +        final String[] inputs = new String[]{
  +            "<Body1 text-template=\"y\" html-template=\"x\" xmlns=\"http://commons.dspc.net/activitymodel2\"/>",
  +            "<Body1 text-template=\"y\" xmlns=\"http://commons.dspc.net/activitymodel2\"/>",
  +            "<Body1 html-template=\"x\" xmlns=\"http://commons.dspc.net/activitymodel2\"/>",
  +            "<Body1 xmlns=\"http://commons.dspc.net/activitymodel2\"/>",
  +            "<Body2 xmlns=\"http://commons.dspc.net/activitymodel2\"/>"
  +        };
  +        for (int i = 0;  i < inputs.length;  i++) {
  +        	unmarshalMarshalUnmarshal(Body1.class, inputs[i]);
  +        }
  +        Body1 body1 = new ObjectFactory().createBody1();
  +        body1.setValue("ok");
  +        Body2 body2 = new ObjectFactory().createBody2();
  +        body2.setValue("ok");
       }
   }
  
  
  
  1.6       +4 -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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseTestCase.java	2 Sep 2004 10:34:07 -0000	1.5
  +++ BaseTestCase.java	2 Sep 2004 11:14:21 -0000	1.6
  @@ -76,6 +76,9 @@
       protected Object unmarshal(Class pClass, String pXML) throws JAXBException {
           JAXBContext context = JAXBContext.newInstance(getPackageName(pClass));
           Unmarshaller unmarshaller = context.createUnmarshaller();
  +        System.out.println("Unmarshalling " + pXML);
  +        unmarshaller.unmarshal(new InputSource(new StringReader(pXML)));
  +        System.out.println("Done");
           return unmarshaller.unmarshal(new InputSource(new StringReader(pXML)));
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org