Skip to content

Commit 0b959fe

Browse files
BobHansonBobHanson
committed
JAXB additional tests
1 parent b47f26d commit 0b959fe

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

‎sources/net.sf.j2s.java.core/src/test/jaxb/Root_ORDERED.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public Root_ORDERED(String name) {
7676
id = "id#1";
7777

7878
filter = FilterBy.BY_LABEL;
79+
filtera = FilterBy.BY_ATTRIBUTE;
7980

8081
hm.put("testing", "TESTING");
8182
hm.put("null", null);
@@ -166,6 +167,7 @@ public void validate() {
166167
// assert(qname.getNamespaceURI().equals("namespace"));
167168
assert(id.equals("test"));
168169
assert(filter == FilterBy.BY_LABEL);
170+
assert(filtera == FilterBy.BY_ATTRIBUTE);
169171
assert(position.toString().equals("12345678910"));
170172
assert(extraAttr.equals("more&"));
171173
assert(extraElem.equals("more&"));
@@ -286,6 +288,9 @@ public String toString() {
286288
@XmlElement
287289
private FilterBy filter;
288290

291+
@XmlAttribute
292+
private FilterBy filtera;
293+
289294
@XmlElement(namespace="")
290295
@XmlSchemaType(name=x)
291296
protected XMLGregorianCalendar creationDate;

‎sources/net.sf.j2s.java.core/src/test/jaxb_ordered_from_JS.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<ns2:Root_ORDERED xmlns:ns2="root.ordered" xmlns:ns3="package-namespace" xmlns:ns4="testing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" date="2018-10-20T05:00:00.000Z" byteshex="6465" bytes64="ZGU=" moreAttr="more&amp;amp;" ok="ok" id="test" type="cust">
2+
<ns2:Root_ORDERED xmlns:ns2="root.ordered" xmlns:ns3="package-namespace" xmlns:ns4="testing" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" filtera="byAttribute" date="2018-10-20T05:00:00.000Z" byteshex="6465" bytes64="ZGU=" moreAttr="more&amp;amp;" ok="ok" id="test" type="cust">
33
<ns3:filter xmlns:ns5="www.jalview.org/colours">byLabel</ns3:filter>
44
<ns3:f5 xsi:type="xs:float">1.25</ns3:f5>
55
<ns3:f5 xmlns:ns6="stolaf.edu" xsi:type="ns6:objclass" xmlns:ns7="www.jalview.org" id="jaxb2.obj">
@@ -46,7 +46,7 @@
4646
<ns8:ca>c"&amp;lt;&amp;gt;b&amp;amp; &#8491;</ns8:ca></ns3:list0>
4747
<ns3:list0 xsi:type="xs:string">list0[1]</ns3:list0>
4848
<ns3:list0 xsi:type="xs:string">list0[2]</ns3:list0>
49-
<creationDate>2020-01-14-06:00</creationDate>
49+
<creationDate>2020-01-16-06:00</creationDate>
5050
<ns3:c>c</ns3:c>
5151
<ns3:b>b</ns3:b>
5252
<ns3:a>a</ns3:a>

‎sources/net.sf.j2s.java.core/src/test/jaxb_ordered_from_Java.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<ns8:RootO xmlns:ns2="www.jalview.org" xmlns:ns3="root.field" xmlns:ns4="package-namespace" xmlns:ns5="testing" xmlns:ns6="st.Olaf" xmlns:ns7="www.jalview.org2" xmlns:ns8="root.ordered" type="cust" id="test" bytes64="ZGU=" byteshex="6465" date="2018-10-20T00:00:00-05:00" moreAttr="more&amp;amp;" ok="ok">
2+
<ns8:RootO xmlns:ns2="www.jalview.org" xmlns:ns3="root.field" xmlns:ns4="package-namespace" xmlns:ns5="testing" xmlns:ns6="st.Olaf" xmlns:ns7="www.jalview.org2" xmlns:ns8="root.ordered" type="cust" id="test" bytes64="ZGU=" byteshex="6465" date="2018-10-20T00:00:00-05:00" filtera="byAttribute" moreAttr="more&amp;amp;" ok="ok">
33
<ns4:filter>byLabel</ns4:filter>
44
<ns4:f5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:float">1.25</ns4:f5>
55
<ns4:f5 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns10="stolaf.edu" xsi:type="ns10:objclass" id="jaxb2.obj">
@@ -50,7 +50,7 @@
5050
</ns4:list0>
5151
<ns4:list0 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">list0[1]</ns4:list0>
5252
<ns4:list0 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">list0[2]</ns4:list0>
53-
<creationDate>2020-01-14-06:00</creationDate>
53+
<creationDate>2020-01-16-06:00</creationDate>
5454
<ns4:c>c</ns4:c>
5555
<ns4:b>b</ns4:b>
5656
<ns4:a>a</ns4:a>

0 commit comments

Comments
 (0)