Revert "Usage of postgres in test environment for database consistency (

#686)" (#688) This reverts commit 932a61f.
corona-warn-app · Jul 29, 2020 · f3d3114 · f3d3114
1 parent b344143
commit f3d3114
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/common/persistence/pom.xml b/common/persistence/pom.xml
@@ -82,10 +82,10 @@
  <scope>runtime</scope>
  </dependency>
  <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
- <version>1.14.3</version>
- <scope>test</scope>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.200</version>
+ <scope>runtime</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
@@ -0,0 +1 @@
+-- no permissions on H2 necessary
diff --git a/common/persistence/src/test/resources/application.yaml b/common/persistence/src/test/resources/application.yaml
@@ -2,9 +2,11 @@
 spring:
  flyway:
  enabled: true
- locations: classpath:/db/migration
+ locations: classpath:/db/migration, classpath:/db/specific/{vendor}
  datasource:
- url: jdbc:tc:postgresql:11.8:///databasename?TC_TMPFS=/testtmpfs:rw
+ url: jdbc:h2:mem:test;MODE=PostgreSQL
+ driverClassName: org.h2.Driver
+ platform: h2
  test:
  database:
  # Use datasource as defined above.

diff --git a/services/distribution/pom.xml b/services/distribution/pom.xml
@@ -99,12 +99,6 @@
  <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,9 +55,11 @@ services:
 spring:
  main:
  banner-mode: off
- flyway:
- enabled: true
- locations: classpath:db/migration/postgres
- jpa:
- hibernate:
- ddl-auto: validate
+ datasource:
+ url: jdbc:h2:mem:test;MODE=PostgreSQL
+ driverClassName: org.h2.Driver
+ platform: h2
+ test:
+ database:
+ # Use datasource as defined above.
+ replace: none
diff --git a/services/submission/pom.xml b/services/submission/pom.xml
@@ -68,12 +68,6 @@
  <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,10 +8,14 @@ spring:
  main:
  banner-mode: off
  datasource:
- url: jdbc:tc:postgresql:11.8:///databasename?TC_TMPFS=/testtmpfs:rw
+ url: jdbc:h2:mem:test;MODE=PostgreSQL
+ driverClassName: org.h2.Driver
+ platform: h2
  test:
  database:
+ # Use datasource as defined above.
  replace: none
+
 services:
  submission:
  initial-fake-delay-milliseconds: 1
@@ -47,4 +51,4 @@ feign:
  config:
  default:
  connect-timeout: 500
- read-timeout: 500
+ read-timeout: 500