Skip to content

Commit 49f5f00

Browse files
committed
Finish individual tests.
1 parent a1fa85e commit 49f5f00

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+156
-1696
lines changed

src/main/java/org/byteskript/skript/compiler/structure/TestTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class TestTree extends ProgrammaticSplitTree {
1717
private final SectionMeta owner;
1818
private final MultiLabel end = new MultiLabel();
1919
private boolean open;
20-
private Label next = new Label();
20+
private final Label next = new Label();
2121

2222
public TestTree(SectionMeta owner) {
2323
this.owner = owner;

src/main/java/org/byteskript/skript/lang/syntax/test/TestEffect.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@
1414
import org.byteskript.skript.compiler.Context;
1515
import org.byteskript.skript.compiler.Pattern;
1616
import org.byteskript.skript.compiler.SkriptLangSpec;
17-
import org.byteskript.skript.compiler.structure.MultiLabel;
18-
import org.byteskript.skript.compiler.structure.ProgrammaticSplitTree;
1917
import org.byteskript.skript.compiler.structure.TestTree;
20-
import org.byteskript.skript.compiler.structure.TryCatchTree;
21-
import org.byteskript.skript.error.ScriptCompileError;
2218
import org.byteskript.skript.lang.element.StandardElements;
2319
import org.byteskript.skript.runtime.internal.ExtractedSyntaxCalls;
2420
import org.objectweb.asm.Label;
25-
import org.objectweb.asm.Opcodes;
2621

2722
@Documentation(
2823
name = "Inline Test",

src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
import mx.kenzie.foundation.compiler.State;
1010
import org.byteskript.skript.api.note.Documentation;
1111
import org.byteskript.skript.api.syntax.SimpleEntry;
12-
import org.byteskript.skript.compiler.*;
12+
import org.byteskript.skript.compiler.CompileState;
13+
import org.byteskript.skript.compiler.Context;
14+
import org.byteskript.skript.compiler.Pattern;
15+
import org.byteskript.skript.compiler.SkriptLangSpec;
1316
import org.byteskript.skript.lang.element.StandardElements;
1417

1518
@Documentation(

src/main/java/org/byteskript/skript/runtime/internal/ExtractedSyntaxCalls.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,12 @@ public static Object getListValue(Object key, Object target) {
128128
throw new ScriptRuntimeError("The given collection must be a list.");
129129
}
130130

131+
public static Object getMapValue(Object key, Object target) {
132+
if (!(target instanceof Map map))
133+
throw new ScriptRuntimeError("The given collection must be a map.");
134+
return map.get(key);
135+
}
136+
131137
@SuppressWarnings("unchecked")
132138
public static void setListValue(Object key, Object target, Object value) {
133139
if (target instanceof Map) setMapValue(key, target, value);
@@ -143,6 +149,12 @@ public static void setListValue(Object key, Object target, Object value) {
143149
throw new ScriptRuntimeError("The given collection must be a list.");
144150
}
145151

152+
public static void setMapValue(Object key, Object target, Object value) {
153+
if (!(target instanceof Map map))
154+
throw new ScriptRuntimeError("The given collection must be a map.");
155+
map.put(key, value);
156+
}
157+
146158
public static void deleteListValue(Object key, Object target) {
147159
if (target instanceof Map) deleteMapValue(key, target);
148160
final Number number = Skript.convert(key, Number.class);
@@ -156,18 +168,6 @@ public static void deleteListValue(Object key, Object target) {
156168
throw new ScriptRuntimeError("The given collection must be a list.");
157169
}
158170

159-
public static Object getMapValue(Object key, Object target) {
160-
if (!(target instanceof Map map))
161-
throw new ScriptRuntimeError("The given collection must be a map.");
162-
return map.get(key);
163-
}
164-
165-
public static void setMapValue(Object key, Object target, Object value) {
166-
if (!(target instanceof Map map))
167-
throw new ScriptRuntimeError("The given collection must be a map.");
168-
map.put(key, value);
169-
}
170-
171171
public static void deleteMapValue(Object key, Object target) {
172172
if (!(target instanceof Map map))
173173
throw new ScriptRuntimeError("The given collection must be a map.");

src/test/java/org/byteskript/skript/test/AsyncCompileTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class AsyncCompileTest {
2525

2626
@BeforeClass
2727
public static void warm() throws Throwable {
28-
code = new String(GenericTest.class.getClassLoader()
29-
.getResourceAsStream("generic.bsk").readAllBytes());
28+
code = new String(SyntaxTest.class.getClassLoader()
29+
.getResourceAsStream("tests/typemember.bsk").readAllBytes());
3030
final PostCompileClass cls = skript.compileScript(code, "skript.test");
3131
final PostCompileClass second = skript.compileScriptAsync(code, "skript.test").get()[0];
3232
}

src/test/java/org/byteskript/skript/test/ConfigTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@
66

77
package org.byteskript.skript.test;
88

9-
import mx.kenzie.foundation.language.PostCompileClass;
10-
import org.byteskript.skript.lang.syntax.config.ConfigFile;
11-
import org.byteskript.skript.runtime.Script;
12-
import org.byteskript.skript.runtime.Skript;
139
import org.byteskript.skript.runtime.config.ConfigEntry;
1410
import org.byteskript.skript.runtime.config.ConfigMap;
15-
import org.byteskript.skript.runtime.internal.Member;
16-
import org.junit.BeforeClass;
1711
import org.junit.Test;
1812

1913
import java.io.ByteArrayInputStream;

src/test/java/org/byteskript/skript/test/DictionaryTest.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/test/java/org/byteskript/skript/test/ErrorHandlingTest.java

Lines changed: 0 additions & 86 deletions
This file was deleted.

src/test/java/org/byteskript/skript/test/EventTest.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/test/java/org/byteskript/skript/test/EveryTest.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)