refactor: better way to create docker in acceptance-test

Author: Guilherme Biff Zarelli

.maven-dockerignore

@@ -0,0 +1 @@
+acceptance-test/target/docker/**

Dockerfile

@@ -55,7 +55,7 @@ RUN curl https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${FLYWAY
     && chmod 540 /flyway/flyway
 
 # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
-ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0"
+ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 
 COPY app/quarkus-app/target/lib/* /deployments/lib/
 COPY app/quarkus-app/target/*-runner.jar /deployments/app.jar

acceptance-test/pom.xml

@@ -16,8 +16,9 @@
         <maven.compiler.target>11</maven.compiler.target>
         <mutation.skip>true</mutation.skip>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
         <mysql-connector-java.version>8.0.23</mysql-connector-java.version>
-        <docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
+        <docker-maven-plugin.version>0.35.0</docker-maven-plugin.version>
         <run-java-sh.version>1.2.2</run-java-sh.version>
         <mutation.skip>true</mutation.skip>
     </properties>
@@ -96,47 +97,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>${maven-resources-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>copy-jar</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/quarkus/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../app/quarkus-app/target/</directory>
-                                    <includes>
-                                        <include>*-runner.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>copy-lib</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/quarkus/lib</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../app/quarkus-app/target/lib</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -155,14 +115,11 @@
                             <name>app-test:integration</name>
                             <alias>dockerfile</alias>
                             <build>
-                                <contextDir>${project.basedir}/</contextDir>
-                                <assembly>
-                                    <descriptorRef>rootWar</descriptorRef>
-                                </assembly>
+                                <contextDir>${project.parent.basedir}</contextDir>
+                                <dockerFile>${project.parent.basedir}/Dockerfile</dockerFile>
                             </build>
                         </image>
                     </images>
-
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -172,29 +129,17 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*IT.java</exclude>
-                    </excludes>
-                </configuration>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>integration-test</id>
                         <goals>
-                            <goal>test</goal>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
                         </goals>
-                        <phase>integration-test</phase>
-                        <configuration>
-                            <excludes>
-                                <exclude>none</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IT.java</include>
-                            </includes>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

acceptance-test/src/test/java/br/com/helpdev/atdd/AbstractContainerBaseTest.java

@@ -9,9 +9,9 @@
 
 abstract class AbstractContainerBaseTest {
 
-  private static final GenericContainer APP;
-  private static final GenericContainer FLYWAY;
-  private static final MySQLContainer MY_SQL_CONTAINER;
+  private static final GenericContainer<?> APP;
+  private static final GenericContainer<?> FLYWAY;
+  private static final MySQLContainer<?> MY_SQL_CONTAINER;
 
   static {
     final var network = Network.newNetwork();

acceptance-test/src/test/java/br/com/helpdev/atdd/ApplicationIT.java

@@ -11,10 +11,10 @@
 import java.time.ZonedDateTime;
 import org.junit.jupiter.api.Test;
 
-public class ApplicationIT extends AbstractContainerBaseTest {
+class ApplicationIT extends AbstractContainerBaseTest {
 
   @Test
-  public void whenCreateNewScheduleThenReturn() {
+  void whenCreateNewScheduleThenReturn() {
     var now = ZonedDateTime.now();
     Integer id = given()
         .contentType(ContentType.JSON)
@@ -31,7 +31,6 @@ public void whenCreateNewScheduleThenReturn() {
         .body("chats[0].status", equalTo("WAITING"))
         .extract()
         .path("id");
-
     given()
         .when()
         .get("/v1/message/{id}", id)
@@ -48,7 +47,7 @@ public void whenCreateNewScheduleThenReturn() {
   }
 
   @Test
-  public void whenGetWithInvalidIdThenReturnError() {
+  void whenGetWithInvalidIdThenReturnError() {
     given()
         .when()
         .get("/v1/message/{id}", "123123")
@@ -59,7 +58,7 @@ public void whenGetWithInvalidIdThenReturnError() {
   }
 
   @Test
-  public void whenDeleteMessageThenRemove() {
+  void whenDeleteMessageThenRemove() {
     var now = ZonedDateTime.now();
     Integer id = given()
         .contentType(ContentType.JSON)
@@ -83,7 +82,7 @@ public void whenDeleteMessageThenRemove() {
   }
 
   @Test
-  public void whenDeleteWithInvalidIdThenReturnError() {
+  void whenDeleteWithInvalidIdThenReturnError() {
     given()
         .when()
         .delete("/v1/message/{id}", "123123")
@@ -93,7 +92,7 @@ public void whenDeleteWithInvalidIdThenReturnError() {
   }
 
   @Test
-  public void whenCreateNewEmailScheduleThenReturn() {
+  void whenCreateNewEmailScheduleThenReturn() {
     given()
         .contentType(ContentType.JSON)
         .body(buildMessage(ZonedDateTime.now(), CommunicationChannelDto.EMAIL))
@@ -108,7 +107,7 @@ public void whenCreateNewEmailScheduleThenReturn() {
   }
 
   @Test
-  public void whenCreateNewPushScheduleThenReturn() {
+  void whenCreateNewPushScheduleThenReturn() {
     given()
         .contentType(ContentType.JSON)
         .body(buildMessage(ZonedDateTime.now(), CommunicationChannelDto.PUSH))
@@ -123,7 +122,7 @@ public void whenCreateNewPushScheduleThenReturn() {
   }
 
   @Test
-  public void whenCreateNewSmsScheduleThenReturn() {
+  void whenCreateNewSmsScheduleThenReturn() {
     given()
         .contentType(ContentType.JSON)
         .body(buildMessage(ZonedDateTime.now(), CommunicationChannelDto.SMS))

pom.xml

@@ -314,16 +314,6 @@
                     <argLine>@{argLine} -Xmx1024m -XX:MaxPermSize=256m</argLine>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin-version}</version>
-                <configuration>
-                    <tagNameFormat>v@{project.version}</tagNameFormat>
-                    <updateWorkingCopyVersions>false</updateWorkingCopyVersions>
-                    <pushChanges>false</pushChanges>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>