Repository: cassandra Updated Branches: refs/heads/trunk 6e35cf340 -> f5adeeb8d
ninja fix: CASSANDRA-14592 CellsTest.testExpiringCellReconcile Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5adeeb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5adeeb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5adeeb8 Branch: refs/heads/trunk Commit: f5adeeb8da15db0336db741bd39da46117fa9b73 Parents: 6e35cf3 Author: Benedict Elliott Smith <bened...@apple.com> Authored: Fri Aug 24 00:38:08 2018 +0100 Committer: Benedict Elliott Smith <bened...@apple.com> Committed: Fri Aug 24 00:38:08 2018 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/CellTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5adeeb8/test/unit/org/apache/cassandra/db/CellTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java index ae22816..14d05c6 100644 --- a/test/unit/org/apache/cassandra/db/CellTest.java +++ b/test/unit/org/apache/cassandra/db/CellTest.java @@ -244,11 +244,13 @@ public class CellTest Assert.assertEquals(-1, testExpiring("val", "a", 2, 1, null, "val", 1L, 2)); Assert.assertEquals(-1, testExpiring("val", "a", 1, 2, null, null, null, 1)); - Assert.assertEquals(1, testExpiring("val", "a", 1, 2, null, "val", null, 1)); + Assert.assertEquals(-1, testExpiring("val", "a", 1, 2, null, "val", null, 1)); + Assert.assertEquals(1, testExpiring("val", "a", 1, 1, null, "val", null, 2)); + Assert.assertEquals(1, testExpiring("val", "a", 1, 1, null, "val", null, 1)); // newer value Assert.assertEquals(-1, testExpiring("val", "b", 2, 1, null, "a", null, null)); - Assert.assertEquals(-1, testExpiring("val", "b", 2, 1, null, "a", null, 2)); + Assert.assertEquals(-1, testExpiring("val", "b", 2, 1, null, "a", null, 1)); } class SimplePurger implements DeletionPurger --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
