blerer commented on code in PR #3359:
URL: https://github.com/apache/cassandra/pull/3359#discussion_r1634839426
##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -439,117 +468,129 @@ private static SortedMap<ByteBuffer, ByteBuffer>
map(ByteBuffer... values)
public void testMapCollectionBoundIsSatisfiedByValue() throws
InvalidRequestException
{
// EQ
- assertTrue(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), EQ, map()));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), EQ, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map()));
- assertFalse(conditionApplies(map(), EQ, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), EQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(null, EQ, null));
+ assertTrue(appliesMapCondition(null, EQ, map()));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ZERO, ONE)));
+ assertFalse(appliesMapCondition(map(ZERO, ONE), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ZERO)));
+ assertFalse(appliesMapCondition(map(ONE, ZERO), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), EQ, map(ONE,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE, TWO,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, null));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map()));
+ assertFalse(appliesMapCondition(null, EQ, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// NEQ
- assertFalse(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), NEQ, map()));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), NEQ, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map()));
- assertTrue(conditionApplies(map(), NEQ, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), NEQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(null, NEQ, null));
+ assertFalse(appliesMapCondition(null, NEQ, map()));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), NEQ, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE, TWO,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, null));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map()));
+ assertTrue(appliesMapCondition(null, NEQ, map(ONE, ONE)));
+
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LT
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), LT, map()));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), LT, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), LT, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map()));
- assertTrue(conditionApplies(map(), LT, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), LT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, LT, null), "Invalid
comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, LT, map()), "Invalid
comparison with an empty map for operator \"<\"");
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), LT, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LT, null),
"Invalid comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LT, map()),
"Invalid comparison with an empty map for operator \"<\"");
+ assertFalse(appliesMapCondition(null, LT, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LTE
- assertTrue(conditionApplies(map(ONE, ONE), LTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), LTE, map()));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), LTE, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), LTE, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map()));
- assertTrue(conditionApplies(map(), LTE, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), LTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, LTE, null), "Invalid
comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, LTE, map()), "Invalid
comparison with an empty map for operator \"<=\"");
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), LTE, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LTE, null),
"Invalid comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LTE, map()),
"Invalid comparison with an empty map for operator \"<=\"");
+ assertFalse(appliesMapCondition(null, LTE, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GT
- assertFalse(conditionApplies(map(ONE, ONE), GT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), GT, map()));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), GT, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), GT, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map()));
- assertFalse(conditionApplies(map(), GT, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), GT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, GT, null), "Invalid
comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, GT, map()), "Invalid
comparison with an empty map for operator \">\"");
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ZERO, ONE)));
+ assertFalse(appliesMapCondition(map(ZERO, ONE), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ZERO)));
+ assertFalse(appliesMapCondition(map(ONE, ZERO), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), GT, map(ONE,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GT, null),
"Invalid comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GT, map()),
"Invalid comparison with an empty map for operator \">\"");
+ assertFalse(appliesMapCondition(null, GT, map(ONE, ONE)));
+
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GTE
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), GTE, map()));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), GTE, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), GTE, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map()));
- assertFalse(conditionApplies(map(), GTE, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), GTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GTE, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, GTE, null), "Invalid
comparison with null for operator \">=\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, GTE, map()), "Invalid
comparison with an empty map for operator \">=\"");
Review Comment:
Same reason as previously explained.
##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -439,117 +468,129 @@ private static SortedMap<ByteBuffer, ByteBuffer>
map(ByteBuffer... values)
public void testMapCollectionBoundIsSatisfiedByValue() throws
InvalidRequestException
{
// EQ
- assertTrue(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), EQ, map()));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), EQ, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map()));
- assertFalse(conditionApplies(map(), EQ, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), EQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(null, EQ, null));
+ assertTrue(appliesMapCondition(null, EQ, map()));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ZERO, ONE)));
+ assertFalse(appliesMapCondition(map(ZERO, ONE), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ZERO)));
+ assertFalse(appliesMapCondition(map(ONE, ZERO), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), EQ, map(ONE,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE, TWO,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, null));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map()));
+ assertFalse(appliesMapCondition(null, EQ, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// NEQ
- assertFalse(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), NEQ, map()));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), NEQ, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map()));
- assertTrue(conditionApplies(map(), NEQ, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), NEQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(null, NEQ, null));
+ assertFalse(appliesMapCondition(null, NEQ, map()));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), NEQ, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE, TWO,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, null));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map()));
+ assertTrue(appliesMapCondition(null, NEQ, map(ONE, ONE)));
+
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LT
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), LT, map()));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), LT, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), LT, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map()));
- assertTrue(conditionApplies(map(), LT, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), LT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, LT, null), "Invalid
comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, LT, map()), "Invalid
comparison with an empty map for operator \"<\"");
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), LT, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LT, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LT, null),
"Invalid comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LT, map()),
"Invalid comparison with an empty map for operator \"<\"");
+ assertFalse(appliesMapCondition(null, LT, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LTE
- assertTrue(conditionApplies(map(ONE, ONE), LTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), LTE, map()));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ZERO, ONE)));
- assertTrue(conditionApplies(map(ZERO, ONE), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ONE, ZERO)));
- assertTrue(conditionApplies(map(ONE, ZERO), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), LTE, map(ONE,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), LTE, map(ONE, ONE, TWO,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map()));
- assertTrue(conditionApplies(map(), LTE, map(ONE, ONE)));
-
- assertFalse(conditionApplies(map(ONE, ONE), LTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, LTE, null), "Invalid
comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, LTE, map()), "Invalid
comparison with an empty map for operator \"<=\"");
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ZERO, ONE)));
+ assertTrue(appliesMapCondition(map(ZERO, ONE), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ZERO)));
+ assertTrue(appliesMapCondition(map(ONE, ZERO), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), LTE, map(ONE,
ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), LTE, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LTE, null),
"Invalid comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), LTE, map()),
"Invalid comparison with an empty map for operator \"<=\"");
+ assertFalse(appliesMapCondition(null, LTE, map(ONE, ONE)));
+
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), LTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertTrue(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), LTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GT
- assertFalse(conditionApplies(map(ONE, ONE), GT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(), GT, map()));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), GT, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), GT, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map()));
- assertFalse(conditionApplies(map(), GT, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), GT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, GT, null), "Invalid
comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, GT, map()), "Invalid
comparison with an empty map for operator \">\"");
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ZERO, ONE)));
+ assertFalse(appliesMapCondition(map(ZERO, ONE), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ZERO)));
+ assertFalse(appliesMapCondition(map(ONE, ZERO), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), GT, map(ONE,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), GT, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GT, null),
"Invalid comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GT, map()),
"Invalid comparison with an empty map for operator \">\"");
+ assertFalse(appliesMapCondition(null, GT, map(ONE, ONE)));
+
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE, ONE)));
+ assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GT, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+ assertFalse(appliesMapCondition(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GT, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GTE
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(), GTE, map()));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ZERO, ONE)));
- assertFalse(conditionApplies(map(ZERO, ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE, ZERO)));
- assertFalse(conditionApplies(map(ONE, ZERO), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), GTE, map(ONE,
ONE)));
- assertFalse(conditionApplies(map(ONE, ONE), GTE, map(ONE, ONE, TWO,
ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map()));
- assertFalse(conditionApplies(map(), GTE, map(ONE, ONE)));
-
- assertTrue(conditionApplies(map(ONE, ONE), GTE,
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ONE, ONE), GTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GTE, map(ONE, ONE)));
- assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER,
ONE), GTE, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
- assertTrue(conditionApplies(map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER), GTE, map(ONE,
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GTE, map(ONE, ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(null, GTE, null), "Invalid
comparison with null for operator \">=\"");
+ assertThrowsIRE(() -> appliesMapCondition(null, GTE, map()), "Invalid
comparison with an empty map for operator \">=\"");
+ assertTrue(appliesMapCondition(map(ONE, ONE), GTE, map(ZERO, ONE)));
+ assertFalse(appliesMapCondition(map(ZERO, ONE), GTE, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE), GTE, map(ONE, ZERO)));
+ assertFalse(appliesMapCondition(map(ONE, ZERO), GTE, map(ONE, ONE)));
+ assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), GTE, map(ONE,
ONE)));
+ assertFalse(appliesMapCondition(map(ONE, ONE), GTE, map(ONE, ONE, TWO,
ONE)));
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GTE, null),
"Invalid comparison with null for operator \">=\"");
+ assertThrowsIRE(() -> appliesMapCondition(map(ONE, ONE), GTE, map()),
"Invalid comparison with an empty map for operator \">=\"");
+ assertFalse(appliesMapCondition(null, GTE, map(ONE, ONE)));
Review Comment:
Same reason as previously explained.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
