Fix failing tests

Author: AustinShalit

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

@@ -105,8 +105,6 @@ public <I> void hear(TypeLiteral<I> type, TypeEncounter<I> encounter) {
 
         bind(EventBus.class).toInstance(eventBus);
 
-        bind(FileManager.class).to(GripFileManager.class);
-
         // Allow for just injecting the settings provider, instead of the whole pipeline
         bind(SettingsProvider.class).to(Pipeline.class);
 

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

@@ -8,25 +8,30 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 @Singleton
 public class GripFileManager implements FileManager {
 
     private static final Logger logger = Logger.getLogger(GripFileManager.class.getName());
 
-    private final File gripDirectory;
-    private final File imageDirectory;
+    private static final File gripDirectory = new File(System.getProperty("user.home") + File.separator + "GRIP");
+    private static final File imageDirectory = new File(gripDirectory, "images");
 
     public GripFileManager() {
-        gripDirectory = new File(System.getProperty("user.home") + File.separator + "GRIP");
-        imageDirectory = new File(gripDirectory, "images");
+        gripDirectory.mkdirs();
+        imageDirectory.mkdirs();
     }
 
     @Override
     public void saveImage(byte[] image, String fileName) {
+        checkNotNull(image);
+        checkNotNull(fileName);
+
         File file = new File(imageDirectory, fileName);
         Runnable runnable = () -> {
             try {
-                imageDirectory.mkdirs();
+                imageDirectory.mkdirs(); // If the user deletes the directory
                 Files.write(image, file);
             } catch (IOException ex) {
                 logger.log(Level.WARNING, ex.getMessage(), ex);

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

@@ -0,0 +1,10 @@
+package edu.wpi.grip.core;
+
+import com.google.inject.AbstractModule;
+
+public class GripFileModule extends AbstractModule {
+    @Override
+    protected void configure() {
+        bind(FileManager.class).to(GripFileManager.class);
+    }
+}

core/src/test/java/edu/wpi/grip/core/operations/OperationsFactory.java

@@ -2,6 +2,7 @@
 
 
 import com.google.common.eventbus.EventBus;
+import edu.wpi.grip.core.FileManager;
 import edu.wpi.grip.core.operations.network.MapNetworkPublisherFactory;
 import edu.wpi.grip.core.operations.network.MockMapNetworkPublisher;
 import edu.wpi.grip.core.operations.network.ros.JavaToMessageConverter;
@@ -11,6 +12,7 @@
 import edu.wpi.grip.core.sockets.MockInputSocketFactory;
 import edu.wpi.grip.core.sockets.MockOutputSocketFactory;
 import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.util.MockFileManager;
 
 import java.util.Optional;
 
@@ -38,17 +40,16 @@ public void close() {
     }
 
     public static Operations create(EventBus eventBus) {
-
-        return create(eventBus, MockMapNetworkPublisher::new, MockROSMessagePublisher::new,
-                new MockInputSocketFactory(eventBus), new MockOutputSocketFactory(eventBus));
+        return create(eventBus, MockMapNetworkPublisher::new, MockROSMessagePublisher::new, new MockFileManager(), new MockInputSocketFactory(eventBus), new MockOutputSocketFactory(eventBus));
     }
 
     public static Operations create(EventBus eventBus,
                                     MapNetworkPublisherFactory mapFactory,
                                     ROSNetworkPublisherFactory rosFactory,
+                                    FileManager fileManager,
                                     InputSocket.Factory isf,
                                     OutputSocket.Factory osf) {
-        return new Operations(eventBus, mapFactory, rosFactory, isf, osf);
+        return new Operations(eventBus, mapFactory, rosFactory, fileManager, isf, osf);
     }
 
     public static CVOperations createCV(EventBus eventBus) {

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

@@ -5,6 +5,6 @@
 public class MockFileManager implements FileManager {
     @Override
     public void saveImage(byte[] image, String fileName) {
-
+        // No body here because this is for testing only.
     }
 }

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

@@ -15,6 +15,7 @@
 import edu.wpi.grip.core.operations.network.GRIPNetworkModule;
 import edu.wpi.grip.core.serialization.Project;
 import edu.wpi.grip.core.sources.GRIPSourcesHardwareModule;
+import edu.wpi.grip.core.GripFileModule;
 import edu.wpi.grip.core.util.SafeShutdown;
 import edu.wpi.grip.ui.util.DPIUtility;
 import javafx.application.Application;
@@ -63,13 +64,13 @@ public void start(Stage stage) throws Exception {
 
         if (parameters.contains("--headless")) {
             // If --headless was specified on the command line, run in headless mode (only use the core module)
-            injector = Guice.createInjector(new GRIPCoreModule(), new GRIPNetworkModule(), new GRIPSourcesHardwareModule());
+            injector = Guice.createInjector(new GRIPCoreModule(), new GripFileModule(), new GRIPNetworkModule(), new GRIPSourcesHardwareModule());
             injector.injectMembers(this);
 
             parameters.remove("--headless");
         } else {
             // Otherwise, run with both the core and UI modules, and show the JavaFX stage
-            injector = Guice.createInjector(Modules.override(new GRIPCoreModule(), new GRIPNetworkModule(), new GRIPSourcesHardwareModule()).with(new GRIPUIModule()));
+            injector = Guice.createInjector(Modules.override(new GRIPCoreModule(), new GripFileModule(), new GRIPNetworkModule(), new GRIPSourcesHardwareModule()).with(new GRIPUIModule()));
             injector.injectMembers(this);
 
             root = FXMLLoader.load(Main.class.getResource("MainWindow.fxml"), null, null, injector::getInstance);