diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-06 21:35:43 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-06 21:35:43 +0000 |
| commit | 093fcdb0a7125ec9767592c16882e1fe3a993b3c (patch) | |
| tree | 5826d0ccf42e85d89c7710dcf931e43c32441456 /java/sca/modules/databinding-jaxb/src/test | |
| parent | 70993983dbb1b5ed38f0245e4678eed1ad72472b (diff) | |
Support the SCA property value based on the OASIS syntax
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@751079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/databinding-jaxb/src/test')
| -rw-r--r-- | java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java | 5 | ||||
| -rwxr-xr-x | java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java index b9370c9387..98aefed546 100644 --- a/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java +++ b/java/sca/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java @@ -209,11 +209,12 @@ public class POJOTestCase { public void testPrimitive() throws Exception { JAXBContext context = JAXBContext.newInstance(int.class); StringWriter writer = new StringWriter(); - JAXBElement<Object> element = new JAXBElement<Object>(new QName("http://ns1", "bean"), Object.class, 1); + JAXBElement<Integer> element = new JAXBElement<Integer>(new QName("http://ns1", "bean"), Integer.class, 1); context.createMarshaller().marshal(element, writer); // System.out.println(writer.toString()); - Object result = context.createUnmarshaller().unmarshal(new StringReader(writer.toString())); + StreamSource source = new StreamSource(new StringReader(writer.toString())); + Object result = context.createUnmarshaller().unmarshal(source, int.class); assertTrue(result instanceof JAXBElement); JAXBElement e2 = (JAXBElement)result; assertEquals(1, e2.getValue()); diff --git a/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd b/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd index 241ec15d36..04e8cb44f3 100755 --- a/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd +++ b/java/sca/modules/databinding-jaxb/src/test/resources/ipo.xsd @@ -129,6 +129,14 @@ <pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" /> </restriction> </simpleType> + + <element name="note" type="ipo:Note" /> + <complexType name="Note" mixed="true"> + <sequence> + <any namespace="##any" processContents="lax" minOccurs="0"/> + </sequence> + <anyAttribute/> + </complexType> |