Usage of postgres in test environment for database consistency (#686)

* replace h2 db for testing with postgresql DRAFT * remove flyway configuration from submission * add test database config removed vendor specific location for flyway * remove unused sql file
corona-warn-app · Jul 29, 2020 · 932a61f · 932a61f
1 parent 14890de
commit 932a61f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/common/persistence/pom.xml b/common/persistence/pom.xml
@@ -82,10 +82,10 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.200</version>
-      <scope>runtime</scope>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>1.14.3</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <!-- https://nvd.nist.gov/vuln/detail/CVE-2020-9488 -->

diff --git a/common/persistence/src/main/resources/db/specific/h2/V2__createPermissions.sql b/common/persistence/src/main/resources/db/specific/h2/V2__createPermissions.sql
diff --git a/common/persistence/src/test/resources/application.yaml b/common/persistence/src/test/resources/application.yaml
@@ -2,11 +2,9 @@
 spring:
   flyway:
     enabled: true
-    locations: classpath:/db/migration, classpath:/db/specific/{vendor}
+    locations: classpath:/db/migration
   datasource:
-    url: jdbc:h2:mem:test;MODE=PostgreSQL
-    driverClassName: org.h2.Driver
-    platform: h2
+    url: jdbc:tc:postgresql:11.8:///databasename?TC_TMPFS=/testtmpfs:rw
   test:
     database:
       # Use datasource as defined above.

diff --git a/services/distribution/pom.xml b/services/distribution/pom.xml
@@ -99,6 +99,12 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-aop</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>1.14.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/services/distribution/src/test/resources/application.yaml b/services/distribution/src/test/resources/application.yaml
@@ -55,11 +55,9 @@ services:
 spring:
   main:
     banner-mode: off
-  datasource:
-    url: jdbc:h2:mem:test;MODE=PostgreSQL
-    driverClassName: org.h2.Driver
-    platform: h2
-  test:
-    database:
-      # Use datasource as defined above.
-      replace: none
+  flyway:
+    enabled: true
+    locations: classpath:db/migration/postgres
+    jpa:
+      hibernate:
+        ddl-auto: validate
diff --git a/services/submission/pom.xml b/services/submission/pom.xml
@@ -68,6 +68,12 @@
       <version>2.26.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>1.14.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/services/submission/src/test/resources/application.yaml b/services/submission/src/test/resources/application.yaml
@@ -8,14 +8,10 @@ spring:
   main:
     banner-mode: off
   datasource:
-    url: jdbc:h2:mem:test;MODE=PostgreSQL
-    driverClassName: org.h2.Driver
-    platform: h2
+    url: jdbc:tc:postgresql:11.8:///databasename?TC_TMPFS=/testtmpfs:rw
   test:
     database:
-      # Use datasource as defined above.
       replace: none
-
 services:
   submission:
     initial-fake-delay-milliseconds: 1
@@ -51,4 +47,4 @@ feign:
     config:
       default:
         connect-timeout: 500
-        read-timeout: 500
+        read-timeout: 500