Make tests reflect recent changes

Author: Bj0rnen

src/test/java/com/spotify/reaper/unit/resources/RepairRunResourceTest.java

@@ -42,6 +42,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyCollection;
+import static org.mockito.Matchers.anyCollectionOf;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -96,6 +98,9 @@ public void setUp() throws Exception {
     when(proxy.isConnectionAlive()).thenReturn(Boolean.TRUE);
     when(proxy.tokenRangeToEndpoint(anyString(), any(RingRange.class))).thenReturn(
         Collections.singletonList(""));
+    when(proxy.triggerRepair(any(BigInteger.class), any(BigInteger.class), anyString(),
+        any(RepairParallelism.class), anyCollectionOf(String.class))).thenReturn(1);
+
     context.jmxConnectionFactory = new JmxConnectionFactory() {
       @Override
       public JmxProxy connect(Optional<RepairStatusHandler> handler, String host)

src/test/java/com/spotify/reaper/unit/service/RepairRunnerTest.java

@@ -45,6 +45,7 @@
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -53,6 +54,7 @@
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -135,8 +137,10 @@ public void testHangingRepair() throws ReaperException, InterruptedException {
     context.repairManager = new RepairManager();
     context.repairManager.initializeThreadPool(1, 500, TimeUnit.MILLISECONDS, 1, TimeUnit.MILLISECONDS);
 
+    final Semaphore mutex = new Semaphore(0);
+
     context.jmxConnectionFactory = new JmxConnectionFactory() {
-      final AtomicInteger repairAttempts = new AtomicInteger(0);
+      final AtomicInteger repairAttempts = new AtomicInteger(1);
 
       @Override
       public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host)
@@ -146,9 +150,10 @@ public JmxProxy connect(final Optional<RepairStatusHandler> handler, String host
         when(jmx.isConnectionAlive()).thenReturn(true);
         when(jmx.tokenRangeToEndpoint(anyString(), any(RingRange.class)))
             .thenReturn(Lists.newArrayList(""));
+        //doNothing().when(jmx).cancelAllRepairs();
         when(jmx.triggerRepair(any(BigInteger.class), any(BigInteger.class), anyString(),
-                               Matchers.<RepairParallelism>any(),
-                               Sets.newHashSet(anyString()))).then(
+            Matchers.<RepairParallelism>any(),
+            Sets.newHashSet(anyString()))).then(
             new Answer<Integer>() {
               @Override
               public Integer answer(InvocationOnMock invocation) throws Throwable {
@@ -157,7 +162,7 @@ public Integer answer(InvocationOnMock invocation) throws Throwable {
 
                 final int repairNumber = repairAttempts.getAndIncrement();
                 switch (repairNumber) {
-                  case 0:
+                  case 1:
                     new Thread() {
                       @Override
                       public void run() {
@@ -168,20 +173,22 @@ public void run() {
                       }
                     }.start();
                     break;
-                  case 1:
+                  case 2:
                     new Thread() {
                       @Override
                       public void run() {
                         handler.get()
                             .handle(repairNumber, ActiveRepairService.Status.STARTED, null);
                         assertEquals(RepairSegment.State.RUNNING,
-                                     storage.getRepairSegment(SEGMENT_ID).get().getState());
+                            storage.getRepairSegment(SEGMENT_ID).get().getState());
                         handler.get()
                             .handle(repairNumber, ActiveRepairService.Status.SESSION_SUCCESS, null);
-                        assertEquals(RepairSegment.State.RUNNING,
-                                     storage.getRepairSegment(SEGMENT_ID).get().getState());
+                        assertEquals(RepairSegment.State.DONE,
+                            storage.getRepairSegment(SEGMENT_ID).get().getState());
                         handler.get()
                             .handle(repairNumber, ActiveRepairService.Status.FINISHED, null);
+                        mutex.release();
+                        System.out.println("MUTEX RELEASED");
                       }
                     }.start();
                     break;
@@ -198,7 +205,9 @@ public void run() {
 
     // TODO: refactor so that we can properly wait for the repair runner to finish rather than
     // TODO: using this sleep().
-    Thread.sleep(600);
+    mutex.acquire();
+    System.out.println("MUTEX ACQUIRED");
+    Thread.sleep(100);
     assertEquals(RepairRun.RunState.DONE, storage.getRepairRun(RUN_ID).get().getRunState());
   }
 

src/test/java/com/spotify/reaper/unit/service/SegmentRunnerTest.java

@@ -166,7 +166,7 @@ public void run() {
                                          "Repair command 2 has failed");
                     handler.get().handle(1, ActiveRepairService.Status.SESSION_SUCCESS,
                                          "Repair session succeeded in command 1");
-                    assertEquals(RepairSegment.State.RUNNING,
+                    assertEquals(RepairSegment.State.DONE,
                                  storage.getRepairSegment(segmentId).get().getState());
                     handler.get().handle(1, ActiveRepairService.Status.FINISHED,
                                          "Repair command 1 has finished");
@@ -232,14 +232,14 @@ public void run() {
                                          "Repair command 1 has started");
                     assertEquals(RepairSegment.State.RUNNING,
                                  storage.getRepairSegment(segmentId).get().getState());
-                    handler.get().handle(1, ActiveRepairService.Status.SESSION_SUCCESS,
-                                         "Repair session succeeded in command 1");
-                    assertEquals(RepairSegment.State.RUNNING,
-                                 storage.getRepairSegment(segmentId).get().getState());
                     handler.get().handle(1, ActiveRepairService.Status.SESSION_FAILED,
                                          "Repair command 1 has failed");
                     assertEquals(RepairSegment.State.NOT_STARTED,
                                  storage.getRepairSegment(segmentId).get().getState());
+                    handler.get().handle(1, ActiveRepairService.Status.FINISHED,
+                        "Repair command 1 has finished");
+                    assertEquals(RepairSegment.State.NOT_STARTED,
+                        storage.getRepairSegment(segmentId).get().getState());
                   }
                 }));