Add update tests

Author: 1whatleytay

src/main/java/org/hydev/mcpm/client/DatabaseManager.java

@@ -44,6 +44,10 @@ public SearchPackagesResult getSearchResult(InstallInput input) {
      * @param pluginName The version of the installed plugin
      * */
     public boolean checkPluginInstalledByName(String pluginName) {
+        if (!localPluginTracker.findIfInLockByName(pluginName)) {
+            return false;
+        }
+
         List<PluginYml> pluginInstalled = localPluginTracker.listInstalled();
         for (PluginYml pluginYml : pluginInstalled) {
             if (pluginYml != null && pluginYml.name() != null && pluginYml.name().equals(pluginName)) {
@@ -65,7 +69,8 @@ public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
         for (PluginYml pluginYml : pluginInstalled) {
             if (pluginYml != null && pluginYml.version() != null &&
                     pluginYml.version().equals(version)) {
-                return true;
+                // Yes, if it is not in the plugin tracker lock file, we ignore.
+                return localPluginTracker.findIfInLockByName(pluginYml.name());
             }
         }
         return false;

src/main/java/org/hydev/mcpm/client/updater/UpdateInteractor.java

@@ -1,9 +1,9 @@
 package org.hydev.mcpm.client.updater;
 
 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;
-import org.hydev.mcpm.client.local.LocalPluginTracker;
 import org.hydev.mcpm.client.matcher.PluginModelId;
 import org.hydev.mcpm.client.matcher.PluginVersionId;
 import org.hydev.mcpm.client.matcher.PluginVersionState;
@@ -30,7 +30,7 @@
 public record UpdateInteractor(
         CheckForUpdatesBoundary checkBoundary,
         InstallBoundary installer,
-        LocalPluginTracker pluginTracker
+        PluginTracker pluginTracker
 ) implements UpdateBoundary {
     @Nullable
     private PluginVersionState stateByName(Map<String, PluginYml> installed, String name) {
@@ -52,7 +52,7 @@ private Map<String, PluginVersionState> stateMapByNames(List<String> names) {
             .collect(Pair.toMap());
 
         return names.stream()
-            .map(name -> new Pair<>(name, stateByName(installed, name)))
+            .map(name -> Pair.of(name, stateByName(installed, name)))
             .filter(pair -> pair.getValue() != null)
             .collect(Collectors.toMap(Pair::getKey, Pair::getValue));
     }
@@ -101,7 +101,7 @@ private UpdateOutcome makeOutcome(@Nullable PluginVersionState state, CheckForUp
                                       InstallResultPresenter installResultPresenter) {
         // E.g. was filtered in stateMapByNames since there was no associated version.
         if (state == null) {
-            defaultOutcomeFor(null, NOT_INSTALLED);
+            return defaultOutcomeFor(null, NOT_INSTALLED);
         }
 
         if (result.mismatched().contains(state)) {

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

@@ -47,9 +47,9 @@ public static void setup() {
 
         smallInteractor = interactor(List.of(
             PluginMockFactory.model(1),
-            PluginMockFactory.model(2, "name", null, List.of("ver.1", "ver.2"), null),
-            PluginMockFactory.model(3, "test", null, List.of("update", "update update"), null),
-            PluginMockFactory.model(4, "test", null, List.of("1.0", "2.0", "3.0"), null)
+            PluginMockFactory.model(2, "name", List.of("ver.1", "ver.2")),
+            PluginMockFactory.model(3, "test", List.of("update", "update update")),
+            PluginMockFactory.model(4, "test", List.of("1.0", "2.0", "3.0"))
         ));
     }
 

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

@@ -0,0 +1,59 @@
+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;
+import org.hydev.mcpm.client.models.PluginModel;
+import org.hydev.mcpm.client.models.PluginVersion;
+import org.hydev.mcpm.client.search.SearchPackagesType;
+import org.junit.jupiter.api.Assertions;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class MockInstaller implements InstallBoundary {
+    private final List<PluginModel> plugins;
+    private final PluginTracker tracker;
+    private final boolean defaultResult;
+    private final Set<String> requested = new HashSet<>();
+
+    public MockInstaller(List<PluginModel> plugins, PluginTracker tracker) {
+        this(plugins, tracker, true);
+    }
+
+    public MockInstaller(List<PluginModel> plugins, PluginTracker tracker, boolean defaultResult) {
+        this.plugins = plugins;
+        this.tracker = tracker;
+        this.defaultResult = defaultResult;
+    }
+
+    @Override
+    public boolean installPlugin(InstallInput installInput, InstallResultPresenter resultPresenter) {
+        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;
+    }
+
+    Set<String> getRequested() {
+        return new HashSet<>(requested);
+    }
+}

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

@@ -0,0 +1,86 @@
+package org.hydev.mcpm.client.database;
+
+import org.hydev.mcpm.client.database.tracker.PluginTracker;
+import org.hydev.mcpm.client.models.PluginTrackerModel;
+import org.hydev.mcpm.client.models.PluginYml;
+import org.hydev.mcpm.utils.Pair;
+
+import java.util.List;
+import java.util.Map;
+
+public record MockPluginTracker(
+    Map<String, Boolean> entries,
+    List<PluginYml> installed
+) implements PluginTracker {
+    private static Map<String, Boolean> makeEntries(List<PluginYml> installed) {
+        return installed.stream()
+            .map(x -> Pair.of(x.name(), true))
+            .collect(Pair.<String, Boolean>toMap());
+    }
+
+    public MockPluginTracker(List<PluginYml> installed) {
+        this(makeEntries(installed), installed);
+    }
+
+
+    @Override
+    public void addEntry(String name, boolean status, long versionId, long pluginId) {
+        entries.put(name, status);
+    }
+
+    @Override
+    public void removeEntry(String name) {
+        entries.remove(name);
+    }
+
+    @Override
+    public List<PluginTrackerModel> listEntries() {
+        return null;
+    }
+
+    @Override
+    public List<PluginYml> listInstalled() {
+        return installed;
+    }
+
+    @Override
+    public void setManuallyInstalled(String name) {
+        if (!entries.containsKey(name)) {
+            return;
+        }
+
+        entries.put(name, true);
+    }
+
+    @Override
+    public void removeManuallyInstalled(String name) {
+        if (!entries.containsKey(name)) {
+            return;
+        }
+
+        entries.put(name, false);
+    }
+
+    @Override
+    public Boolean findIfInLockById(String id) {
+        return null;
+    }
+
+    @Override
+    public List<String> listManuallyInstalled() {
+        return entries().entrySet().stream()
+            .filter(Map.Entry::getValue)
+            .map(Map.Entry::getKey)
+            .toList();
+    }
+
+    @Override
+    public List<PluginYml> listOrphanPlugins(boolean considerSoftDependencies) {
+        return List.of();
+    }
+
+    @Override
+    public Boolean findIfInLockByName(String name) {
+        return entries.containsKey(name);
+    }
+}

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

@@ -67,6 +67,18 @@ public static PluginYml meta(String name, String version, String description,
         );
     }
 
+    /**
+     * Creates a mock PluginYml object.
+     *
+     * @param name The name of the plugin.
+     * @param version The version string for the plugin.
+     * @param description The description for the plugin.
+     * @return A PluginYml object.
+     */
+    public static PluginYml meta(String name, String version, String description) {
+        return meta(name, version, description, null);
+    }
+
     /**
      * Creates a mock PluginVersion object.
      *
@@ -76,7 +88,7 @@ public static PluginYml meta(String name, String version, String description,
      * @return A PluginVersion object.
      */
     public static PluginVersion version(long id, String name, String string) {
-        return new PluginVersion(id, 0, "", meta(name, string, null, null));
+        return version(id, name, string, name, null);
     }
 
     /**
@@ -89,8 +101,10 @@ public static PluginVersion version(long id, String name, String string) {
      * @param commands The commands in the plugin.
      * @return A PluginVersion object.
      */
-    public static PluginVersion version(long id, String name, String string, String description,
-                                        Map<String, PluginCommand> commands) {
+    public static PluginVersion version(
+        long id, String name, String string, String description,
+        Map<String, PluginCommand> commands
+    ) {
         return new PluginVersion(id, 0, "", meta(name, string, description, commands));
     }
 
@@ -120,6 +134,20 @@ public static PluginModel model(long id, String name) {
         );
     }
 
+    /**
+     * Creates a mock PluginModel object.
+     * The first version in versionNames will have id 0, the next will have id 1, and so on...
+     * Commands are defaulted to null.
+     *
+     * @param id The plugin id.
+     * @param name The plugin name.
+     * @param versionNames The individual version strings for each version.
+     * @return A PluginModel object.
+     */
+    public static PluginModel model(long id, String name, List<String> versionNames) {
+        return model(id, name, name, versionNames, null);
+    }
+
     /**
      * Creates a mock PluginModel object.
      * The first version in versionNames will have id 0, the next will have id 1, and so on...

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

@@ -0,0 +1,11 @@
+package org.hydev.mcpm.client.database;
+
+import org.hydev.mcpm.client.commands.presenters.InstallResultPresenter;
+import org.hydev.mcpm.client.installer.InstallResult;
+
+public class SilentInstallPresenter implements InstallResultPresenter {
+    @Override
+    public void displayResult(InstallResult installResult, String name) {
+        /* do nothing */
+    }
+}