ReplicationTaskStorage: Improve test coverage for isWaiting() Add test cases to ReplicationTasksStorage.isWaiting() and ReplicationTasksStorage.Task.isWaiting() methods. Also modify existing testcases to use these new methods. Change-Id: I032fb80a606a71bc3911d9ecb26ed738f074051f
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskTest.java index ca69644..178f125 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskTest.java
@@ -347,11 +347,11 @@ } private void assertIsWaiting(Task task) { - assertTrue(whiteBoxIsWaiting(task)); + assertTrue(task.isWaiting()); } private void assertNotWaiting(Task task) { - assertFalse(whiteBoxIsWaiting(task)); + assertFalse(task.isWaiting()); } private void assertIsRunning(Task task) { @@ -366,10 +366,6 @@ return Files.exists(task.running); } - private boolean whiteBoxIsWaiting(Task task) { - return Files.exists(task.waiting); - } - public static URIish getUrish(String uri) { try { return new URIish(uri);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java index 0a92c76..faabc90 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java
@@ -16,6 +16,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; @@ -71,10 +72,20 @@ } @Test + public void canCheckIfUpdateIsWaiting() { + storage.create(REF_UPDATE); + assertTrue(storage.isWaiting(uriUpdates)); + + storage.start(uriUpdates); + assertFalse(storage.isWaiting(uriUpdates)); + } + + @Test public void canStartWaitingUpdate() throws Exception { storage.create(REF_UPDATE); storage.start(uriUpdates); assertThat(storage.listWaiting()).isEmpty(); + assertFalse(storage.isWaiting(uriUpdates)); assertContainsExactly(storage.listRunning(), REF_UPDATE); } @@ -128,6 +139,8 @@ String keyA = storage.create(REF_UPDATE); String keyB = storage.create(updateB); assertThat(storage.listWaiting()).hasSize(2); + assertTrue(storage.isWaiting(uriUpdates)); + assertTrue(storage.isWaiting(TestUriUpdates.create(updateB))); assertNotEquals(keyA, keyB); } @@ -187,6 +200,8 @@ storage.create(REF_UPDATE); storage.create(updateB); assertThat(storage.listWaiting()).hasSize(2); + assertTrue(storage.isWaiting(uriUpdates)); + assertTrue(storage.isWaiting(TestUriUpdates.create(updateB))); } @Test @@ -198,6 +213,8 @@ String keyB = storage.create(refB); assertThat(storage.listWaiting()).hasSize(2); assertNotEquals(keyA, keyB); + assertTrue(storage.isWaiting(TestUriUpdates.create(refA))); + assertTrue(storage.isWaiting(TestUriUpdates.create(refB))); } @Test @@ -236,6 +253,7 @@ storage.start(uriUpdates); assertContainsExactly(storage.listRunning(), REF_UPDATE); + assertFalse(storage.isWaiting(uriUpdates)); assertThat(storage.listWaiting()).isEmpty(); storage.finish(uriUpdates); @@ -255,6 +273,7 @@ storage.resetAll(); assertContainsExactly(storage.listWaiting(), REF_UPDATE); + assertTrue(storage.isWaiting(uriUpdates)); assertThat(storage.listRunning()).isEmpty(); } @@ -267,6 +286,7 @@ storage.start(uriUpdates); assertContainsExactly(storage.listRunning(), REF_UPDATE); assertThat(storage.listWaiting()).isEmpty(); + assertFalse(storage.isWaiting(uriUpdates)); storage.finish(uriUpdates); assertNoIncompleteTasks(storage);