Refactor tests as proof of concept

Author: Evgenii Grigorev

src/main/java/og_spipes/config/RepositoryPathConfig.java

@@ -0,0 +1,55 @@
+package og_spipes.config;
+
+import jakarta.annotation.PreDestroy;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.util.FileSystemUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+@Configuration
+public class RepositoryPathConfig {
+
+    Path rootDir;
+
+    @Bean(name = "rdf4jRepositoryUrl")
+    @Profile("test")
+    public String testRepositoryUrl() throws IOException {
+        rootDir = Files.createTempDirectory("og_spipes_sesame");
+
+        Path repoDir = rootDir.resolve("repo")
+                .resolve("repositories")
+                .resolve("s-pipes-hello-world");
+        Files.createDirectories(repoDir);
+        return repoDir.toUri().toString();
+    }
+
+    @Bean(name = "rdf4jRepositoryUrl")
+    @Profile("default")
+    public String prodRepositoryUrl(@Value("${rdf4j.repositoryUrl}") String repositoryUrl) {
+        return repositoryUrl;
+    }
+
+    @Bean(name = "rdf4jRepositoryName")
+    @Profile("test")
+    public String testRepositoryName() {
+        return "s-pipes-hello-world";
+    }
+
+    @Bean(name = "rdf4jRepositoryName")
+    @Profile("default")
+    public String prodRepositoryName(@Value("${rdf4j.repositorName}") String repositoryName) {
+        return repositoryName;
+    }
+
+    @PreDestroy
+    @Profile("test")
+    private void clean() {
+        FileSystemUtils.deleteRecursively(rootDir.toFile());
+    }
+
+}

src/main/java/og_spipes/config/ScriptPathConfig.java

@@ -0,0 +1,43 @@
+package og_spipes.config;
+
+import jakarta.annotation.PreDestroy;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.util.FileSystemUtils;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+@Configuration
+public class ScriptPathConfig {
+
+    Path scriptDir;
+
+    @Bean
+    @Profile("test")
+    @Qualifier("scriptPath")
+    public String TestScriptPath() throws IOException {
+        scriptDir = Files.createTempDirectory("og_spipes_scripts");
+        Files.createDirectories(scriptDir);
+
+        return scriptDir.toUri().toString();
+    }
+
+    @Bean
+    @Profile("default")
+    @Qualifier("scriptPath")
+    public String prodScriptPath(@Value("${scriptPaths}") String scriptPath) {
+        return scriptPath;
+    }
+
+    @PreDestroy
+    @Profile("test")
+    private void clean() {
+        FileSystemUtils.deleteRecursively(scriptDir.toFile());
+    }
+}
+

src/main/java/og_spipes/persistence/BasePersistenceFactory.java

