Adds Tests to MultiImageFileSource

Author: JLLeitschuh

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

@@ -62,7 +62,7 @@ public MultiImageFileSource(){ /* no op */ }
     @SuppressWarnings("unchecked")
     private void initialize(final EventBus eventBus, final List<String> paths, int index) throws IOException {
         this.eventBus = checkNotNull(eventBus, "Event bus can not be null");
-        checkElementIndex(index, paths.size(), "File List Index");
+        this.index = checkElementIndex(index, paths.size(), "File List Index");
         this.paths = paths;
         this.outputSocket = new OutputSocket(eventBus, imageOutputHint);
         for (String path : paths) {

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

@@ -2,6 +2,8 @@
 
 import com.google.common.eventbus.EventBus;
 import edu.wpi.grip.core.OutputSocket;
+import edu.wpi.grip.util.Files;
+import edu.wpi.grip.util.ImageWithData;
 import org.bytedeco.javacpp.opencv_core.Mat;
 import org.junit.Before;
 import org.junit.Test;
@@ -17,30 +19,26 @@
  *
  */
 public class ImageFileSourceTest {
-    private File imageFile;
-    private File textFile;
+    private final ImageWithData imageFile = Files.imageFile;
+    private final File textFile = Files.textFile;
     private static EventBus eventBus;
 
     @Before
     public void setUp() throws URISyntaxException {
         this.eventBus = new EventBus();
-        textFile = new File(ImageFileSourceTest.class.getResource("/edu/wpi/grip/images/NotAnImage.txt").toURI());
-        imageFile = new File(ImageFileSourceTest.class.getResource("/edu/wpi/grip/images/GRIP_Logo.png").toURI());
     }
 
     @Test
     public void testLoadImageToMat() throws IOException {
         // Given above setup
         // When
-        final ImageFileSource fileSource = new ImageFileSource(eventBus, this.imageFile);
+        final ImageFileSource fileSource = new ImageFileSource(eventBus, this.imageFile.file);
         OutputSocket<Mat> outputSocket = fileSource.getOutputSockets()[0];
 
         // Then
-        assertNotNull("The output socket's value was null.", outputSocket.getValue());
+        assertTrue("The output socket's value was empty.", outputSocket.getValue().isPresent());
 
-        // Check that the image that is read in is 2 dimentional
-        assertEquals("Matrix from loaded image did not have expected number of rows.", 183, outputSocket.getValue().get().rows());
-        assertEquals("Matrix from loaded image did not have expected number of cols.", 480, outputSocket.getValue().get().cols());
+        imageFile.assertSameImage(outputSocket.getValue().get());
     }
 
     @Test(expected = IOException.class)

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

@@ -0,0 +1,66 @@
+package edu.wpi.grip.core.sources;
+
+import com.google.common.eventbus.EventBus;
+import edu.wpi.grip.core.OutputSocket;
+import edu.wpi.grip.util.Files;
+import edu.wpi.grip.util.ImageWithData;
+import org.bytedeco.javacpp.opencv_core.Mat;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Properties;
+
+
+public class MultiImageFileSourceTest {
+    private static final ImageWithData imageFile = Files.imageFile, gompeiJpegFile = Files.gompeiJpegFile;
+    private static final File textFile = Files.textFile;
+    private MultiImageFileSource source;
+    private MultiImageFileSource sourceWithIndexSet;
+
+    @Before
+    public void setUp() throws IOException {
+        source = new MultiImageFileSource(
+                new EventBus(),
+                Arrays.asList(imageFile.file, gompeiJpegFile.file));
+        sourceWithIndexSet = new MultiImageFileSource(
+                new EventBus(),
+                Arrays.asList(imageFile.file, gompeiJpegFile.file), 1);
+    }
+
+    @Test(expected = IOException.class)
+    public void createMultiImageFileSourceWithTextFile() throws IOException {
+        new MultiImageFileSource(new EventBus(), Arrays.asList(imageFile.file, gompeiJpegFile.file, textFile));
+    }
+
+    @Test
+    public void testNextValue() throws Exception {
+        source.nextValue();
+        OutputSocket<Mat> outputSocket = source.getOutputSockets()[0];
+        gompeiJpegFile.assertSameImage(outputSocket.getValue().get());
+    }
+
+    @Test
+    public void testPreviousValue() throws Exception {
+        source.previousValue();
+        OutputSocket<Mat> outputSocket = source.getOutputSockets()[0];
+        gompeiJpegFile.assertSameImage(outputSocket.getValue().get());
+    }
+
+    @Test
+    public void testConstructedWithIndex() {
+        OutputSocket<Mat> outputSocket = sourceWithIndexSet.getOutputSockets()[0];
+        gompeiJpegFile.assertSameImage(outputSocket.getValue().get());
+    }
+
+    @Test
+    public void testLoadFromProperties() throws Exception {
+        final Properties properties = sourceWithIndexSet.getProperties();
+        final MultiImageFileSource newSource = new MultiImageFileSource();
+        newSource.createFromProperties(new EventBus(), properties);
+        OutputSocket<Mat> outputSocket = newSource.getOutputSockets()[0];
+        gompeiJpegFile.assertSameImage(outputSocket.getValue().get());
+    }
+}

core/src/test/java/edu/wpi/grip/util/Files.java

@@ -0,0 +1,23 @@
+package edu.wpi.grip.util;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+/**
+ * Utility class for files that may be used in tests
+ */
+public class Files {
+    public static final ImageWithData imageFile, gompeiJpegFile;
+    public static final File textFile;
+    static {
+        try {
+            textFile = new File(Files.class.getResource("/edu/wpi/grip/images/NotAnImage.txt").toURI());
+            imageFile = new ImageWithData(new File(
+                    Files.class.getResource("/edu/wpi/grip/images/GRIP_Logo.png").toURI()), 183, 480);
+            gompeiJpegFile = new ImageWithData(new File(
+                    Files.class.getResource("/edu/wpi/grip/images/gompei.jpeg").toURI()), 220, 225);
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Could not load file from system", e);
+        }
+    }
+}

core/src/test/java/edu/wpi/grip/util/ImageWithData.java

@@ -0,0 +1,27 @@
+package edu.wpi.grip.util;
+
+
+import org.bytedeco.javacpp.opencv_core.Mat;
+
+import java.io.File;
+
+import static org.junit.Assert.assertEquals;
+
+public class ImageWithData {
+    private final int rows;
+    private final int cols;
+    public final File file;
+
+    protected ImageWithData(File file, int rows, int cols) {
+        this.file = file;
+        this.rows = rows;
+        this.cols = cols;
+    }
+
+    public void assertSameImage(final Mat image) {
+        // Check that the image that is read in is 2 dimensional
+        assertEquals("Matrix from loaded image did not have expected number of rows.", this.rows , image.rows());
+        assertEquals("Matrix from loaded image did not have expected number of cols.", this.cols, image.cols());
+    }
+
+}