Merge remote-tracking branch 'origin/master' into image-snapshots

Author: AustinShalit

.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 {
@@ -168,12 +172,12 @@ project(":core") {
     repositories {
         flatDir {
             dirs 'libs'
-            maven {
-                url = "http://first.wpi.edu/FRC/roborio/maven/development"
-            }
-            maven {
-                url = "https://github.com/WPIRoboticsProjects/rosjava_mvn_repo/raw/master"
-            }
+        }
+        maven {
+            url = "http://first.wpi.edu/FRC/roborio/maven/development"
+        }
+        maven {
+            url = "https://github.com/WPIRoboticsProjects/rosjava_mvn_repo/raw/master"
         }
     }
 

core/src/main/java/edu/wpi/grip/core/OperationMetaData.java

@@ -1,5 +1,7 @@
 package edu.wpi.grip.core;
 
+import com.google.common.base.MoreObjects;
+
 import javax.annotation.concurrent.Immutable;
 import java.util.function.Supplier;
 
@@ -38,4 +40,12 @@ public OperationDescription getDescription() {
     public Supplier<Operation> getOperationSupplier() {
         return operationSupplier;
     }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(OperationMetaData.class)
+                .add("description", description)
+                .add("operationSupplier", operationSupplier)
+                .toString();
+    }
 }

core/src/main/java/edu/wpi/grip/core/operations/CVOperations.java

@@ -1,6 +1,7 @@
 package edu.wpi.grip.core.operations;
 
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Inject;
@@ -60,7 +61,7 @@ public class CVOperations {
                         templateFactory.createAllMatTwoSource(opencv_core::bitwise_and)),
 
                 new OperationMetaData(CVOperation.defaults("CV bitwise_not", "Calculate per-element bit-wise inversion of an image."),
-                        templateFactory.createAllMatTwoSource(opencv_core::bitwise_not)),
+                        templateFactory.createAllMatOneSource(opencv_core::bitwise_not)),
 
                 new OperationMetaData(CVOperation.defaults("CV bitwise_or", "Calculate the per-element bit-wise disjunction of two images."),
                         templateFactory.createAllMatTwoSource(opencv_core::bitwise_or)),
@@ -203,7 +204,7 @@ public class CVOperations {
                                 new SocketHint.Builder<>(Scalar.class).identifier("borderValue").initialValueSupplier(opencv_imgproc::morphologyDefaultBorderValue).build(),
                                 SocketHints.Outputs.createMatSocketHint("dst"),
                                 (src, kernel, anchor, iterations, borderType, borderValue, dst) -> {
-                                    opencv_imgproc.dilate(src, kernel, dst, anchor, iterations.intValue(), borderType.value, borderValue);
+                                    opencv_imgproc.dilate(src, dst, kernel, anchor, iterations.intValue(), borderType.value, borderValue);
                                 }
                         )),
 
@@ -217,7 +218,7 @@ public class CVOperations {
                                 new SocketHint.Builder<>(Scalar.class).identifier("borderValue").initialValueSupplier(opencv_imgproc::morphologyDefaultBorderValue).build(),
                                 SocketHints.Outputs.createMatSocketHint("dst"),
                                 (src, kernel, anchor, iterations, borderType, borderValue, dst) -> {
-                                    opencv_imgproc.erode(src, kernel, dst, anchor, iterations.intValue(), borderType.value, borderValue);
+                                    opencv_imgproc.erode(src, dst, kernel, anchor, iterations.intValue(), borderType.value, borderValue);
                                 }
                         )),
 
@@ -277,7 +278,7 @@ public class CVOperations {
                         templateFactory.create(
                                 SocketHints.Inputs.createMatSocketHint("src", false),
                                 new SocketHint.Builder<>(Size.class).identifier("dsize").initialValueSupplier(() -> new Size(0, 0)).build(),
-                                SocketHints.Inputs.createNumberSpinnerSocketHint("fx", .25), SocketHints.Inputs.createNumberSpinnerSocketHint("fx", .25),
+                                SocketHints.Inputs.createNumberSpinnerSocketHint("fx", .25), SocketHints.Inputs.createNumberSpinnerSocketHint("fy", .25),
                                 SocketHints.createEnumSocketHint("interpolation", InterpolationFlagsEnum.INTER_LINEAR),
                                 SocketHints.Outputs.createMatSocketHint("dst"),
                                 (src, dsize, fx, fy, interpolation, dst) -> {
@@ -314,6 +315,14 @@ public class CVOperations {
         );
     }
 
+    /**
+     * All of the operations that this list supplies
+     */
+    @VisibleForTesting
+    ImmutableList<OperationMetaData> operations() {
+        return ImmutableList.<OperationMetaData>builder().addAll(coreOperations).addAll(imgprocOperation).build();
+    }
+
     public void addOperations() {
         coreOperations.stream()
                 .map(OperationAddedEvent::new)

core/src/main/java/edu/wpi/grip/core/operations/Operations.java

@@ -1,5 +1,6 @@
 package edu.wpi.grip.core.operations;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Inject;
@@ -106,6 +107,11 @@ public class Operations {
         );
     }
 
+    @VisibleForTesting
+    ImmutableList<OperationMetaData> operations() {
+        return operations;
+    }
+
     public void addOperations() {
         operations.stream()
                 .map(OperationAddedEvent::new)

core/src/main/java/edu/wpi/grip/core/operations/templated/FiveSourceOneDestinationOperation.java

@@ -34,6 +34,7 @@ public interface Performer<T1, T2, T3, T4, T5, R> {
         this.input4 = inputSocketFactory.create(t4SocketHint);
         this.input5 = inputSocketFactory.create(t5SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
     @Override

core/src/main/java/edu/wpi/grip/core/operations/templated/FourSourceOneDestinationOperation.java

@@ -32,6 +32,7 @@ public interface Performer<T1, T2, T3, T4, R> {
         this.input3 = inputSocketFactory.create(t3SocketHint);
         this.input4 = inputSocketFactory.create(t4SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
 

core/src/main/java/edu/wpi/grip/core/operations/templated/OneSourceOneDestinationOperation.java

@@ -26,6 +26,7 @@ public interface Performer<T1, R> {
                                      SocketHint<R> rSocketHint) {
         this.input1 = inputSocketFactory.create(t1SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
         this.performer = performer;
     }