Menu
▾
▴
[Jibx-cvs] jibx/build/test/simple mybinding3.xml,1.2,1.3 mybinding4.xml,1.7,1.8 MyClass3.java,1.2,1.3 MyClass4.java,1.7,1.8 mytest3a.xml,1.1,1.2 mytest4a.xml,1.4,1.5 mytest4b.xml,1.3,1.4 mytest4.xml,1.3,1.4
|
From: Dennis S. <dso...@us...> - 2004-05-30 00:03:42
|
Update of /cvsroot/jibx/jibx/build/test/simple In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5892/test/simple Modified Files: mybinding3.xml mybinding4.xml MyClass3.java MyClass4.java mytest3a.xml mytest4a.xml mytest4b.xml mytest4.xml Log Message: Added tests for byte[] conversion with base64 encoding, char primitive to single-character string. Index: MyClass4.java =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/MyClass4.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MyClass4.java 28 May 2004 18:24:18 -0000 1.7 --- MyClass4.java 30 May 2004 00:03:24 -0000 1.8 *************** *** 15,21 **** private boolean i; private boolean j; ! // private int k; private byte l; private byte m; private ArrayList ints; --- 15,22 ---- private boolean i; private boolean j; ! private byte[] k; private byte l; private byte m; + private char n; private ArrayList ints; Index: mytest4.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mytest4.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mytest4.xml 28 May 2004 18:24:18 -0000 1.3 --- mytest4.xml 30 May 2004 00:03:24 -0000 1.4 *************** *** 5,8 **** --- 5,9 ---- <l>5</l> <m>8</m> + <n>a</n> <!-- <ints> --> <int>1</int> Index: mytest4a.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mytest4a.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mytest4a.xml 28 May 2004 18:24:18 -0000 1.4 --- mytest4a.xml 30 May 2004 00:03:24 -0000 1.5 *************** *** 3,7 **** --- 3,9 ---- <f>456</f> <j/> + <k>d2hhdCB3aWxsIHByaW50IG91dA==</k> <l>-25</l> + <n>#</n> <!-- <ints> --> <int>1</int> Index: mybinding3.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mybinding3.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mybinding3.xml 25 Oct 2003 18:08:59 -0000 1.2 --- mybinding3.xml 30 May 2004 00:03:23 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- <value name="c" field="c" usage="optional"/> <value name="d" field="d" usage="optional"/> + <value name="e" field="e" usage="optional" format="char:string"/> <structure name="dimension" field="dimen" value-style="attribute" usage="optional"> Index: MyClass3.java =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/MyClass3.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MyClass3.java 25 Oct 2003 18:08:59 -0000 1.2 --- MyClass3.java 30 May 2004 00:03:24 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- private double c; private boolean d; + private char e; private Dimension dimen; private Rectangle rect; Index: mytest4b.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mytest4b.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mytest4b.xml 28 May 2004 18:24:18 -0000 1.3 --- mytest4b.xml 30 May 2004 00:03:24 -0000 1.4 *************** *** 4,8 **** --- 4,10 ---- <gwrap><![CDATA[<b>this is bold text</b>]]></gwrap> <j></j> + <k>d2hhdCAgd2lsbCAgIHByaW50ICAgICBvdXQgICAgICAa</k> <l>127</l> + <n><</n> <!-- <ints> --> <int>1</int> Index: mybinding4.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mybinding4.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mybinding4.xml 28 May 2004 18:24:18 -0000 1.7 --- mybinding4.xml 30 May 2004 00:03:24 -0000 1.8 *************** *** 1,7 **** <!-- Test text and CDATA values, including optional values, and custom ! serializer/deserializers. TODO: fix so default is not required with custom deserializer for primitive --> <binding> <mapping name="myelement" class="simple.MyClass4"> <value style="text" field="a"/> --- 1,9 ---- <!-- Test text and CDATA values, including optional values, and custom ! serializer/deserializers. Also different types. TODO: fix so default is not required with custom deserializer for primitive --> <binding> + <format type="char" serializer="org.jibx.runtime.Utility.serializeCharString" + deserializer="org.jibx.runtime.Utility.deserializeCharString"/> <mapping name="myelement" class="simple.MyClass4"> <value style="text" field="a"/> *************** *** 25,30 **** --- 27,34 ---- <value name="j" test-method="testJ" get-method="getJ" set-method="setJ" usage="optional"/> + <value name="k" field="k" usage="optional"/> <value name="l" field="l"/> <value name="m" field="m" default="-128"/> + <value name="n" field="n"/> <collection field="ints" usage="optional"> <value name="int" type="java.lang.Integer"/> Index: mytest3a.xml =================================================================== RCS file: /cvsroot/jibx/jibx/build/test/simple/mytest3a.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mytest3a.xml 10 Oct 2003 06:05:31 -0000 1.1 --- mytest3a.xml 30 May 2004 00:03:24 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <b></b> <d>true</d> + <e> </e> <!-- <ints> --> <int>1</int> |