Fix NullPointerException in tests

Author: MstrPikachu

src/test/java/org/hydev/mcpm/client/database/MockInstaller.java

@@ -1,6 +1,5 @@
 package org.hydev.mcpm.client.database;
 
-import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.database.tracker.PluginTracker;
 import org.hydev.mcpm.client.installer.InstallBoundary;
 import org.hydev.mcpm.client.installer.input.InstallInput;
@@ -20,7 +19,7 @@
 public class MockInstaller implements InstallBoundary {
     private final List<PluginModel> plugins;
     private final PluginTracker tracker;
-    private final boolean defaultResult;
+    private final InstallResult.Type defaultResult;
     private final Set<String> requested = new HashSet<>();
 
     /**
@@ -30,7 +29,7 @@ public class MockInstaller implements InstallBoundary {
      * @param tracker A plugin tracker to query whether a plugin is installed.
      */
     public MockInstaller(List<PluginModel> plugins, PluginTracker tracker) {
-        this(plugins, tracker, true);
+        this(plugins, tracker, InstallResult.Type.SUCCESS_INSTALLED);
     }
 
     /**
@@ -40,36 +39,35 @@ public MockInstaller(List<PluginModel> plugins, PluginTracker tracker) {
      * @param tracker A plugin tracker to query whether a plugin is installed.
      * @param defaultResult Determines what the installer should return when installPlugin is invoked.
      */
-    public MockInstaller(List<PluginModel> plugins, PluginTracker tracker, boolean defaultResult) {
+    public MockInstaller(List<PluginModel> plugins, PluginTracker tracker, InstallResult.Type defaultResult) {
         this.plugins = plugins;
         this.tracker = tracker;
         this.defaultResult = defaultResult;
     }
 
     @Override
-    // TODO InstallPlugin
     public List<InstallResult> installPlugin(InstallInput installInput) {
-        //        Assertions.assertEquals(installInput.type(), SearchPackagesType.BY_NAME);
-        //
-        //        if (tracker.findIfInLockByName(installInput.name()))
-        //            return false;
-        //
-        //        var model = plugins.stream()
-        //            .filter(plugin -> plugin.getLatestPluginVersion()
-        //                .map(x -> x.meta() != null && installInput.name().equals(x.meta().name()))
-        //                .orElse(false)
-        //            ).findFirst();
-        //
-        //        var modelId = model.map(PluginModel::id).orElse(0L);
-        //        var versionId = model.map(x -> x.getLatestPluginVersion()
-        //            .map(PluginVersion::id).orElse(0L)
-        //        ).orElse(0L);
-        //
-        //        requested.add(installInput.name());
-        //        tracker.addEntry(installInput.name(), true, versionId, modelId);
-        //
-        //        return defaultResult;
-        return null;
+        Assertions.assertEquals(installInput.type(), SearchPackagesType.BY_NAME);
+        var name = installInput.name();
+
+        if (tracker.findIfInLockByName(installInput.name()))
+            return List.of(new InstallResult(InstallResult.Type.PLUGIN_EXISTS, name));
+
+        var model = plugins.stream()
+            .filter(plugin -> plugin.getLatestPluginVersion()
+                .map(x -> x.meta() != null && installInput.name().equals(x.meta().name()))
+                .orElse(false)
+            ).findFirst();
+
+        var modelId = model.map(PluginModel::id).orElse(0L);
+        var versionId = model.map(x -> x.getLatestPluginVersion()
+            .map(PluginVersion::id).orElse(0L)
+        ).orElse(0L);
+
+        requested.add(installInput.name());
+        tracker.addEntry(installInput.name(), true, versionId, modelId);
+
+        return List.of(new InstallResult(defaultResult, name));
     }
 
     /**

src/test/java/org/hydev/mcpm/client/database/UpdateInteractorTest.java

@@ -3,8 +3,10 @@
 import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
 import org.hydev.mcpm.client.database.fetcher.ConstantFetcher;
 import org.hydev.mcpm.client.database.fetcher.QuietFetcherListener;
+import org.hydev.mcpm.client.installer.output.InstallResult;
 import org.hydev.mcpm.client.matcher.MatchPluginsInteractor;
 import org.hydev.mcpm.client.models.PluginModel;
+import org.hydev.mcpm.client.search.SearchInteractor;
 import org.hydev.mcpm.client.updater.CheckForUpdatesInteractor;
 import org.hydev.mcpm.client.updater.UpdateBoundary;
 import org.hydev.mcpm.client.updater.UpdateInput;
@@ -18,10 +20,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Test methods related to the Update plugins use case.
@@ -37,7 +36,7 @@ private record MockPackage(
     ) { }
 
     /**
-     * Create an interactor with provided paramters.
+     * Create an interactor with provided parameters.
      *
      * @param plugins A repository of all plugins. Will be passed to database unless emptyDatabase is true.
      * @param installedVersions Maps from plugin id to versions of plugins that are "installed" in the mock tracker.
@@ -67,8 +66,12 @@ private static MockPackage interactor(
             .map(version -> version.get().meta())
             .toList();
 
+        var defaultResult = installerSucceeds
+                ? InstallResult.Type.SUCCESS_INSTALLED
+                : InstallResult.Type.SEARCH_FAILED_TO_FETCH_DATABASE;
+
         var tracker = new MockPluginTracker(installed);
-        var installer = new MockInstaller(plugins, tracker, installerSucceeds);
+        var installer = new MockInstaller(plugins, tracker, defaultResult);
 
         var interactor = new UpdateInteractor(checker, installer, tracker);
 
@@ -306,6 +309,7 @@ void testAllMixed() {
         var mock = oneOldInteractor();
 
         var input = new UpdateInput(List.of(), false, false);
+        //assertNotNull(mock.updator);
         var result = mock.updator.update(input);
 
         assertEquals(result.state(), UpdateResult.State.SUCCESS);