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/12/16 21:52:34 UTC
svn commit: r1774666 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
Author: schor
Date: Fri Dec 16 21:52:34 2016
New Revision: 1774666
URL: http://svn.apache.org/viewvc?rev=1774666&view=rev
Log:
[UIMA-5050] merge from trunk
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java (contents, props changed)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java?rev=1774666&r1=1774665&r2=1774666&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java Fri Dec 16 21:52:34 2016
@@ -46,11 +46,6 @@ import junit.framework.TestCase;
*/
public class IndexComparitorTest extends TestCase {
- static {
- // only works if test run by itself, otherwise some other test loads the CASImpl class
- // which inits itself then without this property being used.
- System.setProperty(CASImpl.THROW_EXCEPTION_FS_UPDATES_CORRUPTS, "true");
- }
CAS cas;
TypeSystem ts;
@@ -539,9 +534,12 @@ public class IndexComparitorTest extends
FeatureStructure fs = it.get();
boolean ok = false;
try {
+ System.setProperty(CASImpl.THROW_EXCEPTION_FS_UPDATES_CORRUPTS, "true");
fs.setBooleanValue(type1UsedBoolean, ! fs.getBooleanValue(type1UsedBoolean)); // should cause protection
} catch (Exception e) {
ok = true;
+ } finally {
+ System.clearProperty(CASImpl.THROW_EXCEPTION_FS_UPDATES_CORRUPTS);
}
assertTrue(CASImpl.IS_THROW_EXCEPTION_CORRUPT_INDEX ? ok : !ok);
}
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec 16 21:52:34 2016
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IndexComparitorTest.java:1690273-1774656