From 8e204be8bff5bebed875f759d1d212b4c70c1840 Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Wed, 20 Nov 2024 14:09:14 +0200
Subject: [PATCH] fix for #49
---
pom.xml | 9 ++++-----
.../services/api/scm633/HubApiControllerTest.java | 2 ++
.../scm633/ServiceCandidateApiControllerTest.java | 2 ++
.../api/scm633/ServiceCatalogApiControllerTest.java | 2 ++
.../api/scm633/ServiceCategoryApiControllerTest.java | 2 ++
.../api/so641/ServiceOrderApiControllerTest.java | 3 ++-
.../api/so641/ServiceOrderRepoServiceTest.java | 3 ++-
...iceTest.java => ServiceNSLCMRepoServiceTest.java} | 12 ++++++++----
8 files changed, 24 insertions(+), 11 deletions(-)
rename src/test/java/org/etsi/osl/services/service/{ServiceRepoServiceTest.java => ServiceNSLCMRepoServiceTest.java} (98%)
diff --git a/pom.xml b/pom.xml
index 51dad97..17b9880 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
+ <configuration>
+ <!-- Disable parallel execution -->
+ <parallel>none</parallel>
+ </configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
@@ -458,11 +462,6 @@
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.2.5</version>
- </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
index 048ad19..db51361 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java
@@ -17,6 +17,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -36,6 +37,7 @@ import org.springframework.web.context.WebApplicationContext;
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
@AutoConfigureMockMvc
@ActiveProfiles("testing")
+@AutoConfigureTestDatabase //this automatically uses h2
public class HubApiControllerTest {
@Autowired
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
index c8ed3f4..be25caf 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCandidateApiControllerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ import org.springframework.web.context.WebApplicationContext;
@Transactional
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
@AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
@ActiveProfiles("testing")
public class ServiceCandidateApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
index 92b48d5..65080e8 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCatalogApiControllerTest.java
@@ -25,6 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ import org.springframework.web.context.WebApplicationContext;
@Transactional
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
@AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
@ActiveProfiles("testing")
public class ServiceCatalogApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
index 865ca45..4163c54 100644
--- a/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/scm633/ServiceCategoryApiControllerTest.java
@@ -16,6 +16,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -34,6 +35,7 @@ import org.springframework.web.context.WebApplicationContext;
@Transactional
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)
@AutoConfigureMockMvc
+@AutoConfigureTestDatabase //this automatically uses h2
@ActiveProfiles("testing")
public class ServiceCategoryApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
index 305d454..ac1dad1 100644
--- a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
+++ b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java
@@ -31,6 +31,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -50,7 +51,7 @@ import org.springframework.web.context.WebApplicationContext;
webEnvironment = SpringBootTest.WebEnvironment.MOCK,
classes = OpenAPISpringBoot.class
)
-//@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureTestDatabase //this automatically uses h2
@AutoConfigureMockMvc
@ActiveProfiles("testing")
public class ServiceOrderApiControllerTest {
diff --git a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
index 2cc5b0e..dc3a7c1 100644
--- a/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
+++ b/src/test/java/org/etsi/osl/services/api/so641/ServiceOrderRepoServiceTest.java
@@ -26,6 +26,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
@@ -45,7 +46,7 @@ import org.springframework.web.context.WebApplicationContext;
webEnvironment = SpringBootTest.WebEnvironment.MOCK,
classes = OpenAPISpringBoot.class
)
-//@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureTestDatabase //this automatically uses h2
@AutoConfigureMockMvc
@ActiveProfiles("testing")
public class ServiceOrderRepoServiceTest {
diff --git a/src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java b/src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
similarity index 98%
rename from src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java
rename to src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
index fbd4718..29ea3bd 100644
--- a/src/test/java/org/etsi/osl/services/service/ServiceRepoServiceTest.java
+++ b/src/test/java/org/etsi/osl/services/service/ServiceNSLCMRepoServiceTest.java
@@ -37,21 +37,25 @@ import org.mockito.Mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
-
+import org.springframework.transaction.annotation.Transactional;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
@RunWith(SpringRunner.class)
+@Transactional
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = OpenAPISpringBoot.class)
+@AutoConfigureTestDatabase //this automatically uses h2
+@AutoConfigureMockMvc
@ActiveProfiles("testing")
-@SpringBootTest(classes = OpenAPISpringBoot.class)
-//@DataJpaTest
-public class ServiceRepoServiceTest {
+public class ServiceNSLCMRepoServiceTest {
@Mock
private ServiceRepository serviceRepository;
--
GitLab