Refactor out AbstractModuleTestHelper to package s-pipes-test

Part that was not dependant on s-pipes-core was extracted
kbss-cvut · Jan 23, 2025 · b1241de · b1241de
1 parent c941d34
commit b1241de
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/s-pipes-core/src/test/java/cz/cvut/spipes/modules/AbstractCoreModuleTestHelper.java b/s-pipes-core/src/test/java/cz/cvut/spipes/modules/AbstractCoreModuleTestHelper.java
@@ -0,0 +1,26 @@
+package cz.cvut.spipes.modules;
+
+import cz.cvut.spipes.engine.PipelineFactory;
+import org.apache.jena.ontology.OntModel;
+
+/**
+ * This is helper class to write tests that load configuration of modules from ttl file
+ * that is organized in directory `test/resources/module/${moduleName}/`.
+ *
+ * See more information in {@link AbstractModuleTestHelper}.
+ */
+public abstract class AbstractCoreModuleTestHelper extends AbstractModuleTestHelper {
+
+    @Override
+    Module getSingleModule(OntModel configModel) {
+        return PipelineFactory.loadPipelines(configModel).get(0);
+    }
+
+    public Module getConfigRootModule() {
+        return (Module) super.getConfigRootModule();
+    }
+    public Module getRootModule(String fileName) {
+        return (Module) super.getRootModule(fileName);
+    }
+
+}
diff --git a/s-pipes-core/src/test/java/cz/cvut/spipes/modules/AbstractModuleTest.java b/s-pipes-core/src/test/java/cz/cvut/spipes/modules/AbstractModuleTest.java
@@ -12,7 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class AbstractModuleTest extends AbstractModuleTestHelper {
+public class AbstractModuleTest extends AbstractCoreModuleTestHelper {
 
     @Override
     String getModuleName() {

diff --git a/s-pipes-core/src/test/java/cz/cvut/spipes/modules/ApplyConstructModuleTest.java b/s-pipes-core/src/test/java/cz/cvut/spipes/modules/ApplyConstructModuleTest.java
@@ -13,7 +13,7 @@
 import org.junit.jupiter.api.Test;
 
 
-public class ApplyConstructModuleTest extends AbstractModuleTestHelper {
+public class ApplyConstructModuleTest extends AbstractCoreModuleTestHelper {
 
     @BeforeEach
     public void setUp() {

diff --git a/s-pipes-core/src/test/java/cz/cvut/spipes/modules/BindWithConstantModuleTest.java b/s-pipes-core/src/test/java/cz/cvut/spipes/modules/BindWithConstantModuleTest.java
@@ -15,7 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import org.junit.jupiter.api.Test;
 
-public class BindWithConstantModuleTest extends AbstractModuleTestHelper {
+public class BindWithConstantModuleTest extends AbstractCoreModuleTestHelper {
 
     @Override
     public String getModuleName() {

diff --git a/...pes/modules/AbstractModuleTestHelper.java → ...pes/modules/AbstractModuleTestHelper.java b/...pes/modules/AbstractModuleTestHelper.java → ...pes/modules/AbstractModuleTestHelper.java
@@ -1,6 +1,5 @@
 package cz.cvut.spipes.modules;
 
-import cz.cvut.spipes.engine.PipelineFactory;
 import cz.cvut.spipes.test.JenaTestUtils;
 import org.apache.jena.ontology.OntModel;
 import org.apache.jena.ontology.OntModelSpec;
@@ -66,9 +65,7 @@ public abstract class AbstractModuleTestHelper {
      */
     abstract String getModuleName();
 
-    Module getSingleModule(OntModel configModel) {
-        return PipelineFactory.loadPipelines(configModel).get(0);
-    }
+    abstract Object getSingleModule(OntModel configModel);
 
     public OntModel getConfigOntModel() {
         return getOntModel(CONFIG_FILE_NAME);
@@ -107,8 +104,8 @@ public Model getModel(String fileName) {
      *
      * @return Returns loaded module.
      */
-    public Module getConfigRootModule() {
-        return  getRootModule(CONFIG_FILE_NAME);
+    public Object getConfigRootModule() {
+        return getRootModule(CONFIG_FILE_NAME);
     }
 
     /**
@@ -118,7 +115,7 @@ public Module getConfigRootModule() {
      *                 It should be located at <code>test/resources/module/${fileName}</code>.
      * @return Returns loaded module from the given file.
      */
-    public Module getRootModule(String fileName) {
+    public Object getRootModule(String fileName) {
 
         OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);