Tests and style

apache · Nov 30, 2022 · 851acb8 · 851acb8
1 parent f3d3270
commit 851acb8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/...ng/src/main/java/org/apache/druid/query/rowsandcols/frame/MapOfColumnsRowsAndColumns.java b/...ng/src/main/java/org/apache/druid/query/rowsandcols/frame/MapOfColumnsRowsAndColumns.java
@@ -44,7 +44,7 @@ public static MapOfColumnsRowsAndColumns of(String name, Column col, String name
   public static MapOfColumnsRowsAndColumns fromMap(Map<String, Column> map)
   {
     if (map == null || map.isEmpty()) {
-      throw new ISE("map[%s] cannot be null or empty", map);
+      throw new ISE("map[%s] cannot be null or empty.", map);
     }
 
     final Iterator<Map.Entry<String, Column>> iter = map.entrySet().iterator();
@@ -55,7 +55,7 @@ public static MapOfColumnsRowsAndColumns fromMap(Map<String, Column> map)
       final int newCells = entry.getValue().toAccessor().numCells();
       if (numCells != newCells) {
         throw new ISE(
-            "Mismatched numCells, expectedNumCells[%s], actual[%s] from col[%s]",
+            "Mismatched numCells, expectedNumCells[%s], actual[%s] from col[%s].",
             numCells,
             newCells,
             entry.getKey()

diff --git a/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java b/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
@@ -53,4 +53,4 @@ public Integer accumulate(Integer accumulated, RowsAndColumns in)
     yielder = yielder.next(0);
     Assert.assertTrue(yielder.isDone());
   }
-}
+}
diff --git a/processing/src/test/java/org/apache/druid/query/operator/SequenceOperatorTest.java b/processing/src/test/java/org/apache/druid/query/operator/SequenceOperatorTest.java
@@ -53,4 +53,4 @@ public void testSanity()
     op.close(true);
     op.close(false);
   }
-}
+}
diff --git a/processing/src/test/java/org/apache/druid/query/operator/window/ComposingProcessorTest.java b/processing/src/test/java/org/apache/druid/query/operator/window/ComposingProcessorTest.java
@@ -71,4 +71,4 @@ public boolean validateEquivalent(Processor otherProcessor)
       return validationResult;
     }
   }
-}
+}
diff --git a/processing/src/test/java/org/apache/druid/query/operator/window/RowsAndColumnsHelper.java b/processing/src/test/java/org/apache/druid/query/operator/window/RowsAndColumnsHelper.java
@@ -28,6 +28,7 @@
 import org.apache.druid.segment.column.ColumnType;
 import org.junit.Assert;
 
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -132,7 +133,9 @@ public void validate(RowsAndColumns rac)
   public void validate(String name, RowsAndColumns rac)
   {
     if (fullColumnSet != null) {
-      Assert.assertEquals(name, fullColumnSet, rac.getColumnNames());
+      final Collection<String> columnNames = rac.getColumnNames();
+      Assert.assertEquals(name, fullColumnSet.size(), columnNames.size());
+      Assert.assertTrue(name, fullColumnSet.containsAll(columnNames));
     }
 
     for (Map.Entry<String, ColumnHelper> entry : helpers.entrySet()) {

diff --git a/...sing/src/test/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumnsTest.java b/...sing/src/test/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumnsTest.java
@@ -70,7 +70,7 @@ public void testExceptionOnMismatchedCells()
       );
     }
     catch (ISE ex) {
-      Assert.assertEquals("Mismatched numCells, expectedNumCells[1], actual[2] from col[2]", ex.getMessage());
+      Assert.assertEquals("Mismatched numCells, expectedNumCells[1], actual[2] from col[2].", ex.getMessage());
       exceptionThrown = true;
     }
     Assert.assertTrue(exceptionThrown);