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/04/18 20:00:09 UTC
svn commit: r1588532 -
/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
Author: schor
Date: Fri Apr 18 18:00:08 2014
New Revision: 1588532
URL: http://svn.apache.org/r1588532
Log:
[UIMA-3759] Fix some NPEs caused by the new tearDown.
Modified:
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java?rev=1588532&r1=1588531&r2=1588532&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java Fri Apr 18 18:00:08 2014
@@ -228,16 +228,7 @@ public class SerDesTest6 extends TestCas
// seed = 2934127305128325787L;
random = new Random(seed);
System.out.format("RandomSeed: %,d%n", seed);
-
- mSrc = setupTTypeSystem(TwoTypes);
- casSrc = mSrc.cas;
- final TypeSystems[] tss = TypeSystems.values();
- final int nbrAltTs = tss.length;
- alternateTTypeSystems = new TTypeSystem[nbrAltTs];
- for (int i = 0; i < nbrAltTs; i++){
- alternateTTypeSystems[i] = setupTTypeSystem(tss[i]);
- }
- }
+ }
public TTypeSystem setupTTypeSystem(TypeSystems kind) {
if (kind == EqTwoTypes) {
@@ -254,7 +245,14 @@ public class SerDesTest6 extends TestCas
}
public void setUp() {
- casSrc.reset();
+ mSrc = setupTTypeSystem(TwoTypes);
+ casSrc = mSrc.cas;
+ final TypeSystems[] tss = TypeSystems.values();
+ final int nbrAltTs = tss.length;
+ alternateTTypeSystems = new TTypeSystem[nbrAltTs];
+ for (int i = 0; i < nbrAltTs; i++){
+ alternateTTypeSystems[i] = setupTTypeSystem(tss[i]);
+ }
lfs = new ArrayList<FeatureStructure>();
}
@@ -264,6 +262,7 @@ public class SerDesTest6 extends TestCas
mSrc = null;
casSrc = null;
alternateTTypeSystems = null;
+ // don't reset random
}
// void setupTgtTs(String kind) {