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 2017/12/15 15:37:44 UTC
svn commit: r1818295 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util:
IntBitSetTest.java PositiveIntSetTest.java rb_trees/Int2IntRBTtest.java
Author: schor
Date: Fri Dec 15 15:37:44 2017
New Revision: 1818295
URL: http://svn.apache.org/viewvc?rev=1818295&view=rev
Log:
[UIMA-5677] use iterator methods with no validity checking
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java?rev=1818295&r1=1818294&r2=1818295&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntBitSetTest.java Fri Dec 15 15:37:44 2017
@@ -43,9 +43,9 @@ public class IntBitSetTest extends TestC
IntListIterator it = ibs.iterator();
assertTrue(it.hasNext());
- assertEquals(15, it.next());
+ assertEquals(15, it.nextNvc());
assertTrue(it.hasNext());
- assertEquals(188, it.next());
+ assertEquals(188, it.nextNvc());
assertFalse(it.hasNext());
assertEquals(3*64, ibs.getSpaceUsed_in_bits_no_overhead());
assertEquals(6, ibs.getSpaceUsed_in_words_no_overhead());
@@ -56,9 +56,9 @@ public class IntBitSetTest extends TestC
ibs.add(1188);
it = ibs.iterator();
assertTrue(it.hasNext());
- assertEquals(1015, it.next());
+ assertEquals(1015, it.nextNvc());
assertTrue(it.hasNext());
- assertEquals(1188, it.next());
+ assertEquals(1188, it.nextNvc());
assertFalse(it.hasNext());
assertEquals(2,ibs.size());
@@ -92,7 +92,7 @@ public class IntBitSetTest extends TestC
IntListIterator it = ibs.iterator();
List<Integer> ints = new ArrayList<Integer>();
while (it.hasNext()) {
- ints.add(it.next());
+ ints.add(it.nextNvc());
}
assertTrue(Arrays.equals(ints.toArray(), new Object[]{Integer.valueOf(1064)}));
@@ -100,7 +100,7 @@ public class IntBitSetTest extends TestC
it = ibs.iterator();
ints.clear();
while (it.hasNext()) {
- ints.add(it.next());
+ ints.add(it.nextNvc());
}
assertTrue(Arrays.equals(ints.toArray(), new Object[]{1063, 1064}));
@@ -111,7 +111,7 @@ public class IntBitSetTest extends TestC
it.moveToStart();
ints.clear();
while (it.hasNext()) {
- ints.add(it.next());
+ ints.add(it.nextNvc());
}
assertTrue(Arrays.equals(ints.toArray(), new Object[]{1, 10}));
}
@@ -125,9 +125,9 @@ public class IntBitSetTest extends TestC
assertEquals(2,ibs.size());
IntListIterator it = ibs.iterator();
assertTrue(it.hasNext());
- assertEquals(15, it.next());
+ assertEquals(15, it.nextNvc());
assertTrue(it.hasNext());
- assertEquals(101, it.next());
+ assertEquals(101, it.nextNvc());
assertFalse(it.hasNext());
assertEquals(3*64, ibs.getSpaceUsed_in_bits_no_overhead());
@@ -157,7 +157,7 @@ public class IntBitSetTest extends TestC
IntListIterator it = ibs.iterator();
for (int i = 0; i < 10; i += 4) {
assertTrue(it.hasNext());
- assertEquals(1000 + i, it.next());
+ assertEquals(1000 + i, it.nextNvc());
}
assertFalse(it.hasNext());
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java?rev=1818295&r1=1818294&r2=1818295&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java Fri Dec 15 15:37:44 2017
@@ -85,9 +85,9 @@ public class PositiveIntSetTest extends
IntListIterator it = s.getOrderedIterator();
assertTrue(it.hasNext());
- assertEquals(128, it.next());
+ assertEquals(128, it.nextNvc());
assertTrue(it.hasNext());
- assertEquals(128128, it.next());
+ assertEquals(128128, it.nextNvc());
assertFalse(it.hasNext());
// test offset
@@ -352,7 +352,7 @@ public class PositiveIntSetTest extends
IntListIterator it2 = s.iterator();
i = 0;
while (it2.hasNext()) {
- v1[i++] = it2.next();
+ v1[i++] = it2.nextNvc();
}
Arrays.sort(v1);
assertTrue(Arrays.equals(v1, v2));
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java?rev=1818295&r1=1818294&r2=1818295&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java Fri Dec 15 15:37:44 2017
@@ -60,7 +60,7 @@ public class Int2IntRBTtest extends Test
IntListIterator itl = ia.keyIterator();
while(itl.hasNext()){
- r[i++] = itl.next();
+ r[i++] = itl.nextNvc();
}
assertEquals(i, vs.length - 1);
assertTrue(Arrays.equals(r, new Integer[] {1, 2, 3, 4, 5, 6, 7, null}));