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 2016/08/05 17:46:25 UTC

svn commit: r1755370 - in /uima/uimaj/trunk/uimaj-json/src/test: java/org/apache/uima/json/ resources/CasSerialization/expected/xmi/

Author: schor
Date: Fri Aug  5 17:46:25 2016
New Revision: 1755370

URL: http://svn.apache.org/viewvc?rev=1755370&view=rev
Log:
[UIMA-5041] update namespace collision tests for xmi tests for change of test descriptors to test json name collision.

Modified:
    uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml
    uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml

Modified: uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/java/org/apache/uima/json/JsonCasSerializerTest.java Fri Aug  5 17:46:25 2016
@@ -72,6 +72,8 @@ public class JsonCasSerializerTest exten
    *    d) change the destination to the real expected dir and rerun   *
    *    e) change the GENERATE_EXPECTED back to false, and the         *
    *              generateDir back to newExpected                      *
+   *                                                                   * 
+   *    f) repeat for JsonXmiCasSerializerTest                         *                                          
    *                                                                   *
    *    Testing for proper format:                                     *
    *      can use http://www.jsoneditoronline.org/                     *          

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision.xml Fri Aug  5 17:46:25 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13"/></xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2.xml Fri Aug  5 17:46:25 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><test2:Token xmi:id="17" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13 17"/></xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2Omits.xml Fri Aug  5 17:46:25 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><test2:Token xmi:id="20" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16 20"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><test2:Token xmi:id="17" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13 17"/></xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2pp.xml Fri Aug  5 17:46:25 2016
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
     <cas:NULL xmi:id="0"/>
     <test:Token xmi:id="1" sofa="5" begin="0" end="0"/>
-    <test3:Token xmi:id="12" sofa="5" begin="0" end="0"/>
-    <test2:Token xmi:id="16" sofa="5" begin="0" end="0"/>
-    <test2:Token xmi:id="20" sofa="5" begin="0" end="0"/>
+    <test3:Token xmi:id="12"/>
+    <test2:Token xmi:id="13" sofa="5" begin="0" end="0"/>
+    <test2:Token xmi:id="17" sofa="5" begin="0" end="0"/>
     <cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/>
-    <cas:View sofa="5" members="1 12 16 20"/>
+    <cas:View sofa="5" members="1 12 13 17"/>
 </xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollision2ppOmits.xml Fri Aug  5 17:46:25 2016
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0">
     <cas:NULL xmi:id="0"/>
     <test:Token xmi:id="1" sofa="5" begin="0" end="0"/>
-    <test3:Token xmi:id="12" sofa="5" begin="0" end="0"/>
-    <test2:Token xmi:id="16" sofa="5" begin="0" end="0"/>
-    <test2:Token xmi:id="20" sofa="5" begin="0" end="0"/>
+    <test3:Token xmi:id="12"/>
+    <test2:Token xmi:id="13" sofa="5" begin="0" end="0"/>
+    <test2:Token xmi:id="17" sofa="5" begin="0" end="0"/>
     <cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/>
-    <cas:View sofa="5" members="1 12 16 20"/>
+    <cas:View sofa="5" members="1 12 13 17"/>
 </xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollisionOmits.xml Fri Aug  5 17:46:25 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><test2:Token xmi:id="16" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 16"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><test2:Token xmi:id="13" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12 13"/></xmi:XMI>
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml?rev=1755370&r1=1755369&r2=1755370&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml (original)
+++ uima/uimaj/trunk/uimaj-json/src/test/resources/CasSerialization/expected/xmi/nameSpaceCollsionFiltered.xml Fri Aug  5 17:46:25 2016
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12" sofa="5" begin="0" end="0"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:test3="http:///org/apache/uimax/test.ecore" xmlns:cas="http:///uima/cas.ecore" xmlns:test="http:///org/apache/uima/test.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:test2="http:///org/apache/uima/test2.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><test:Token xmi:id="1" sofa="5" begin="0" end="0"/><test3:Token xmi:id="12"/><cas:Sofa xmi:id="5" sofaNum="1" sofaID="_InitialView"/><cas:View sofa="5" members="1 12"/></xmi:XMI>
\ No newline at end of file