Fix #695 (#696)

* Fix #695

Author: SamCarlberg

core/src/main/java/edu/wpi/grip/core/sources/CameraSource.java

@@ -285,12 +285,24 @@ public CameraSource stopAsync() {
 
   @Override
   public void stopAndAwait() {
-    stopAsync().cameraService.stopAndAwait();
+    try {
+      stopAsync().cameraService.stopAndAwait();
+    } catch (IllegalStateException e) {
+      if (!cameraService.state().equals(State.FAILED)) {
+        throw e;
+      }
+    }
   }
 
   @Override
   public void stopAndAwait(long timeout, TimeUnit unit) throws TimeoutException {
-    stopAsync().cameraService.stopAndAwait(timeout, unit);
+    try {
+      stopAsync().cameraService.stopAndAwait(timeout, unit);
+    } catch (IllegalStateException e) {
+      if (!cameraService.state().equals(State.FAILED)) {
+        throw e;
+      }
+    }
   }
 
   @Override

core/src/test/java/edu/wpi/grip/core/sources/CameraSourceTest.java

@@ -12,6 +12,7 @@
 import com.google.common.base.Throwables;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -41,7 +42,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-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;
@@ -71,7 +71,7 @@ public void setUp() throws Exception {
     final EventBus eventBus = new EventBus();
     class UnhandledExceptionWitness {
       @SuppressFBWarnings(value = "UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS",
-          justification = "This method is called by Guava's EventBus")
+                          justification = "This method is called by Guava's EventBus")
       @Subscribe
       public void onUnexpectedThrowableEvent(UnexpectedThrowableEvent event) {
         event.handleSafely((throwable, message, isFatal) -> {
@@ -120,14 +120,18 @@ public void testCallingStopAndStartDoesNotDeadlock() throws Exception {
   @Test
   public void testStartRethrowsIfFailure() throws Exception {
     mockFrameGrabberFactory.frameGrabber.setShouldThrowAtStart(true);
+    Waiter failWaiter = new Waiter();
     // Problems starting should be restarted
-    try {
-      cameraSourceWithMockGrabber.startAsync().stopAndAwait();
-      fail("Should have thrown an exception");
-    } catch (IllegalStateException e) {
-      assertThat(e.getCause()).isNotNull();
-      assertThat(e.getCause()).isInstanceOf(GrabberService.GrabberServiceException.class);
-    }
+    cameraSourceWithMockGrabber.addListener(new Service.Listener() {
+      @Override
+      public void failed(Service.State from, Throwable failure) {
+        failWaiter.assertNotNull(failure);
+        failWaiter.assertTrue(failure instanceof GrabberService.GrabberServiceException);
+        failWaiter.resume();
+      }
+    }, MoreExecutors.directExecutor());
+    cameraSourceWithMockGrabber.startAsync().stopAndAwait();
+    failWaiter.await();
 
     assertFalse("Camera service has stopped completely", cameraSourceWithMockGrabber.isRunning());
   }
@@ -193,18 +197,22 @@ public FrameGrabber create(String addressProperty) throws MalformedURLException
       }
     }, MockExceptionWitness.MOCK_FACTORY, 0);
 
+    Waiter failedWaiter = new Waiter();
+    source.addListener(new Service.Listener() {
+      @Override
+      public void failed(Service.State from, Throwable failure) {
+        failedWaiter.assertNotNull(failure);
+        failedWaiter.assertNotNull(failure.getCause());
+        failedWaiter.assertEquals(GRABBER_START_MESSAGE, failure.getCause().getMessage());
+        failedWaiter.resume();
+      }
+    }, MoreExecutors.directExecutor());
     source.startAsync();
     waiter1.await();
     waiter2.await();
     waiter3.await();
-    try {
-      source.stopAndAwait();
-      fail("This should have failed");
-    } catch (IllegalStateException e) {
-      assertThat(e.getCause()).isNotNull();
-      assertThat(e.getCause().getCause()).isNotNull();
-      assertThat(e.getCause().getCause()).hasMessage(GRABBER_START_MESSAGE);
-    }
+    source.stopAndAwait();
+    failedWaiter.await();
   }
 
   @Test

ui/src/main/java/edu/wpi/grip/ui/analysis/AnalysisController.java

@@ -5,6 +5,7 @@
 import edu.wpi.grip.core.StepIndexer;
 import edu.wpi.grip.core.events.BenchmarkEvent;
 import edu.wpi.grip.core.events.RunStoppedEvent;
+import edu.wpi.grip.core.events.StepRemovedEvent;
 import edu.wpi.grip.core.events.TimerEvent;
 import edu.wpi.grip.core.metrics.BenchmarkRunner;
 import edu.wpi.grip.core.metrics.CsvExporter;
@@ -67,7 +68,7 @@ public class AnalysisController {
   private BenchmarkRunner benchmarker;
 
   private final Callback<StepStatisticsEntry, Observable[]> extractor =
-      entry -> new Observable[] {entry.stepProperty(), entry.analysisProperty()};
+      entry -> new Observable[]{entry.stepProperty(), entry.analysisProperty()};
   private final ObservableList<StepStatisticsEntry> tableItems
       = FXCollections.observableArrayList(extractor);
 
@@ -142,7 +143,13 @@ private void onRun(TimerEvent event) {
   }
 
   @Subscribe
-  @SuppressWarnings( {"PMD.UnusedPrivateMethod", "PMD.UnusedFormalParameter"})
+  @SuppressWarnings("PMD.UnusedPrivateMethod")
+  private void onStepRemoved(StepRemovedEvent e) {
+    sampleMap.remove(e.getStep());
+  }
+
+  @Subscribe
+  @SuppressWarnings({"PMD.UnusedPrivateMethod", "PMD.UnusedFormalParameter"})
   private void onPipelineFinish(@Nullable RunStoppedEvent event) {
     double[] averageRunTimes = sortedStream(sampleMap)
         .parallel()