Merge branch 'master' into 'feat/http'

Author: SamCarlberg

.travis-scripts/install.sh

@@ -3,11 +3,11 @@
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 
     # Install some custom requirements on OS X
-    wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-macosx-x64.dmg
-    hdiutil mount jdk-8u66-macosx-x64.dmg
-    sudo installer -pkg /Volumes/JDK\ 8\ Update\ 66/JDK\ 8\ Update\ 66.pkg -target LocalSystem
+    wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-macosx-x64.dmg
+    hdiutil mount jdk-8u92-macosx-x64.dmg
+    sudo installer -pkg /Volumes/JDK\ 8\ Update\ 92/JDK\ 8\ Update\ 92.pkg -target LocalSystem
 else
     export DISPLAY=:99.0
     sh -e /etc/init.d/xvfb start
     pip install --user codecov
-fi
+fi

.travis.yml

@@ -29,7 +29,7 @@ install:
   - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:assemble --stacktrace || ./gradlew --stacktrace '
 
 script:
-  - ./gradlew check --stacktrace -Pheadless=true
+  - ./gradlew check --stacktrace -Pheadless=true -PlogTests
 
 after_success:
   - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then codecov         ; fi

appveyor.yml

@@ -6,7 +6,7 @@ build_script:
 
 # to run your custom scripts instead of automatic tests
 test_script:
-  - gradlew.bat check --stacktrace -Pheadless=true
+  - gradlew.bat check --stacktrace -Pheadless=true -PlogTests
 
 platform:
   - x64
@@ -28,4 +28,4 @@ deploy:
     appveyor_repo_tag: true       # deploy on tag push only
 
 cache:
-  - C:\Users\appveyor\.gradle
+  - C:\Users\appveyor\.gradle

build.gradle

@@ -140,7 +140,11 @@ allprojects {
     // Turn on test results
     test {
         testLogging {
-            events "failed"
+            if (project.hasProperty('logTests')) {
+                events  "started", "passed", "skipped", "failed"
+            } else {
+                events "failed"
+            }
             exceptionFormat "full"
         }
         doFirst {

core/src/test/java/edu/wpi/grip/core/operations/network/MockGRIPNetworkModule.java

@@ -0,0 +1,21 @@
+package edu.wpi.grip.core.operations.network;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+import edu.wpi.grip.core.operations.network.ros.MockROSManager;
+import edu.wpi.grip.core.operations.network.ros.ROSNetworkPublisherFactory;
+
+/**
+ * A mock of {@Link GRIPNetworkModule} for testing.
+ */
+public final class MockGRIPNetworkModule extends AbstractModule {
+    @Override
+    protected void configure() {
+        bind(MapNetworkPublisherFactory.class)
+                .annotatedWith(Names.named("ntManager"))
+                .to(MockMapNetworkPublisher.class);
+        bind(ROSNetworkPublisherFactory.class)
+                .annotatedWith(Names.named("rosManager"))
+                .to(MockROSManager.class);
+    }
+}

core/src/test/java/edu/wpi/grip/core/operations/network/MockMapNetworkPublisher.java

@@ -1,12 +1,16 @@
 package edu.wpi.grip.core.operations.network;
 
-
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
 @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
-public class MockMapNetworkPublisher<T> extends MapNetworkPublisher<T> {
+public class MockMapNetworkPublisher<T> extends MapNetworkPublisher<T> implements MapNetworkPublisherFactory {
+
+    public MockMapNetworkPublisher() {
+        this(Collections.emptySet());
+    }
 
     public MockMapNetworkPublisher(Set<String> keys) {
         super(keys);
@@ -36,4 +40,9 @@ protected void publishNameChanged(Optional<String> oldName, String newName) {
     public void close() {
 
     }
+
+    @Override
+    public <T> MapNetworkPublisher<T> create(Set<String> keys) {
+        return new MockMapNetworkPublisher<>(keys);
+    }
 }

core/src/test/java/edu/wpi/grip/core/operations/network/ros/MockROSManager.java

@@ -0,0 +1,9 @@
+package edu.wpi.grip.core.operations.network.ros;
+
+public class MockROSManager implements ROSNetworkPublisherFactory {
+
+    @Override
+    public <C extends JavaToMessageConverter> ROSMessagePublisher create(C converter) {
+        return null;
+    }
+}

core/src/test/java/edu/wpi/grip/core/operations/network/ros/ROSPackageSanityTest.java

@@ -6,7 +6,7 @@
 public class ROSPackageSanityTest extends AbstractPackageSanityTests {
     public ROSPackageSanityTest() {
         super();
-        ignoreClasses(c -> c.equals(ROSLoader.class));
+        ignoreClasses(c -> c.equals(ROSLoader.class) || c.equals(MockROSManager.class));
         setDefault(JavaToMessageConverter.class, JavaToMessageConverter.BLOBS);
     }
 }

ui/src/main/java/edu/wpi/grip/ui/AboutDialogController.java

@@ -0,0 +1,31 @@
+package edu.wpi.grip.ui;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.input.MouseEvent;
+
+import javax.inject.Inject;
+
+public class AboutDialogController {
+
+    @Inject
+    private Main main;
+
+    @FXML
+    private Label versionNumberLabel;
+
+    @FXML
+    void mousePressedDocumentationButton(MouseEvent event) {
+        main.getHostServices().showDocument("http://wpilib.screenstepslive.com/s/4485/m/50711");
+    }
+
+    @FXML
+    void mousePressedGithubButton(MouseEvent event) {
+        main.getHostServices().showDocument("https://github.com/WPIRoboticsProjects/GRIP");
+    }
+
+    @FXML
+    void initialize() {
+        versionNumberLabel.setText("Version " + edu.wpi.grip.core.Main.class.getPackage().getImplementationVersion());
+    }
+}

ui/src/main/java/edu/wpi/grip/ui/MainWindowController.java

@@ -17,6 +17,7 @@
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.control.SplitPane;
@@ -26,6 +27,8 @@
 import javafx.scene.layout.Region;
 import javafx.stage.FileChooser;
 import javafx.stage.FileChooser.ExtensionFilter;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import org.controlsfx.control.StatusBar;
 
 import javax.inject.Inject;
@@ -49,6 +52,8 @@ public class MainWindowController {
     @FXML
     private Pane deployPane;
     @FXML
+    private Pane aboutPane;
+    @FXML
     private StatusBar statusBar;
     @Inject
     private EventBus eventBus;
@@ -65,6 +70,8 @@ public class MainWindowController {
     @Inject
     private Project project;
 
+    private Stage aboutDialogStage;
+
     public void initialize() {
         pipelineView.prefHeightProperty().bind(bottomPane.heightProperty());
         statusBar.getLeftItems().add(startStoppableButtonFactory.create(pipelineRunner));
@@ -209,6 +216,21 @@ public void showProjectSettingsEditor() {
         });
     }
 
+    @FXML
+    public void showProjectAboutDialog() throws IOException {
+        if (aboutDialogStage == null) {
+            aboutDialogStage = new Stage();
+            aboutDialogStage.setScene(new Scene(aboutPane));
+            aboutDialogStage.initStyle(StageStyle.UTILITY);
+            aboutDialogStage.focusedProperty().addListener((observable, oldvalue, newvalue) -> {
+                if (oldvalue) {
+                    aboutDialogStage.hide();
+                }
+            });
+        }
+        aboutDialogStage.show();
+    }
+
     @FXML
     public void quit() {
         if (showConfirmationDialogAndWait()) {