Skip to content

Commit 7524b8d

Browse files
thomaswoehlkethomaswoehlke
committed
## 2.4.9
* fixed #390 refactor integration tests: One Test class for each Controller Class * fixed #391 refactor integration tests: One Test class for each Service Class in package meso
1 parent b96be87 commit 7524b8d

File tree

2 files changed

+91
-10
lines changed

2 files changed

+91
-10
lines changed

‎pom.xml

Lines changed: 53 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,33 @@
8888
<opencsv.version>5.7.0</opencsv.version>
8989

9090
<!-- Unit and Integration Testing -->
91-
<skipTests>true</skipTests>
91+
<skipTests>false</skipTests>
92+
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
93+
<dockerCompose.skip>${skipTests}</dockerCompose.skip>
9294
<xmlunit.version>2.9.0</xmlunit.version>
9395
<htmlunit.version>2.64.0</htmlunit.version>
9496
<version.groovy-all>3.0.12</version.groovy-all>
9597
<hamcrest.version>2.2</hamcrest.version>
9698
<jsoup.version>1.15.3</jsoup.version>
9799
<pmdVersion>6.49.0</pmdVersion>
98100

101+
<!-- Docker -->
102+
<version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
103+
<docker-compose-maven-plugin.composeFile>${project.basedir}/src/main/resources/docker-compose.yml</docker-compose-maven-plugin.composeFile>
104+
<docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
105+
<docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
106+
<docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
107+
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
108+
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
109+
<docker-compose-maven-plugin.projectName>simplgtd</docker-compose-maven-plugin.projectName>
110+
111+
<!-- SCM and Releasing -->
99112
<version.org.apache.maven.scm>1.13.0</version.org.apache.maven.scm>
113+
<version.maven-release-plugin>3.0.0-M6</version.maven-release-plugin>
114+
115+
<!-- UML -->
116+
<version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
117+
<version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
100118

101119
<version.maven-invoker-plugin>3.3.0</version.maven-invoker-plugin>
102120
<version.maven-clean-plugin>3.2.0</version.maven-clean-plugin>
@@ -108,7 +126,6 @@
108126
<version.maven-source-plugin>3.2.1</version.maven-source-plugin>
109127
<version.maven-surefire-plugin>3.0.0-M7</version.maven-surefire-plugin>
110128
<version.maven-failsafe-plugin>3.0.0-M7</version.maven-failsafe-plugin>
111-
<version.maven-release-plugin>3.0.0-M6</version.maven-release-plugin>
112129
<version.maven-site-plugin>3.12.0</version.maven-site-plugin>
113130
<version.maven-project-info-reports-plugin>3.3.0</version.maven-project-info-reports-plugin>
114131
<version.maven-checkstyle-plugin>3.1.2</version.maven-checkstyle-plugin>
@@ -119,14 +136,6 @@
119136
<version.asciidoctor-maven-plugin>2.2.2</version.asciidoctor-maven-plugin>
120137
<version.doxia-module-markdown>1.11.1</version.doxia-module-markdown>
121138
<version.maven-enforcer-plugin>3.1.0</version.maven-enforcer-plugin>
122-
<version.plantuml-maven-plugin>1.5.2</version.plantuml-maven-plugin>
123-
<version.net.sourceforge.plantuml>1.2022.6</version.net.sourceforge.plantuml>
124-
<version.docker-compose-maven-plugin>4.0.0</version.docker-compose-maven-plugin>
125-
<docker-compose-maven-plugin.verbose>true</docker-compose-maven-plugin.verbose>
126-
<docker-compose-maven-plugin.removeImages>true</docker-compose-maven-plugin.removeImages>
127-
<docker-compose-maven-plugin.removeVolumes>true</docker-compose-maven-plugin.removeVolumes>
128-
<docker-compose-maven-plugin.ignorePullFailures>true</docker-compose-maven-plugin.ignorePullFailures>
129-
<docker-compose-maven-plugin.detachedMode>true</docker-compose-maven-plugin.detachedMode>
130139
</properties>
131140

132141
<repositories>
@@ -859,6 +868,40 @@
859868
<groupId>com.dkanejs.maven.plugins</groupId>
860869
<artifactId>docker-compose-maven-plugin</artifactId>
861870
<version>${version.docker-compose-maven-plugin}</version>
871+
<executions>
872+
<execution>
873+
<id>maven-docker-up</id>
874+
<phase>test-compile</phase>
875+
<goals>
876+
<goal>up</goal>
877+
</goals>
878+
<configuration>
879+
<composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
880+
<verbose>${docker-compose-maven-plugin.verbose}</verbose>
881+
<removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
882+
<removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
883+
<ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}</ignorePullFailures>
884+
<detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
885+
<projectName>${docker-compose-maven-plugin.projectName}</projectName>
886+
</configuration>
887+
</execution>
888+
<execution>
889+
<id>maven-docker-down</id>
890+
<phase>pre-site</phase>
891+
<goals>
892+
<goal>down</goal>
893+
</goals>
894+
<configuration>
895+
<composeFile>${docker-compose-maven-plugin.composeFile}</composeFile>
896+
<verbose>${docker-compose-maven-plugin.verbose}</verbose>
897+
<removeImages>${docker-compose-maven-plugin.removeImages}</removeImages>
898+
<removeVolumes>${docker-compose-maven-plugin.removeVolumes}</removeVolumes>
899+
<ignorePullFailures>${docker-compose-maven-plugin.ignorePullFailures}</ignorePullFailures>
900+
<detachedMode>${docker-compose-maven-plugin.detachedMode}</detachedMode>
901+
<projectName>${docker-compose-maven-plugin.projectName}</projectName>
902+
</configuration>
903+
</execution>
904+
</executions>
862905
</plugin>
863906
<plugin>
864907
<groupId>org.apache.maven.plugins</groupId>

‎src/main/resources/docker-compose.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Use postgres/example user/password credentials
2+
version: '3.3'
3+
4+
services:
5+
6+
simpleworklist_dbmaster:
7+
image: postgres:latest
8+
restart: always
9+
networks:
10+
- net
11+
ports:
12+
- 5432:5432
13+
environment:
14+
POSTGRES_PASSWORD: simpleworklistpwd
15+
POSTGRES_USER: simpleworklist
16+
POSTGRES_DB: simpleworklist
17+
simpleworklist_dbref:
18+
image: postgres:latest
19+
restart: always
20+
networks:
21+
- net
22+
ports:
23+
- 5464:5432
24+
environment:
25+
POSTGRES_PASSWORD: simpleworklistrefpwd
26+
POSTGRES_USER: simpleworklistref
27+
POSTGRES_DB: simpleworklistref
28+
simpleworklist_adminer:
29+
image: adminer:latest
30+
restart: always
31+
networks:
32+
- net
33+
ports:
34+
- 4000:8080
35+
networks:
36+
net:
37+
38+

0 commit comments

Comments
 (0)