2 Commits

Author SHA1 Message Date
  kindlich 2a5f279c6e
Fix missing assertions in tests 4 years ago
  kindlich f6a3872faf
Added StdLibs as submodule 4 years ago

+ 3
- 0
.gitmodules View File

1
+[submodule "StdLibs"]
2
+	path = StdLibs
3
+	url = https://git.openzen.org/ZenCode/StdLibs.git

BIN
JavaIntegration/StdLibs.jar View File


+ 5
- 0
ScriptingExample/build.gradle View File

19
     testRuntime group: "org.junit.jupiter", name: "junit-jupiter", version: "5.4.2"
19
     testRuntime group: "org.junit.jupiter", name: "junit-jupiter", version: "5.4.2"
20
 }
20
 }
21
 
21
 
22
+processResources {
23
+    dependsOn(":StdLibs:zipItUp")
24
+    from files(evaluationDependsOn(":StdLibs").tasks.getByName("zipItUp").outputs)
25
+}
26
+
22
 test {
27
 test {
23
     //useJUnitPlatform()
28
     //useJUnitPlatform()
24
     testLogging{
29
     testLogging{

BIN
ScriptingExample/src/main/resources/StdLibs.jar View File


+ 3
- 1
ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/HelloWorldTest.java View File

9
     public void helloWorld() {
9
     public void helloWorld() {
10
         addScript("println('hello world');");
10
         addScript("println('hello world');");
11
         executeEngine();
11
         executeEngine();
12
-        
12
+    
13
+        logger.assertNoErrors();
14
+        logger.assertNoWarnings();
13
         logger.assertPrintOutputSize(1);
15
         logger.assertPrintOutputSize(1);
14
         logger.assertPrintOutput(0, "hello world");
16
         logger.assertPrintOutput(0, "hello world");
15
     }
17
     }

+ 5
- 1
ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/arithmethic_operators/AdditionTest.java View File

13
         addScript(String.format("println(%d + %d);", i, j));
13
         addScript(String.format("println(%d + %d);", i, j));
14
         executeEngine();
14
         executeEngine();
15
         
15
         
16
+        logger.assertNoErrors();
17
+        logger.assertNoWarnings();
16
         logger.assertPrintOutputSize(1);
18
         logger.assertPrintOutputSize(1);
17
         logger.assertPrintOutput(0, String.valueOf(i + j));
19
         logger.assertPrintOutput(0, String.valueOf(i + j));
18
     }
20
     }
21
     public void testChainedAdditions() {
23
     public void testChainedAdditions() {
22
         addScript("println(1+2+3+4+5+6+7+8+9+10);");
24
         addScript("println(1+2+3+4+5+6+7+8+9+10);");
23
         executeEngine();
25
         executeEngine();
24
-        
26
+    
27
+        logger.assertNoErrors();
28
+        logger.assertNoWarnings();
25
         logger.assertPrintOutputSize(1);
29
         logger.assertPrintOutputSize(1);
26
         logger.assertPrintOutput(0, String.valueOf(55));
30
         logger.assertPrintOutput(0, String.valueOf(55));
27
     }
31
     }

+ 3
- 1
ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/control_structures/LoopTest.java View File

9
     public void validateOutput() {
9
     public void validateOutput() {
10
         addScript("for i in 0 .. 100 println(i);");
10
         addScript("for i in 0 .. 100 println(i);");
11
         executeEngine();
11
         executeEngine();
12
-        
12
+    
13
+        logger.assertNoErrors();
14
+        logger.assertNoWarnings();
13
         logger.assertPrintOutputSize(100);
15
         logger.assertPrintOutputSize(100);
14
         for(int i = 0; i < 100; i++) {
16
         for(int i = 0; i < 100; i++) {
15
             logger.assertPrintOutput(i, String.valueOf(i));
17
             logger.assertPrintOutput(i, String.valueOf(i));

+ 4
- 0
ScriptingExample/src/test/java/org/openzen/zenscript/scriptingexample/tests/actual_test/packages/SamePackage.java View File

11
         addScript("println(doSomething());", "b.zs");
11
         addScript("println(doSomething());", "b.zs");
12
         
12
         
13
         executeEngine();
13
         executeEngine();
14
+        logger.assertNoErrors();
15
+        logger.assertNoWarnings();
14
         logger.assertPrintOutputSize(1);
16
         logger.assertPrintOutputSize(1);
15
         logger.assertPrintOutput(0, "Hello World");
17
         logger.assertPrintOutput(0, "Hello World");
16
     }
18
     }
21
         addScript("println(doSomething());", "some/test/package/b.zs");
23
         addScript("println(doSomething());", "some/test/package/b.zs");
22
     
24
     
23
         executeEngine();
25
         executeEngine();
26
+        logger.assertNoErrors();
27
+        logger.assertNoWarnings();
24
         logger.assertPrintOutputSize(1);
28
         logger.assertPrintOutputSize(1);
25
         logger.assertPrintOutput(0, "Hello World");
29
         logger.assertPrintOutput(0, "Hello World");
26
     }
30
     }

+ 1
- 0
StdLibs

1
+Subproject commit cfa5b45a8bbae5a372a6ff599db79710c0563f39

Loading…
Cancel
Save