[ARROW-6738][Java] Refine test case

DataDog · Jan 28, 2020 · d6ef3d2 · d6ef3d2
1 parent c008289
commit d6ef3d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java
@@ -228,7 +228,8 @@ protected boolean compareStructVectors(Range range) {
     }
 
     for (String name : leftChildNames) {
-      RangeEqualsVisitor visitor = createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), null);
+      RangeEqualsVisitor visitor =
+          createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), /*type comparator*/ null);
       if (!visitor.rangeEquals(range)) {
         return false;
       }
@@ -307,7 +308,8 @@ protected boolean compareListVectors(Range range) {
     ListVector leftVector = (ListVector) left;
     ListVector rightVector = (ListVector) right;
 
-    RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
+    RangeEqualsVisitor innerVisitor =
+        createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
     Range innerRange = new Range();
 
     for (int i = 0; i < range.getLength(); i++) {
@@ -353,7 +355,8 @@ protected boolean compareFixedSizeListVectors(Range range) {
     }
 
     int listSize = leftVector.getListSize();
-    RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
+    RangeEqualsVisitor innerVisitor =
+        createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
     Range innerRange = new Range(0, 0, listSize);
 
     for (int i = 0; i < range.getLength(); i++) {

diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java
@@ -296,8 +296,8 @@ public void testUnionVectorSubRangeEquals() {
       uInt4Holder.isSet = 1;
 
       final NullableIntHolder intHolder = new NullableIntHolder();
-      uInt4Holder.value = 20;
-      uInt4Holder.isSet = 1;
+      intHolder.value = 20;
+      intHolder.isSet = 1;
 
       vector1.setType(0, Types.MinorType.UINT4);
       vector1.setSafe(0, uInt4Holder);
@@ -307,7 +307,11 @@ public void testUnionVectorSubRangeEquals() {
 
       vector1.setType(2, Types.MinorType.INT);
       vector1.setSafe(2, intHolder);
-      vector1.setValueCount(3);
+
+      vector1.setType(3, Types.MinorType.INT);
+      vector1.setSafe(3, intHolder);
+
+      vector1.setValueCount(4);
 
       vector2.setType(0, Types.MinorType.UINT4);
       vector2.setSafe(0, uInt4Holder);
@@ -317,9 +321,14 @@ public void testUnionVectorSubRangeEquals() {
 
       vector2.setType(2, Types.MinorType.INT);
       vector2.setSafe(2, intHolder);
-      vector2.setValueCount(3);
+
+      vector2.setType(3, Types.MinorType.UINT4);
+      vector2.setSafe(3, uInt4Holder);
+
+      vector2.setValueCount(4);
 
       RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector1, vector2);
+      assertFalse(visitor.rangeEquals(new Range(0, 0, 4)));
       assertTrue(visitor.rangeEquals(new Range(1, 1, 2)));
     }
   }