Merge branch 'niko/testset-tests' into integrationTests

Author: ftomassetti

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/ALanguageTestset.java

@@ -0,0 +1,31 @@
+package io.lionweb.lioncore.java.testset;
+
+import io.lionweb.lioncore.java.language.Language;
+import io.lionweb.lioncore.java.serialization.JsonSerialization;
+import java.nio.file.Path;
+import org.junit.Before;
+
+public abstract class ALanguageTestset extends ATestset {
+  protected Language language;
+
+  public ALanguageTestset(Path path) {
+    super(path);
+  }
+
+  @Before
+  public void loadLanguage() {
+    this.language =
+        loadLanguage(
+            findIntegrationTests()
+                .resolve("testset")
+                .resolve("withLanguage")
+                .resolve("myLang.language.json"));
+  }
+
+  protected JsonSerialization getSerialization() {
+    JsonSerialization result = JsonSerialization.getStandardSerialization();
+    result.registerLanguage(this.language);
+    result.enableDynamicNodes();
+    return result;
+  }
+}

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/ATestset.java

@@ -0,0 +1,63 @@
+package io.lionweb.lioncore.java.testset;
+
+import static org.junit.Assert.assertTrue;
+
+import io.lionweb.lioncore.java.language.Language;
+import io.lionweb.lioncore.java.model.Node;
+import io.lionweb.lioncore.java.serialization.JsonSerialization;
+import io.lionweb.lioncore.java.utils.LanguageValidator;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Stream;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public abstract class ATestset {
+  protected final Path path;
+
+  public ATestset(Path path) {
+    this.path = path;
+  }
+
+  protected static Language loadLanguage(Path path) {
+    Node firstNode = parse(path, JsonSerialization.getStandardSerialization()).iterator().next();
+    assertTrue(firstNode.getClass().toString(), firstNode instanceof Language);
+    Language result = (Language) firstNode;
+    LanguageValidator.ensureIsValid(result);
+    return result;
+  }
+
+  protected static List<Node> parse(Path path, JsonSerialization serialization) {
+    try {
+      File myLangFile = path.toFile();
+      List<Node> nodes = serialization.unserializeToNodes(myLangFile);
+      return nodes;
+    } catch (FileNotFoundException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  protected static Object[] collectJsonFiles(Path basePath) {
+    try (Stream<Path> files = Files.walk(basePath)) {
+      Object[] result =
+          files.filter(Files::isRegularFile).filter(f -> f.toString().endsWith(".json")).toArray();
+      return result;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  protected static Path findIntegrationTests() {
+    String propertyValue = System.getenv("integrationTestingDir");
+    if (propertyValue != null) {
+      return Paths.get(propertyValue);
+    }
+    throw new IllegalArgumentException("environment variable integrationTestingDir not defined.");
+  }
+}

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/Invalid.java

@@ -2,58 +2,31 @@
 
 import static org.junit.Assert.assertThrows;
 
-import io.lionweb.lioncore.java.model.Node;
 import io.lionweb.lioncore.java.serialization.JsonSerialization;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
-public class Invalid {
-  private final Path path;
-
+public class Invalid extends ATestset {
   @Parameterized.Parameters
   public static Object[] inputFiles() {
     Path integrationTests = findIntegrationTests();
-    Path basePath = integrationTests.resolve("invalid");
-    try {
-      Object[] result =
-          Files.walk(basePath)
-              .filter(Files::isRegularFile)
-              .filter(f -> f.toString().endsWith(".json"))
-              .toArray();
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    Path basePath = integrationTests.resolve("testset").resolve("invalid");
+    Object[] result = collectJsonFiles(basePath);
+    return result;
   }
 
   public Invalid(Path path) {
-    this.path = path;
+    super(path);
   }
 
   @Test
   public void assertInvalid() {
     assertThrows(
-        path.toString(),
-        RuntimeException.class,
-        () -> {
-          List<Node> nodes =
-              JsonSerialization.getStandardSerialization().unserializeToNodes(path.toFile());
-          System.out.println(nodes);
-        });
-  }
-
-  private static Path findIntegrationTests() {
-    String propertyValue = System.getenv("lionwebTestSet");
-    if (propertyValue != null) {
-      return Paths.get(propertyValue);
-    }
-    throw new IllegalArgumentException("system variable lionwebTestSet not defined.");
+            path.toString(),
+            RuntimeException.class,
+            () -> System.out.println(parse(path, JsonSerialization.getStandardSerialization())));
   }
-}
+}

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/InvalidWithLanguage.java

@@ -0,0 +1,31 @@
+package io.lionweb.lioncore.java.testset;
+
+import static org.junit.Assert.assertThrows;
+
+import java.nio.file.Path;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class InvalidWithLanguage extends ALanguageTestset {
+  @Parameterized.Parameters
+  public static Object[] inputFiles() {
+    Path integrationTests = findIntegrationTests();
+    Path basePath = integrationTests.resolve("testset").resolve("withLanguage").resolve("invalid");
+    Object[] result = collectJsonFiles(basePath);
+    return result;
+  }
+
+  public InvalidWithLanguage(Path path) {
+    super(path);
+  }
+
+  @Test
+  public void assertInvalid() {
+    assertThrows(
+        path.toString(),
+        RuntimeException.class,
+        () -> System.out.println(parse(path, getSerialization())));
+  }
+}

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/Valid.java

@@ -0,0 +1,31 @@
+package io.lionweb.lioncore.java.testset;
+
+import static org.junit.Assert.assertFalse;
+
+import io.lionweb.lioncore.java.model.Node;
+import java.nio.file.Path;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class Valid extends ALanguageTestset {
+  @Parameterized.Parameters
+  public static Object[] inputFiles() {
+    Path integrationTests = findIntegrationTests();
+    Path basePath = integrationTests.resolve("testset").resolve("valid");
+    Object[] result = collectJsonFiles(basePath);
+    return result;
+  }
+
+  public Valid(Path path) {
+    super(path);
+  }
+
+  @Test
+  public void assertValid() {
+    List<Node> nodes = parse(path, getSerialization());
+    assertFalse(path.toString(), nodes.isEmpty());
+  }
+}

core/src/integrationTest/java/io/lionweb/lioncore/java/testset/ValidWithLanguage.java

@@ -0,0 +1,31 @@
+package io.lionweb.lioncore.java.testset;
+
+import static org.junit.Assert.assertFalse;
+
+import io.lionweb.lioncore.java.model.Node;
+import java.nio.file.Path;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ValidWithLanguage extends ALanguageTestset {
+  @Parameterized.Parameters
+  public static Object[] inputFiles() {
+    Path integrationTests = findIntegrationTests();
+    Path basePath = integrationTests.resolve("testset").resolve("withLanguage").resolve("valid");
+    Object[] result = collectJsonFiles(basePath);
+    return result;
+  }
+
+  public ValidWithLanguage(Path path) {
+    super(path);
+  }
+
+  @Test
+  public void assertValid() {
+    List<Node> nodes = parse(path, getSerialization());
+    assertFalse(path.toString(), nodes.isEmpty());
+  }
+}