Adds tests for AddSourceView

Author: JLLeitschuh

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

@@ -28,7 +28,7 @@
  * Provides a way to generate a constantly updated {@link Mat} from a camera
  */
 @XStreamAlias(value = "grip:Camera")
-public final class CameraSource extends Source implements StartStoppable {
+public class CameraSource extends Source implements StartStoppable {
 
     private final static String DEVICE_NUMBER_PROPERTY = "deviceNumber";
     private final static String ADDRESS_PROPERTY = "address";
@@ -216,7 +216,7 @@ public void start() throws IOException, IllegalStateException {
      * @throws IOException           If there is a problem stopping the Source
      * @throws IllegalStateException If the camera is already stopped.
      */
-    public final void stop() throws TimeoutException, IOException {
+    public void stop() throws TimeoutException, IOException {
         synchronized (this) {
             if (frameThread.isPresent()) {
                 final Thread ex = frameThread.get();

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

@@ -0,0 +1,47 @@
+package edu.wpi.grip.core.sources;
+
+import com.google.common.eventbus.EventBus;
+import org.bytedeco.javacv.FrameGrabber;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+public class MockCameraSource extends CameraSource {
+
+    private boolean started = false;
+
+    static class FrameGrabberFactory implements CameraSource.FrameGrabberFactory {
+
+        @Override
+        public FrameGrabber create(int deviceNumber) {
+            return null;
+        }
+
+        @Override
+        public FrameGrabber create(String addressProperty) throws MalformedURLException {
+            return null;
+        }
+    }
+
+    public MockCameraSource(EventBus eventBus, String address) throws IOException {
+        super(eventBus, new FrameGrabberFactory(), address);
+    }
+
+    public MockCameraSource(EventBus eventBus, int deviceNumber) throws IOException {
+        super(eventBus, new FrameGrabberFactory(), deviceNumber);
+    }
+
+    @Override
+    public void start() throws IOException {
+        started = true;
+    }
+
+    @Override
+    public void stop() {
+        started = false;
+    }
+
+    public boolean isStarted() {
+        return started;
+    }
+}

ui/src/main/java/edu/wpi/grip/ui/pipeline/AddSourceView.java

@@ -1,5 +1,6 @@
 package edu.wpi.grip.ui.pipeline;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Inject;
 import edu.wpi.grip.core.events.SourceAddedEvent;
@@ -27,6 +28,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -37,21 +39,30 @@
  */
 public class AddSourceView extends HBox {
 
+    @VisibleForTesting
+    static final String SOURCE_DIALOG_STYLE_CLASS = "source-dialog";
     private final EventBus eventBus;
     private final MultiImageFileSource.Factory multiImageSourceFactory;
     private final ImageFileSource.Factory imageSourceFactory;
     private final CameraSource.Factory cameraSourceFactory;
 
+    private final Button webcamButton;
+    private final Button ipcamButton;
+    private Optional<Dialog> activeDialog = Optional.empty();
+
     @FunctionalInterface
     private interface SupplierWithIO<T> {
         T getWithIO() throws IOException;
     }
 
-    private class SourceDialog extends Dialog<ButtonType> {
+    private static class SourceDialog extends Dialog<ButtonType> {
         private final Text errorText = new Text();
 
         private SourceDialog(final Parent root, Control inputField) {
             super();
+
+            this.getDialogPane().getStyleClass().add(SOURCE_DIALOG_STYLE_CLASS);
+
             final GridPane gridContent = new GridPane();
             gridContent.setMaxWidth(Double.MAX_VALUE);
             GridPane.setHgrow(inputField, Priority.ALWAYS);
@@ -112,7 +123,7 @@ public interface Factory {
             }
         });
 
-        addButton("Add\nWebcam", getClass().getResource("/edu/wpi/grip/ui/icons/add-webcam.png"), mouseEvent -> {
+        webcamButton = addButton("Add\nWebcam", getClass().getResource("/edu/wpi/grip/ui/icons/add-webcam.png"), mouseEvent -> {
             final Parent root = this.getScene().getRoot();
 
             // Show a dialog for the user to pick a camera index
@@ -123,6 +134,8 @@ public interface Factory {
             dialog.setHeaderText("Choose a camera");
             dialog.setContentText("index");
 
+            dialog.getDialogPane().lookupButton(ButtonType.OK).requestFocus();
+
             // If the user clicks OK, add a new camera source
             loadCamera(dialog,
                     () -> {
@@ -135,7 +148,7 @@ public interface Factory {
                     });
         });
 
-        addButton("Add IP\nCamera", getClass().getResource("/edu/wpi/grip/ui/icons/add-webcam.png"), mouseEvent -> {
+        ipcamButton = addButton("Add IP\nCamera", getClass().getResource("/edu/wpi/grip/ui/icons/add-webcam.png"), mouseEvent -> {
             final Parent root = this.getScene().getRoot();
 
             // Show a dialog for the user to pick a camera URL
@@ -181,6 +194,7 @@ public interface Factory {
      */
     private void loadCamera(Dialog<ButtonType> dialog, SupplierWithIO<CameraSource> cameraSourceSupplier, Consumer<IOException> failureCallback) {
         assert Platform.isFxApplicationThread() : "Should only run in FX thread";
+        activeDialog = Optional.of(dialog);
         dialog.showAndWait().filter(Predicate.isEqual(ButtonType.OK)).ifPresent(result -> {
             try {
                 // Will try to create the camera with the values from the supplier
@@ -192,13 +206,14 @@ private void loadCamera(Dialog<ButtonType> dialog, SupplierWithIO<CameraSource>
                 loadCamera(dialog, cameraSourceSupplier, failureCallback);
             }
         });
+        activeDialog = Optional.empty();
     }
 
 
     /**
      * Add a new button for adding a source.  This method takes care of setting the event handler.
      */
-    private void addButton(String text, URL graphicURL, EventHandler<? super MouseEvent> onMouseClicked) {
+    private Button addButton(String text, URL graphicURL, EventHandler<? super MouseEvent> onMouseClicked) {
         final ImageView graphic = new ImageView(graphicURL.toString());
         graphic.setFitWidth(DPIUtility.SMALL_ICON_SIZE);
         graphic.setFitHeight(DPIUtility.SMALL_ICON_SIZE);
@@ -209,5 +224,29 @@ private void addButton(String text, URL graphicURL, EventHandler<? super MouseEv
         button.setOnMouseClicked(onMouseClicked);
 
         this.getChildren().add(button);
+        return button;
+    }
+
+    @VisibleForTesting
+    Button getWebcamButton() {
+        return webcamButton;
+    }
+
+    @VisibleForTesting
+    Button getIpcamButton() {
+        return ipcamButton;
+    }
+
+    @VisibleForTesting
+    void closeDialogs() {
+        activeDialog.ifPresent(dialog -> {
+            for ( ButtonType bt : dialog.getDialogPane().getButtonTypes() ) {
+                if ( bt.getButtonData() == ButtonBar.ButtonData.CANCEL_CLOSE ) {
+                    Button cancelButton = ( Button ) dialog.getDialogPane().lookupButton( bt );
+                    Platform.runLater(() -> cancelButton.fire());
+                    break;
+                }
+            }
+        });
     }
 }