You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/11/03 23:44:00 UTC
svn commit: r1636465 - in
/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected:
json/ xmi/
Author: schor
Date: Mon Nov 3 22:44:00 2014
New Revision: 1636465
URL: http://svn.apache.org/r1636465
Log:
[UIMA-4083] fix test cases after minor update changed the ordering in a few cases.
Removed:
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedAndRefEmbed.xml
Modified:
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml
uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-a.txt Mon Nov 3 22:44:00 2014
@@ -6,7 +6,7 @@
{"sofa" : 8, "aArrayFS" : 36 }, 15, 22, 29 ] } },
"@referenced_fss" : {
"8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "36" : {"@type" : "FSArray", "@collection" : [15, 22, 29 ] },
"15" : {"@type" : "RefTypes", "sofa" : 8 },
"22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 },
- "36" : {"@type" : "FSArray", "@collection" : [15, 22, 29 ] } } }
\ No newline at end of file
+ "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/array-self-non-embeddable-l.txt Mon Nov 3 22:44:00 2014
@@ -6,7 +6,7 @@
{"sofa" : 8, "aListFs" : 41 }, 15, 22, 29 ] } },
"@referenced_fss" : {
"8" : {"@type" : "Sofa", "sofaNum" : 1, "sofaID" : "_InitialView" },
+ "41" : {"@type" : "NonEmptyFSList", "head" : 15, "tail" : [22, 29 ] },
"15" : {"@type" : "RefTypes", "sofa" : 8 },
"22" : {"@type" : "RefTypes", "sofa" : 8 },
- "29" : {"@type" : "RefTypes", "sofa" : 8 },
- "41" : {"@type" : "NonEmptyFSList", "head" : 15, "tail" : [22, 29 ] } } }
\ No newline at end of file
+ "29" : {"@type" : "RefTypes", "sofa" : 8 } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/indexedSingleListStatic.txt Mon Nov 3 22:44:00 2014
@@ -14,6 +14,6 @@
"NonEmptyIntegerList" : [
{"head" : 11, "tail" : 5 } ] } },
"@referenced_fss" : {
- "1" : {"@type" : "EmptyIntegerList" },
+ "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
"2" : {"@type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
- "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 } } }
\ No newline at end of file
+ "1" : {"@type" : "EmptyIntegerList" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/json/twoListMergeStatic.txt Mon Nov 3 22:44:00 2014
@@ -15,6 +15,6 @@
{"head" : 11, "tail" : 5 },
{"head" : 110, "tail" : 5 } ] } },
"@referenced_fss" : {
- "1" : {"@type" : "EmptyIntegerList" },
+ "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 },
"2" : {"@type" : "NonEmptyIntegerList", "head" : 33, "tail" : 1 },
- "5" : {"@type" : "NonEmptyIntegerList", "head" : 22, "tail" : 2 } } }
\ No newline at end of file
+ "1" : {"@type" : "EmptyIntegerList" } } }
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/array-self-items-all-embeddable-l.xml Mon Nov 3 22:44:00 2014
@@ -4,10 +4,10 @@
<cas:NonEmptyFSList xmi:id="41" head="15" tail="44"/>
<cas:Sofa xmi:id="8" sofaNum="1" sofaID="_InitialView"/>
<test:RefTypes xmi:id="15" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
- <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
<cas:NonEmptyFSList xmi:id="44" head="22" tail="47"/>
+ <test:RefTypes xmi:id="22" sofa="8" begin="0" end="0"/>
<cas:NonEmptyFSList xmi:id="47" head="29" tail="50"/>
+ <test:RefTypes xmi:id="29" sofa="8" begin="0" end="0"/>
<cas:EmptyFSList xmi:id="50"/>
<cas:View sofa="8" members="1 41"/>
</xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleList.xml Mon Nov 3 22:44:00 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
<cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:EmptyIntegerList xmi:id="1"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
<cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
+ <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:EmptyIntegerList xmi:id="1"/>
<cas:View members="8"/>
</xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/indexedSingleListStatic.xml Mon Nov 3 22:44:00 2014
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
<cas:NULL xmi:id="0"/>
<cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
- <cas:EmptyIntegerList xmi:id="1"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
<cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
+ <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:EmptyIntegerList xmi:id="1"/>
<cas:View members="8"/>
</xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/multipleViews.xml Mon Nov 3 22:44:00 2014
@@ -8,6 +8,7 @@
<aListString>testStr</aListString>
</test:AllTypes>
<cas:Sofa xmi:id="29" sofaNum="1" sofaID="_InitialView"/>
+ <cas:Sofa xmi:id="185" sofaNum="2" sofaID="View2"/>
<test:AllTypes xmi:id="36" sofa="29" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
<cas:BooleanArray xmi:id="164" elements="false"/>
<cas:ByteArray xmi:id="167" elements="0000"/>
@@ -15,7 +16,6 @@
<cas:StringArray xmi:id="173">
<elements/>
</cas:StringArray>
- <cas:Sofa xmi:id="185" sofaNum="2" sofaID="View2"/>
<test:AllTypes xmi:id="220" sofa="185" begin="0" end="0" aBoolean="false" aByte="0" aShort="0" aInteger="0" aLong="0" aFloat="0.0" aDouble="0.0"/>
<cas:BooleanArray xmi:id="349" elements="false"/>
<cas:ByteArray xmi:id="352" elements="0000"/>
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMerge.xml Mon Nov 3 22:44:00 2014
@@ -2,8 +2,8 @@
<cas:NULL xmi:id="0"/>
<cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
<cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/>
- <cas:EmptyIntegerList xmi:id="1"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
<cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
+ <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:EmptyIntegerList xmi:id="1"/>
<cas:View members="8 11"/>
</xmi:XMI>
\ No newline at end of file
Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml?rev=1636465&r1=1636464&r2=1636465&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/twoListMergeStatic.xml Mon Nov 3 22:44:00 2014
@@ -2,8 +2,8 @@
<cas:NULL xmi:id="0"/>
<cas:NonEmptyIntegerList xmi:id="8" head="11" tail="5"/>
<cas:NonEmptyIntegerList xmi:id="11" head="110" tail="5"/>
- <cas:EmptyIntegerList xmi:id="1"/>
- <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
<cas:NonEmptyIntegerList xmi:id="5" head="22" tail="2"/>
+ <cas:NonEmptyIntegerList xmi:id="2" head="33" tail="1"/>
+ <cas:EmptyIntegerList xmi:id="1"/>
<cas:View members="8 11"/>
</xmi:XMI>
\ No newline at end of file