Finish individual tests.

Moderocky · Mar 20, 2022 · 49f5f00 · 49f5f00
1 parent a1fa85e
commit 49f5f00
Show file tree

Hide file tree

Showing 42 changed files with 156 additions and 1,696 deletions.
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/TestTree.java b/src/main/java/org/byteskript/skript/compiler/structure/TestTree.java
@@ -17,7 +17,7 @@ public class TestTree extends ProgrammaticSplitTree {
     private final SectionMeta owner;
     private final MultiLabel end = new MultiLabel();
     private boolean open;
-    private Label next = new Label();
+    private final Label next = new Label();
 
     public TestTree(SectionMeta owner) {
         this.owner = owner;

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/test/TestEffect.java b/src/main/java/org/byteskript/skript/lang/syntax/test/TestEffect.java
@@ -14,15 +14,10 @@
 import org.byteskript.skript.compiler.Context;
 import org.byteskript.skript.compiler.Pattern;
 import org.byteskript.skript.compiler.SkriptLangSpec;
-import org.byteskript.skript.compiler.structure.MultiLabel;
-import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
 import org.byteskript.skript.compiler.structure.TestTree;
-import org.byteskript.skript.compiler.structure.TryCatchTree;
-import org.byteskript.skript.error.ScriptCompileError;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.byteskript.skript.runtime.internal.ExtractedSyntaxCalls;
 import org.objectweb.asm.Label;
-import org.objectweb.asm.Opcodes;
 
 @Documentation(
     name = "Inline Test",

diff --git a/src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java b/src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java
@@ -9,7 +9,10 @@
 import mx.kenzie.foundation.compiler.State;
 import org.byteskript.skript.api.note.Documentation;
 import org.byteskript.skript.api.syntax.SimpleEntry;
-import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.compiler.CompileState;
+import org.byteskript.skript.compiler.Context;
+import org.byteskript.skript.compiler.Pattern;
+import org.byteskript.skript.compiler.SkriptLangSpec;
 import org.byteskript.skript.lang.element.StandardElements;
 
 @Documentation(

diff --git a/src/main/java/org/byteskript/skript/runtime/internal/ExtractedSyntaxCalls.java b/src/main/java/org/byteskript/skript/runtime/internal/ExtractedSyntaxCalls.java
@@ -128,6 +128,12 @@ public static Object getListValue(Object key, Object target) {
         throw new ScriptRuntimeError("The given collection must be a list.");
     }
 
+    public static Object getMapValue(Object key, Object target) {
+        if (!(target instanceof Map map))
+            throw new ScriptRuntimeError("The given collection must be a map.");
+        return map.get(key);
+    }
+
     @SuppressWarnings("unchecked")
     public static void setListValue(Object key, Object target, Object value) {
         if (target instanceof Map) setMapValue(key, target, value);
@@ -143,6 +149,12 @@ public static void setListValue(Object key, Object target, Object value) {
         throw new ScriptRuntimeError("The given collection must be a list.");
     }
 
+    public static void setMapValue(Object key, Object target, Object value) {
+        if (!(target instanceof Map map))
+            throw new ScriptRuntimeError("The given collection must be a map.");
+        map.put(key, value);
+    }
+
     public static void deleteListValue(Object key, Object target) {
         if (target instanceof Map) deleteMapValue(key, target);
         final Number number = Skript.convert(key, Number.class);
@@ -156,18 +168,6 @@ public static void deleteListValue(Object key, Object target) {
         throw new ScriptRuntimeError("The given collection must be a list.");
     }
 
-    public static Object getMapValue(Object key, Object target) {
-        if (!(target instanceof Map map))
-            throw new ScriptRuntimeError("The given collection must be a map.");
-        return map.get(key);
-    }
-
-    public static void setMapValue(Object key, Object target, Object value) {
-        if (!(target instanceof Map map))
-            throw new ScriptRuntimeError("The given collection must be a map.");
-        map.put(key, value);
-    }
-
     public static void deleteMapValue(Object key, Object target) {
         if (!(target instanceof Map map))
             throw new ScriptRuntimeError("The given collection must be a map.");

diff --git a/src/test/java/org/byteskript/skript/test/AsyncCompileTest.java b/src/test/java/org/byteskript/skript/test/AsyncCompileTest.java
@@ -25,8 +25,8 @@ public class AsyncCompileTest {
 
     @BeforeClass
     public static void warm() throws Throwable {
-        code = new String(GenericTest.class.getClassLoader()
-            .getResourceAsStream("generic.bsk").readAllBytes());
+        code = new String(SyntaxTest.class.getClassLoader()
+            .getResourceAsStream("tests/typemember.bsk").readAllBytes());
         final PostCompileClass cls = skript.compileScript(code, "skript.test");
         final PostCompileClass second = skript.compileScriptAsync(code, "skript.test").get()[0];
     }

diff --git a/src/test/java/org/byteskript/skript/test/ConfigTest.java b/src/test/java/org/byteskript/skript/test/ConfigTest.java
@@ -6,14 +6,8 @@
 
 package org.byteskript.skript.test;
 
-import mx.kenzie.foundation.language.PostCompileClass;
-import org.byteskript.skript.lang.syntax.config.ConfigFile;
-import org.byteskript.skript.runtime.Script;
-import org.byteskript.skript.runtime.Skript;
 import org.byteskript.skript.runtime.config.ConfigEntry;
 import org.byteskript.skript.runtime.config.ConfigMap;
-import org.byteskript.skript.runtime.internal.Member;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;

diff --git a/src/test/java/org/byteskript/skript/test/DictionaryTest.java b/src/test/java/org/byteskript/skript/test/DictionaryTest.java
diff --git a/src/test/java/org/byteskript/skript/test/ErrorHandlingTest.java b/src/test/java/org/byteskript/skript/test/ErrorHandlingTest.java
diff --git a/src/test/java/org/byteskript/skript/test/EventTest.java b/src/test/java/org/byteskript/skript/test/EventTest.java
diff --git a/src/test/java/org/byteskript/skript/test/EveryTest.java b/src/test/java/org/byteskript/skript/test/EveryTest.java
diff --git a/src/test/java/org/byteskript/skript/test/FlowTest.java b/src/test/java/org/byteskript/skript/test/FlowTest.java