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/02 19:53:32 UTC

svn commit: r1584109 - /uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java

Author: schor
Date: Wed Apr  2 17:53:32 2014
New Revision: 1584109

URL: http://svn.apache.org/r1584109
Log:
no Jira - findbugs fixes

Modified:
    uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java

Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java?rev=1584109&r1=1584108&r2=1584109&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/jcas/test/JCasTest.java Wed Apr  2 17:53:32 2014
@@ -413,13 +413,13 @@ public class JCasTest extends TestCase {
 		public void make() {
 			Root r1 = new Root(jcas);
 			// Note: Java 7 can return -ve hashcodes so must avoid -ve remainders.
-			int k = Math.abs(System.identityHashCode(r1));
-			int imax = 1 + (k % 10);
+			int k = System.identityHashCode(r1);
+			int imax = 1 + Math.abs(k % 10);
 			r1.setArrayFloat(new FloatArray(jcas, imax));
 			for (int i = 0; i < imax; i++) {
-				r1.setArrayFloat(i, (float) k / i);
+				r1.setArrayFloat(i, (float) k / (i + 1));
 			}
-			int imaxFS = 1 + (k % 3);
+			int imaxFS = 1 + Math.abs((k % 3));
 			r1.setArrayRef(new FSArray(jcas, imaxFS));
 			for (int i = 1; i < imaxFS; i++) {
 				r1.setArrayRef(i, endOfSentenceInstance);
@@ -431,12 +431,12 @@ public class JCasTest extends TestCase {
 		public void test(Object o1) {
 			assertTrue(o1 instanceof Root);
 			Root r1 = (Root) o1;
-			int k = Math.abs(System.identityHashCode(r1));
-			int imax = 1 + (k % 10);
+			int k = System.identityHashCode(r1);
+			int imax = 1 + Math.abs(k % 10);
 			for (int i = 0; i < imax; i++) {
-				assertTrue(r1.getArrayFloat(i) == ((float) k / i));
+				assertTrue(r1.getArrayFloat(i) == ((float) k / (i + 1)));
 			}
-			int imaxFS = 1 + (k % 3);
+			int imaxFS = 1 + Math.abs(k % 3);
 			for (int i = 1; i < imaxFS; i++) {
 				assertTrue(endOfSentenceInstance == r1.getArrayRef(i));
 			}