Merge pull request #18 from OmniFish-EE/tests

Added trivial test for every basic variant of execution

.github/workflows/build.yml

@@ -21,11 +21,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B clean package
+      run: mvn -B clean verify

.github/workflows/docker-publish.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Maven Configure
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Set up Docker Buildx

pom.xml

@@ -19,6 +19,38 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>2.0.16</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.10.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.20.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.20.2</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <resources>
             <resource>
@@ -169,14 +201,56 @@
                     </images>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>execute</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.13.0</version>
+                    <configuration>
+                        <release>21</release>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.5.0</version>
+                    <configuration>
+                        <includes>
+                            <include>**/*Test.java</include>
+                        </includes>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.5.0</version>
                     <configuration>
-                        <release>17</release>
+                        <systemPropertyVariables>
+                            <docker.glassfish.image>${docker.glassfish.image}</docker.glassfish.image>
+                        </systemPropertyVariables>
+                        <includes>
+                            <include>**/*IT.java</include>
+                        </includes>
                     </configuration>
                 </plugin>
                 <plugin>

src/test/java/org/glassfish/main/distributions/docker/AsadminIT.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.distributions.docker;
+
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.stringContainsInOrder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ *
+ */
+@Testcontainers
+public class AsadminIT {
+
+    @SuppressWarnings({"rawtypes", "resource"})
+    @Container
+    private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image"))
+        .withCommand("asadmin start-domain").withExposedPorts(8080)
+        .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String()));
+
+    @Test
+    void getRoot() throws Exception {
+        URL url = URI.create("http://localhost:" + server.getMappedPort(8080) + "/").toURL();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        String content;
+        try {
+            connection.setRequestMethod("GET");
+            assertEquals(200, connection.getResponseCode(), "Response code");
+            try (InputStream in = connection.getInputStream()) {
+                content = new String(in.readAllBytes(), StandardCharsets.UTF_8);
+            }
+        } finally {
+            connection.disconnect();
+        }
+        assertThat(content, stringContainsInOrder("Eclipse GlassFish", "index.html", "production-quality"));
+    }
+}

src/test/java/org/glassfish/main/distributions/docker/RunembeddedIT.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.distributions.docker;
+
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.OutputFrame.OutputType;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ *
+ */
+@Testcontainers
+public class RunembeddedIT {
+
+    @SuppressWarnings({"rawtypes", "resource"})
+    @Container
+    private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image"))
+        .withCommand("runembedded").withExposedPorts(8080).withLogConsumer(o -> {
+            // FIXME: If we don't use the interactive terminal, spams STDOUT. To be fixed in 7.0.19+.
+            if (o.getType() == OutputType.STDERR) {
+                System.err.print("GF: " + o.getUtf8String());
+            }
+        });
+
+    @Test
+    void getRoot() throws Exception {
+        URL url = URI.create("http://localhost:" + server.getMappedPort(8080) + "/").toURL();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        try {
+            connection.setRequestMethod("GET");
+            assertEquals(404, connection.getResponseCode(), "Response code");
+        } finally {
+            connection.disconnect();
+        }
+    }
+}

src/test/java/org/glassfish/main/distributions/docker/StartServIT.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.distributions.docker;
+
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.stringContainsInOrder;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ *
+ */
+@Testcontainers
+public class StartServIT {
+
+    @SuppressWarnings({"rawtypes", "resource"})
+    @Container
+    private final GenericContainer server = new GenericContainer<>(System.getProperty("docker.glassfish.image"))
+        .withCommand("startserv").withExposedPorts(8080)
+        .withLogConsumer(o -> System.err.print("GF: " + o.getUtf8String()));
+
+    @Test
+    void getRoot() throws Exception {
+        URL url = URI.create("http://localhost:" + server.getMappedPort(8080) + "/").toURL();
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        String content;
+        try {
+            connection.setRequestMethod("GET");
+            assertEquals(200, connection.getResponseCode(), "Response code");
+            try (InputStream in = connection.getInputStream()) {
+                content = new String(in.readAllBytes(), StandardCharsets.UTF_8);
+            }
+        } finally {
+            connection.disconnect();
+        }
+        assertThat(content, stringContainsInOrder("Eclipse GlassFish", "index.html", "production-quality"));
+    }
+}