@@ -12,11 +12,7 @@
 import org.springframework.context.annotation.Configuration;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import org.springframework.util.FileSystemUtils;
 
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,8 +26,8 @@ public class BasePersistenceFactory {
     private EntityManagerFactory emf;
 
     public BasePersistenceFactory(
-            @Value("${rdf4j.repositoryUrl}") String repositoryUrl,
-            @Value("${rdf4j.repositoryName}") String repositoryName,
+            @Qualifier("rdf4jRepositoryUrl") String repositoryUrl,
+            @Qualifier("rdf4jRepositoryName") String repositoryName,
             @Value("${rdf4j.driver}") String driver
     ) {
         this.repositoryUrl = repositoryUrl;

src/main/java/og_spipes/persistence/PersistenceFactory.java

@@ -25,7 +25,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
@@ -37,18 +36,17 @@ public class PersistenceFactory {
 
     private static final Logger LOG = LoggerFactory.getLogger(PersistenceFactory.class);
 
-    private final Environment environment;
+    private final String scriptPath;
 
     private EntityManagerFactory emf;
 
     @Autowired
-    public PersistenceFactory(Environment environment) {
-        this.environment = environment;
+    public PersistenceFactory(@Qualifier("scriptPath") String scriptPath) {
+        this.scriptPath = scriptPath;
     }
 
     @PostConstruct
     private void init() {
-        final String scriptPath = environment.getProperty("scriptPaths");
         LOG.info("Using repository path: {}.", scriptPath);
 
         final Map<String, String> props = new HashMap<>();

src/main/java/og_spipes/persistence/Rdf4jPersistenceProvider.java

@@ -11,7 +11,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -32,7 +31,7 @@ public class Rdf4jPersistenceProvider {
     private Repository repository;
 
     @Autowired
-    public Rdf4jPersistenceProvider(@Value("${rdf4j.repositoryUrl}") String repositoryUrl, @Value("${rdf4j.repositoryName}") String repositoryName, @Qualifier("rdf4jEMF") EntityManagerFactory emf) {
+    public Rdf4jPersistenceProvider(@Qualifier("rdf4jRepositoryUrl") String repositoryUrl, @Qualifier("rdf4jRepositoryName") String repositoryName, @Qualifier("rdf4jEMF") EntityManagerFactory emf) {
         this.repositoryUrl = repositoryUrl;
         this.repositoryName = repositoryName;
         this.emf = emf;

src/test/java/og_spipes/persistence/dao/TransformationDAOTest.java

@@ -1,36 +1,35 @@
 package og_spipes.persistence.dao;
 
 import og_spipes.model.spipes.TransformationDTO;
-import og_spipes.testutil.AbstractSpringTest;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
-import org.eclipse.rdf4j.repository.sail.SailRepository;
 import org.eclipse.rdf4j.rio.RDFFormat;
-import org.eclipse.rdf4j.sail.nativerdf.NativeStore;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
-class TransformationDAOTest extends AbstractSpringTest {
+@SpringBootTest
+class TransformationDAOTest {
 
     @Autowired
     private TransformationDAO transformationDAO;
 
-    @BeforeAll
-    static void beforeAll() throws IOException {
-        File dataDir = tempDir.resolve("repositories").resolve("s-pipes-hello-world").toFile();
-        Repository sesameRepo = new SailRepository(new NativeStore(dataDir));
-        sesameRepo.init();
-        RepositoryConnection conn = sesameRepo.getConnection();
-        conn.clear();
-        conn.add(new File("src/test/resources/rdf4j_source/repositories/rdf4j_export"), null, RDFFormat.TURTLE);
-        conn.close();
-        sesameRepo.shutDown();
+    @Autowired
+    private Repository repository;
+
+    @BeforeEach
+    void beforeEach() throws IOException {
+        try (RepositoryConnection conn = repository.getConnection()) {
+            conn.clear();
+            conn.add(new File("src/test/resources/rdf4j_source/repositories/rdf4j_export"),
+                    null, RDFFormat.TURTLE);
+        }
     }
 
     @Test

src/test/java/og_spipes/rest/ExecutionControllerTest.java

@@ -1,20 +1,19 @@
 package og_spipes.rest;
 
 import com.google.common.collect.Sets;
-import og_spipes.config.Constants;
 import og_spipes.service.ModuleExecutionInfo;
 import og_spipes.service.ViewService;
-import og_spipes.testutil.AbstractControllerTest;
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.web.servlet.MockMvc;
 
-import java.io.File;
 import java.util.HashSet;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -23,19 +22,16 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-class ExecutionControllerTest extends AbstractControllerTest {
-
-    @Value(Constants.SCRIPTPATH_SPEL)
-    private String scriptPath;
+@SpringBootTest
+@AutoConfigureMockMvc
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
+class ExecutionControllerTest {
 
     @Mock
     private ViewService viewService;
 
-    @BeforeEach
-    void init() throws Exception {
-        File scriptsHomeTmp = new File(scriptPath);
-        FileUtils.copyDirectory(new File("src/test/resources/scripts_test/sample/hello-world"), scriptsHomeTmp);
-    }
+    @Autowired
+    private MockMvc mockMvc;
 
     @Test
     @DisplayName("List history of execution")

src/test/resources/application.properties

@@ -2,6 +2,8 @@ server.servlet.context-path=/og_spipes
 spring.mvc.servlet.path=/rest/
 server.port=18115
 
+spring.profiles.active=test
+
 scriptPaths=/tmp/og_spipes
 engineurl=http://localhost:8080/s_pipes_web_war/
 scriptRules=src/main/resources/rules/SHACL