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/09/08 15:38:45 UTC
svn commit: r1759854 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test:
java/org/apache/uima/util/CasIOUtilsTest.java resources/
Author: schor
Date: Thu Sep 8 15:38:45 2016
New Revision: 1759854
URL: http://svn.apache.org/viewvc?rev=1759854&view=rev
Log:
[UIMA-5103] merge catchup
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java (contents, props changed)
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/resources/ (props changed)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java?rev=1759854&r1=1759853&r2=1759854&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java Thu Sep 8 15:38:45 2016
@@ -149,6 +149,10 @@ public class CasIOUtilsTest extends Test
public void testS6p() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6p", false);
}
+
+ public void testS6pTs() throws Exception {
+ testFormat(SerialFormat.COMPRESSED_FILTERED_TS, "bins6pTs", false);
+ }
public void testS6pLenient() throws Exception {
testFormat(SerialFormat.COMPRESSED_FILTERED_TSI, "bins6", true);
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 8 15:38:45 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java:1690273-1759847
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 8 15:38:45 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/resources:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/resources:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/resources:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/resources:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/resources:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/resources:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/resources:1690273-1759822