[PR] Merge pull request #66 from CSC207-2022F-UofT/feat-more-tests

[+] More tests

Author: hykilpikonna

build.gradle

@@ -47,6 +47,7 @@ checkstyle {
 dependencies {
     // The Spigot API with no shadowing. Requires the OSS repo.
     compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
+    testImplementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
 
     // Argument parser
     // https://mvnrepository.com/artifact/net.sourceforge.argparse4j/argparse4j

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

@@ -9,15 +9,13 @@
 
 import java.io.*;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.net.URL;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 import static java.lang.String.format;
 
@@ -140,18 +138,20 @@ public Downloader threads(int threads)
     /**
      * Displays a demo for downloader.
      *
-     * @param args Arguments are ignored.
+     * @param args Not used
      */
-    public static void main(String[] args) throws IOException {
-        // Remember to chang link to test
-        String link = "https://sd.blackball.lv/library/Introduction_to_Algorithms_Third_Edition_(2009).pdf";
-        File out = new File("./Introduction_to_Algorithms_Third_Edition.pdf");
-        String link1 = "https://www.iusb.edu/students/academic-success-programs/academic-centers-for-excellence/docs/Basic%20Math%20Review%20Card.pdf";
-        File out1 = new File("./Math.pdf");
-        Downloader downloader = new Downloader();
+    public static void main(String[] args)
+    {
+        String link = "https://mcpm.hydev.org/db";
+        File out = new File("./build/db.json");
+        String link1 = "https://mcpm.hydev.org/db.zst";
+        File out1 = new File("./build/db.zst");
+        Downloader downloader = new Downloader().showProgress(true).threads(2);
         Map<String, File> urls = new HashMap<>();
         urls.put(link, out);
         urls.put(link1, out1);
         downloader.downloadFiles(urls);
+        out.delete();
+        out1.delete();
     }
 }

src/main/java/org/hydev/mcpm/client/database/fetcher/LocalDatabaseFetcher.java

@@ -18,7 +18,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.NoSuchAlgorithmException;
 
 import static org.hydev.mcpm.Constants.JACKSON;
 
@@ -177,17 +176,13 @@ private Database fetchHostDatabase(DatabaseFetcherListener listener) {
             if (database != null) {
                 localDatabase = database;
 
-                try {
-                    var hash = new HashUtils().hash(body);
+                var hash = new HashUtils().hash(body);
 
-                    //noinspection ResultOfMethodCallIgnored
-                    cacheDirectory.toFile().mkdirs();
+                //noinspection ResultOfMethodCallIgnored
+                cacheDirectory.toFile().mkdirs();
 
-                    Files.writeString(Paths.get(cacheDirectory.toString(), DATABASE_FILE_NAME), body);
-                    Files.writeString(Paths.get(cacheDirectory.toString(), HASH_FILE_NAME), hash);
-                } catch (NoSuchAlgorithmException e) {
-                    e.printStackTrace();
-                }
+                Files.writeString(Paths.get(cacheDirectory.toString(), DATABASE_FILE_NAME), body);
+                Files.writeString(Paths.get(cacheDirectory.toString(), HASH_FILE_NAME), hash);
             }
 
             return database;

src/main/java/org/hydev/mcpm/client/interaction/Commands.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.dataformat.yaml.JacksonYAMLParseException;
 import org.jetbrains.annotations.NotNull;
 import org.yaml.snakeyaml.error.MarkedYAMLException;
 
@@ -49,8 +50,7 @@ public static class InvalidPluginMetaStructure extends Exception { }
      * @param yml YML string
      * @return PluginYml object
      */
-    public static PluginYml fromYml(String yml)
-        throws MarkedYAMLException, InvalidPluginMetaStructure, JsonProcessingException {
+    public static PluginYml fromYml(String yml) throws InvalidPluginMetaStructure, JsonProcessingException {
         // The YAML parser doesn't like \t tab characters
         yml = yml.replace("\t", "    ");
 

src/main/java/org/hydev/mcpm/client/models/PluginYml.java

@@ -14,7 +14,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -64,7 +63,7 @@ public static void writeDatabase(File crawlerDirectory,
                     var hash = new HashUtils().hash(databaseFile);
 
                     Files.writeString(versionFile.toPath(), hash);
-                } catch (NoSuchAlgorithmException | IOException e) {
+                } catch (IOException e) {
                     System.err.println("Failed to write database hash file.");
                 }
             }
@@ -168,7 +167,7 @@ private static Optional<PluginVersion> createPluginVersion(long pluginId, File v
             System.err.printf("Cannot read plugin.yml for %s: %s\n", metaFile.toPath(), e);
 
             return Optional.empty();
-        } catch (NumberFormatException | NoSuchAlgorithmException | IOException e) {
+        } catch (NumberFormatException | IOException e) {
             e.printStackTrace();
 
             return Optional.empty();

src/main/java/org/hydev/mcpm/server/crawlers/spiget/CreateDatabase.java

@@ -1,15 +1,8 @@
 package org.hydev.mcpm.utils;
 
 import org.apache.hc.client5.http.utils.Hex;
-import org.jetbrains.annotations.Nullable;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -24,11 +17,15 @@ public class HashUtils {
 
     /**
      * Default constructor uses the SHA-256 algorithm.
-     *
-     * @throws NoSuchAlgorithmException Thrown in the case that the algorithm doesn't ship with an implementation.
      */
-    public HashUtils() throws NoSuchAlgorithmException {
-        this(defaultAlgorithm);
+    public HashUtils() {
+        try {
+            digest = MessageDigest.getInstance(defaultAlgorithm);
+        }
+        catch (NoSuchAlgorithmException e) {
+            // Would never happen
+            throw new RuntimeException(e);
+        }
     }
 
     /**

src/main/java/org/hydev/mcpm/utils/HashUtils.java

@@ -5,7 +5,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.zip.ZipFile;
 
@@ -22,11 +21,6 @@ public PluginJarFile(@NotNull File file) throws IOException
         super(file);
     }
 
-    public PluginJarFile(@NotNull File file, int mode, @NotNull Charset charset) throws IOException
-    {
-        super(file, mode, charset);
-    }
-
     /**
      * Read the content of a file inside a jar/zip file.
      *

src/main/java/org/hydev/mcpm/utils/PluginJarFile.java

@@ -3,6 +3,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Comparator;
 
 /**
  * This class handles temporary directories like Python's tempfile.TemporaryDirectory:
@@ -54,6 +56,14 @@ public TemporaryDir()
     @Override
     public void close()
     {
-        path.delete();
+        // Recursively delete files on exit
+        try (var w = Files.walk(path.toPath()))
+        {
+            w.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
+        }
     }
 }

src/main/java/org/hydev/mcpm/utils/TemporaryDir.java

@@ -0,0 +1,78 @@
+package org.hydev.mcpm.client.arguments;
+
+import net.sourceforge.argparse4j.inf.ArgumentParserException;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+import org.hydev.mcpm.client.arguments.parsers.CommandParser;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.hydev.mcpm.utils.ColorLogger.printc;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Tests for ArgsParser
+ *
+ * @author Azalea (https://github.com/hykilpikonna)
+ * @since 2022-11-21
+ */
+class ArgsParserTest
+{
+    static class TestCommand implements CommandParser
+    {
+        @Override
+        public void run(Namespace details, Consumer<String> log)
+        {
+            log.accept(details.toString());
+            assertEquals(details.getString("a"), "meow");
+        }
+
+        @Override
+        public String name()
+        {
+            return "test";
+        }
+
+        @Override
+        public String description()
+        {
+            return "A testing command";
+        }
+
+        @Override
+        public void configure(Subparser parser)
+        {
+            parser.addArgument("a");
+        }
+    }
+
+    @Test
+    void parse() throws ArgumentParserException
+    {
+        var p = new ArgsParser(List.of(new TestCommand()), System.out::println);
+        p.parse(new String[]{"test", "meow"});
+        // Should print help
+        p.parse(new String[]{});
+        // Should print test help
+        p.parse(new String[]{"test", "-h"});
+        assertThrows(AssertionError.class, () -> p.parse(new String[]{"test", "asdf"}));
+        printc(p.help());
+        assertEquals(p.getRawSubparsers().size(), 1);
+    }
+
+    @Test
+    void fail()
+    {
+        var p = new ArgsParser(List.of(new TestCommand()), System.out::println);
+        try
+        {
+            p.parse(new String[]{"a"});
+        }
+        catch (ArgumentParserException e)
+        {
+            p.fail(e);
+        }
+    }
+}