'sk test' command upgrades

src/main/java/ch/njol/skript/Skript.java

@@ -70,6 +70,7 @@
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 
+import com.google.gson.GsonBuilder;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.*;
@@ -773,7 +774,10 @@ protected void afterErrors() {
 									EffObjectives.fail();
 
 								info("Collecting results to " + TestMode.RESULTS_FILE);
-								String results = new Gson().toJson(TestTracker.collectResults());
+								String results = new GsonBuilder()
+									.setPrettyPrinting() // Easier to read lines
+									.disableHtmlEscaping() // Fixes issue with "'" character in test strings going unicode
+									.create().toJson(TestTracker.collectResults());
 								try {
 									Files.write(TestMode.RESULTS_FILE, results.getBytes(StandardCharsets.UTF_8));
 								} catch (IOException e) {

src/main/java/ch/njol/skript/SkriptCommand.java

@@ -14,12 +14,14 @@
 import ch.njol.skript.test.runner.SkriptTestEvent;
 import ch.njol.skript.test.runner.TestMode;
 import ch.njol.skript.test.runner.TestTracker;
+import ch.njol.skript.test.utils.TestResults;
 import ch.njol.skript.util.ExceptionUtils;
 import ch.njol.skript.util.FileUtils;
 import ch.njol.skript.util.SkriptColor;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.OpenCloseable;
 import ch.njol.util.StringUtils;
+import com.google.gson.GsonBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -32,7 +34,7 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.nio.file.Path;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -406,10 +408,21 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 						return true;
 					}
 				} else {
-					scriptFile = TestMode.TEST_DIR.resolve(
-						Arrays.stream(args).skip(1).collect(Collectors.joining(" ")) + ".sk"
-					).toFile();
-					TestMode.lastTestFile = scriptFile;
+					if (args[1].equalsIgnoreCase("all")) {
+						scriptFile = TestMode.TEST_DIR.toFile();
+					} else {
+						String fileName = Arrays.stream(args).skip(1).collect(Collectors.joining(" "));
+
+						// Add .sk if the file is not a directory and doesn't currently have .sk
+						if (!fileName.endsWith(".sk") && !fileName.endsWith("/"))
+							fileName += ".sk";
+
+						// Tab complete starts with a slash, let's get rid of it
+						if (fileName.startsWith("/"))
+							fileName = fileName.substring(1);
+						scriptFile = TestMode.TEST_DIR.resolve(fileName).toFile();
+						TestMode.lastTestFile = scriptFile;
+					}
 				}
 
 				if (!scriptFile.exists()) {
@@ -425,10 +438,23 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 							ScriptLoader.unloadScripts(ScriptLoader.getLoadedScripts());
 
 							// Get results and show them
-							String[] lines = TestTracker.collectResults().createReport().split("\n");
+							TestResults testResults = TestTracker.collectResults();
+							String[] lines = testResults.createReport().split("\n");
 							for (String line : lines) {
 								Skript.info(sender, line);
 							}
+
+							// Log results to file
+							Skript.info(sender, "Collecting results to " + TestMode.RESULTS_FILE);
+							String results = new GsonBuilder()
+								.setPrettyPrinting() // Easier to read lines
+								.disableHtmlEscaping() // Fixes issue with "'" character in test strings going unicode
+								.create().toJson(testResults);
+							try {
+								Files.writeString(TestMode.RESULTS_FILE, results);
+							} catch (IOException e) {
+								Skript.exception(e, "Failed to write test results.");
+							}
 						})
 					);
 			} else if (args[0].equalsIgnoreCase("list") || args[0].equalsIgnoreCase("show")) {

src/main/java/ch/njol/skript/SkriptCommandTabCompleter.java

@@ -28,8 +28,8 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 		if (args[0].equalsIgnoreCase("update") && args.length == 2) {
 			options.add("check");
 			options.add("changes");
-		} else if (args[0].matches("(?i)(reload|disable|enable)") && args.length >= 2) {
-			File scripts = Skript.getInstance().getScriptsFolder();
+		} else if (args[0].matches("(?i)(reload|disable|enable|test)") && args.length >= 2) {
+			File scripts = TestMode.DEV_MODE ? TestMode.TEST_DIR.toFile() : Skript.getInstance().getScriptsFolder();
 			String scriptsPathString = scripts.toPath().toString();
 			int scriptsPathLength = scriptsPathString.length();