fix: migrate zonky provider to config file (#177)

InseeFr · Dec 5, 2023 · e6dcb9e · e6dcb9e
1 parent c34c060
commit e6dcb9e
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -96,14 +96,14 @@
 		<dependency>
 			<groupId>io.zonky.test</groupId>
 			<artifactId>embedded-database-spring-test</artifactId>
-			<version>2.3.0</version>
+			<version>2.4.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>io.zonky.test</groupId>
 			<artifactId>embedded-postgres</artifactId>
-			<version>1.2.10</version>
+			<version>2.0.4</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/CampaignTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/CampaignTests.java
@@ -24,7 +24,6 @@
 
 import java.util.Set;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.not;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
@@ -35,7 +34,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class CampaignTests {

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/MetadataTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/MetadataTests.java
@@ -17,15 +17,14 @@
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 class MetadataTests {
     @Autowired

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/NomenclatureTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/NomenclatureTests.java
@@ -26,7 +26,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.is;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
@@ -38,7 +37,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class NomenclatureTests {

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/QuestionnaireTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/QuestionnaireTests.java
@@ -27,7 +27,6 @@
 
 import java.util.Set;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.hamcrest.Matchers.is;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -38,7 +37,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class QuestionnaireTests {

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/cache/CampaignCacheTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/cache/CampaignCacheTests.java
@@ -18,13 +18,12 @@
 import java.util.HashSet;
 import java.util.Objects;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("cache-testing")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/cache/NomenclatureCacheTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/cache/NomenclatureCacheTests.java
@@ -5,7 +5,6 @@
 import fr.insee.queen.api.campaign.service.model.Nomenclature;
 import fr.insee.queen.api.configuration.cache.CacheName;
 import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
-import lombok.RequiredArgsConstructor;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -17,13 +16,12 @@
 
 import java.util.Objects;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("cache-testing")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional

diff --git a/src/test/java/fr/insee/queen/api/campaign/integration/cache/QuestionnaireCacheTests.java b/src/test/java/fr/insee/queen/api/campaign/integration/cache/QuestionnaireCacheTests.java
@@ -23,13 +23,12 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("cache-testing")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/CommentTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/CommentTests.java
@@ -19,7 +19,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
@@ -28,7 +27,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class CommentTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/DataTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/DataTests.java
@@ -19,7 +19,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
@@ -28,7 +27,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class DataTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/IntegrationTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/IntegrationTests.java
@@ -23,15 +23,14 @@
 
 import java.io.InputStream;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/ParadataTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/ParadataTests.java
@@ -17,15 +17,14 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class ParadataTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/PersonalizationTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/PersonalizationTests.java
@@ -19,7 +19,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
@@ -28,7 +27,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class PersonalizationTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/StateDataTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/StateDataTests.java
@@ -19,15 +19,14 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class StateDataTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/SurveyUnitTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/SurveyUnitTests.java
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.hamcrest.Matchers.*;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -34,7 +33,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class SurveyUnitTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/SurveyUnitsTempZoneTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/SurveyUnitsTempZoneTests.java
@@ -21,7 +21,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.hamcrest.Matchers.*;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.authentication;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -32,7 +31,7 @@
 @SpringBootTest
 @ActiveProfiles("test")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class SurveyUnitsTempZoneTests {

diff --git a/src/test/java/fr/insee/queen/api/surveyunit/integration/cache/SurveyUnitCacheTests.java b/src/test/java/fr/insee/queen/api/surveyunit/integration/cache/SurveyUnitCacheTests.java
@@ -18,14 +18,13 @@
 
 import java.util.Objects;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("cache-testing")
 @ContextConfiguration
-@AutoConfigureEmbeddedDatabase(provider = ZONKY)
+@AutoConfigureEmbeddedDatabase()
 @AutoConfigureMockMvc
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @Transactional

diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml
@@ -28,14 +28,15 @@ logging:
 zonky:
   test:
     database:
-      type: auto                     # The type of embedded database to be created when replacing the data source.
-      provider: default              # Provider to be used to create the underlying embedded database.
+      type: postgres                 # The type of embedded database to be created when replacing the data source.
+      provider: zonky                # Provider to be used to create the underlying embedded database.
       refresh: never                 # Determines the refresh mode of the embedded database.
       replace: any                   # Determines what type of existing DataSource beans can be replaced.
       postgres:
         server:
-          shared_buffers: 512MB
-          max_connections: 100
+          properties:
+            shared_buffers: 128MB
+            max_connections: 5
 
 #force charset for mockmvc
 server: