Fix Templated Operations not running (#593)

JLLeitschuh · JLLeitschuh · commit c49a7e0ae4fa · 2016-06-01T12:58:07.000-04:00
Closes #592
diff --git a/core/src/main/java/edu/wpi/grip/core/OperationMetaData.java b/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();
+    }
 }
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/CVOperations.java b/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;
@@ -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)
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/Operations.java b/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;
@@ -102,6 +103,11 @@ public class Operations {
         );
     }
 
+    @VisibleForTesting
+    ImmutableList<OperationMetaData> operations() {
+        return operations;
+    }
+
     public void addOperations() {
         operations.stream()
                 .map(OperationAddedEvent::new)
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/FiveSourceOneDestinationOperation.java b/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
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/FourSourceOneDestinationOperation.java b/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;
     }
 
 
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/OneSourceOneDestinationOperation.java b/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;
     }
 
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/SevenSourceOneDestinationOperation.java b/core/src/main/java/edu/wpi/grip/core/operations/templated/SevenSourceOneDestinationOperation.java
@@ -47,6 +47,7 @@ public interface Performer<T1, T2, T3, T4, T5, T6, T7, R> {
         this.input6 = inputSocketFactory.create(t6SocketHint);
         this.input7 = inputSocketFactory.create(t7SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
     @Override
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/SixSourceOneDestinationOperation.java b/core/src/main/java/edu/wpi/grip/core/operations/templated/SixSourceOneDestinationOperation.java
@@ -44,6 +44,7 @@ public interface Performer<T1, T2, T3, T4, T5, T6, R> {
         this.input5 = inputSocketFactory.create(t5SocketHint);
         this.input6 = inputSocketFactory.create(t6SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
 
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/TemplateFactory.java b/core/src/main/java/edu/wpi/grip/core/operations/templated/TemplateFactory.java
@@ -6,6 +6,7 @@
 import edu.wpi.grip.core.sockets.InputSocket;
 import edu.wpi.grip.core.sockets.OutputSocket;
 import edu.wpi.grip.core.sockets.SocketHint;
+import edu.wpi.grip.core.sockets.SocketHints;
 import org.bytedeco.javacpp.opencv_core.Mat;
 
 import java.util.function.Supplier;
@@ -17,6 +18,10 @@
 @Singleton
 @SuppressWarnings("PMD.GenericsNaming")
 public final class TemplateFactory {
+    /*
+     * Intentionally package private
+     */
+    static final String ASSERTION_MESSAGE = "Output must be present for this operation to complete correctly.";
     private final InputSocket.Factory isf;
     private final OutputSocket.Factory osf;
 
@@ -105,7 +110,7 @@ public Supplier<Operation> createAllMatTwoSource(
     }
 
     public Supplier<Operation> createAllMatTwoSource(TwoSourceOneDestinationOperation.Performer<Mat, Mat, Mat> performer) {
-        return createAllMatTwoSource(srcSocketHint(Mat.class, 1), srcSocketHint(Mat.class, 2), dstSocketHint(Mat.class), performer);
+        return createAllMatTwoSource(srcSocketHint(Mat.class, 1), srcSocketHint(Mat.class, 2), dstMatSocketHint(), performer);
     }
 
     public Supplier<Operation> createAllMatOneSource(
@@ -116,15 +121,15 @@ public Supplier<Operation> createAllMatOneSource(
     }
 
     public Supplier<Operation> createAllMatOneSource(OneSourceOneDestinationOperation.Performer<Mat, Mat> performer) {
-        return createAllMatOneSource(srcSocketHint(Mat.class, 1), dstSocketHint(Mat.class), performer);
+        return createAllMatOneSource(srcSocketHint(Mat.class, 1), dstMatSocketHint(), performer);
     }
 
 
     private <R> SocketHint<R> srcSocketHint(Class<R> srcType, int index) {
         return new SocketHint.Builder<>(srcType).identifier("src" + index).build();
     }
 
-    private <R> SocketHint<R> dstSocketHint(Class<R> returnType) {
-        return new SocketHint.Builder<>(returnType).identifier("dst").build();
+    private SocketHint<Mat> dstMatSocketHint() {
+        return SocketHints.Outputs.createMatSocketHint("dst");
     }
 }
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/ThreeSourceOneDestinationOperation.java b/core/src/main/java/edu/wpi/grip/core/operations/templated/ThreeSourceOneDestinationOperation.java
@@ -31,6 +31,7 @@ public interface Performer<T1, T2, T3, R> {
         this.input2 = inputSocketFactory.create(t2SocketHint);
         this.input3 = inputSocketFactory.create(t3SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
     @Override
diff --git a/core/src/main/java/edu/wpi/grip/core/operations/templated/TwoSourceOneDestinationOperation.java b/core/src/main/java/edu/wpi/grip/core/operations/templated/TwoSourceOneDestinationOperation.java
@@ -30,6 +30,7 @@ public interface Performer<T1, T2, R> {
         this.input1 = inputSocketFactory.create(t1SocketHint);
         this.input2 = inputSocketFactory.create(t2SocketHint);
         this.output = outputSocketFactory.create(rSocketHint);
+        assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;
     }
 
     @Override
diff --git a/core/src/test/java/edu/wpi/grip/core/operations/OperationsTest.java b/core/src/test/java/edu/wpi/grip/core/operations/OperationsTest.java
@@ -1,69 +1,55 @@
 package edu.wpi.grip.core.operations;
 
-import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 import edu.wpi.grip.core.OperationMetaData;
 import edu.wpi.grip.core.Step;
-import edu.wpi.grip.core.events.OperationAddedEvent;
 import edu.wpi.grip.core.util.MockExceptionWitness;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
 
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
-
-//import edu.wpi.grip.generated.CVOperations;
 
+@RunWith(Parameterized.class)
 public class OperationsTest {
-    private List<OperationMetaData> operationList;
-    private Optional<Throwable> throwableOptional;
-    private EventBus eventBus;
-
-    private class OperationGrabber {
-        @Subscribe
-        public void onOperationAddedEvent(OperationAddedEvent event) {
-            operationList.add(event.getOperation());
-        }
-    }
-
-
-    @Before
-    public void setUp() {
-        this.operationList = new ArrayList<>();
-        this.throwableOptional = Optional.empty();
-        this.eventBus = new EventBus((exception, context) -> throwableOptional = Optional.of(exception));
 
-        this.eventBus.register(new OperationGrabber());
+    @Parameter
+    public OperationMetaData operationMetaData;
+
+    @Parameters(name = "{index}: Operation({0})")
+    public static Collection<Object[]> data() {
+        EventBus eventBus = new EventBus();
+        List<OperationMetaData> operationMetaDatas =
+                ImmutableList.<OperationMetaData>builder()
+                        .addAll(
+                                OperationsFactory
+                                        .create(eventBus)
+                                        .operations())
+                        .addAll(
+                                OperationsFactory
+                                        .createCV(eventBus)
+                                        .operations())
+                        .build();
+
+        Object[][] params = new Object[operationMetaDatas.size()][1];
+        final int[] index = {0};
+        operationMetaDatas.forEach(operationMeta -> {
+            params[index[0]][0] = operationMeta;
+            index[0]++;
+        });
+        return Arrays.asList(params);
     }
 
-    @After
-    public void afterTest() {
-        if (throwableOptional.isPresent()) {
-            throw Throwables.propagate(throwableOptional.get());
-        }
-    }
-
-    @Test
-    public void testCreateAllCVSteps() {
-        OperationsFactory.createCV(eventBus).addOperations();
-        for (OperationMetaData operationMeta : operationList) {
-            final Step step =
-                    new Step.Factory((origin) -> new MockExceptionWitness(eventBus, origin)).create(operationMeta);
-            step.setRemoved();
-        }
-    }
 
     @Test
-    public void testCreateAllCoreSteps() {
-        OperationsFactory.create(eventBus)
-                .addOperations();
-        for (OperationMetaData operationMeta : operationList) {
-            final Step step =
-                    new Step.Factory((origin) -> new MockExceptionWitness(eventBus, origin)).create(operationMeta);
-            step.setRemoved();
-        }
+    public void testCreateAllSteps() {
+        final Step step =
+                new Step.Factory((origin) -> new MockExceptionWitness(new EventBus(), origin)).create(operationMetaData);
+        step.setRemoved();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public interface Performer<T1, T2, T3, T4, T5, R> {`
`34`	`34`	`this.input4 = inputSocketFactory.create(t4SocketHint);`
`35`	`35`	`this.input5 = inputSocketFactory.create(t5SocketHint);`
`36`	`36`	`this.output = outputSocketFactory.create(rSocketHint);`
	`37`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public interface Performer<T1, T2, T3, T4, R> {`
`32`	`32`	`this.input3 = inputSocketFactory.create(t3SocketHint);`
`33`	`33`	`this.input4 = inputSocketFactory.create(t4SocketHint);`
`34`	`34`	`this.output = outputSocketFactory.create(rSocketHint);`
	`35`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`35`	`36`	`}`
`36`	`37`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public interface Performer<T1, R> {`
`26`	`26`	`SocketHint<R> rSocketHint) {`
`27`	`27`	`this.input1 = inputSocketFactory.create(t1SocketHint);`
`28`	`28`	`this.output = outputSocketFactory.create(rSocketHint);`
	`29`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`29`	`30`	`this.performer = performer;`
`30`	`31`	`}`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public interface Performer<T1, T2, T3, T4, T5, T6, T7, R> {`
`47`	`47`	`this.input6 = inputSocketFactory.create(t6SocketHint);`
`48`	`48`	`this.input7 = inputSocketFactory.create(t7SocketHint);`
`49`	`49`	`this.output = outputSocketFactory.create(rSocketHint);`
	`50`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public interface Performer<T1, T2, T3, T4, T5, T6, R> {`
`44`	`44`	`this.input5 = inputSocketFactory.create(t5SocketHint);`
`45`	`45`	`this.input6 = inputSocketFactory.create(t6SocketHint);`
`46`	`46`	`this.output = outputSocketFactory.create(rSocketHint);`
	`47`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import edu.wpi.grip.core.sockets.InputSocket;`
`7`	`7`	`import edu.wpi.grip.core.sockets.OutputSocket;`
`8`	`8`	`import edu.wpi.grip.core.sockets.SocketHint;`
	`9`	`+import edu.wpi.grip.core.sockets.SocketHints;`
`9`	`10`	`import org.bytedeco.javacpp.opencv_core.Mat;`
`10`	`11`
`11`	`12`	`import java.util.function.Supplier;`
`@@ -17,6 +18,10 @@`
`17`	`18`	`@Singleton`
`18`	`19`	`@SuppressWarnings("PMD.GenericsNaming")`
`19`	`20`	`public final class TemplateFactory {`
	`21`	`+ /*`
	`22`	`+ * Intentionally package private`
	`23`	`+ */`
	`24`	`+ static final String ASSERTION_MESSAGE = "Output must be present for this operation to complete correctly.";`
`20`	`25`	`private final InputSocket.Factory isf;`
`21`	`26`	`private final OutputSocket.Factory osf;`
`22`	`27`
`@@ -105,7 +110,7 @@ public Supplier<Operation> createAllMatTwoSource(`
`105`	`110`	`}`
`106`	`111`
`107`	`112`	`public Supplier<Operation> createAllMatTwoSource(TwoSourceOneDestinationOperation.Performer<Mat, Mat, Mat> performer) {`
`108`		`- return createAllMatTwoSource(srcSocketHint(Mat.class, 1), srcSocketHint(Mat.class, 2), dstSocketHint(Mat.class), performer);`
	`113`	`+ return createAllMatTwoSource(srcSocketHint(Mat.class, 1), srcSocketHint(Mat.class, 2), dstMatSocketHint(), performer);`
`109`	`114`	`}`
`110`	`115`
`111`	`116`	`public Supplier<Operation> createAllMatOneSource(`
`@@ -116,15 +121,15 @@ public Supplier<Operation> createAllMatOneSource(`
`116`	`121`	`}`
`117`	`122`
`118`	`123`	`public Supplier<Operation> createAllMatOneSource(OneSourceOneDestinationOperation.Performer<Mat, Mat> performer) {`
`119`		`- return createAllMatOneSource(srcSocketHint(Mat.class, 1), dstSocketHint(Mat.class), performer);`
	`124`	`+ return createAllMatOneSource(srcSocketHint(Mat.class, 1), dstMatSocketHint(), performer);`
`120`	`125`	`}`
`121`	`126`
`122`	`127`
`123`	`128`	`private <R> SocketHint<R> srcSocketHint(Class<R> srcType, int index) {`
`124`	`129`	`return new SocketHint.Builder<>(srcType).identifier("src" + index).build();`
`125`	`130`	`}`
`126`	`131`
`127`		`- private <R> SocketHint<R> dstSocketHint(Class<R> returnType) {`
`128`		`- return new SocketHint.Builder<>(returnType).identifier("dst").build();`
	`132`	`+ private SocketHint<Mat> dstMatSocketHint() {`
	`133`	`+ return SocketHints.Outputs.createMatSocketHint("dst");`
`129`	`134`	`}`
`130`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public interface Performer<T1, T2, T3, R> {`
`31`	`31`	`this.input2 = inputSocketFactory.create(t2SocketHint);`
`32`	`32`	`this.input3 = inputSocketFactory.create(t3SocketHint);`
`33`	`33`	`this.output = outputSocketFactory.create(rSocketHint);`
	`34`	`+ assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`@Override`