Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable GF Embedded test suite - part 3 (GF Embedded Maven plugin) #24581

Merged
merged 10 commits into from
Sep 12, 2023
Merged

Enable GF Embedded test suite - part 3 (GF Embedded Maven plugin) #24581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d05a4e5
Enabled some of GF Embedded Maven plugin tests
OndroMih Sep 4, 2023
16a7d5c
Enabled almost all of GF Embedded Maven plugin tests
OndroMih Sep 4, 2023
db275d3
Merge eclipse/master into ondromih-gf-embedded-maven-plugin-tests
OndroMih Sep 7, 2023
461b696
Upgraded GF Embedded maven plugin tests to JUnit 5
OndroMih Sep 7, 2023
a586d6a
Added enabled GF Embedded tests to the default test suites
OndroMih Sep 8, 2023
01b4bc2
Revert formatting done by my IDE
OndroMih Sep 8, 2023
7bacc38
Revemo GF Embedded tests from the fastest profile
OndroMih Sep 8, 2023
25df278
Disable running GF Embedded in tests if skipTests set
OndroMih Sep 11, 2023
c4e095f
Remove star imports
OndroMih Sep 11, 2023
f0e5fc6
Remove parameter 'goalPrefix' for GF Embedded Maven plugin.
OndroMih Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 40 additions & 29 deletions appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2023 Contributors to the Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -30,33 +31,43 @@
<packaging>war</packaging>
<name>Application Dispatcher Test (maven-plugin/applicationDispatcher)</name>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<executions>
<execution>
<id>start</id>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>start-embedded</id>
<activation>
<property>
<name>!skipTests</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand All @@ -67,8 +78,8 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
</project>
Expand Down
16 changes: 6 additions & 10 deletions ...pplicationDispatcher/src/test/java/org/glassfish/tests/applicationDispatcher/WebTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -16,17 +17,12 @@

package org.glassfish.tests.applicationDispatcher;

import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;

Expand All @@ -37,7 +33,7 @@ public class WebTest {

private String contextPath = "test";

@BeforeClass
@BeforeAll
public static void setup() throws IOException {
}

Expand Down Expand Up @@ -66,7 +62,7 @@ private static void goGet(String host, int port,
}
lineNum++;
}
Assert.assertTrue(count==EXPECTED_COUNT);
Assertions.assertTrue(count==EXPECTED_COUNT);
} catch(Exception e) {
e.printStackTrace();
throw e;
Expand Down
84 changes: 47 additions & 37 deletions appserver/tests/embedded/maven-plugin/dirListing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2023 Contributors to the Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -30,41 +31,50 @@
<packaging>war</packaging>
<name>Directory Listing Test (maven-plugin/dirListing)</name>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<configuration>
<goalPrefix>glassfish</goalPrefix>
<app>target/dirListing.war</app>
<port>8080</port>
<name>test</name>
<contextRoot>test</contextRoot>
<serverID>embedded</serverID>
</configuration>
<executions>
<execution>
<id>start</id>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>start-embedded</id>
<activation>
<property>
<name>!skipTests</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<configuration>
<app>target/dirListing.war</app>
<port>8080</port>
<name>test</name>
<contextRoot>test</contextRoot>
<serverID>embedded</serverID>
</configuration>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand All @@ -75,8 +85,8 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
</project>
Expand Down
15 changes: 6 additions & 9 deletions ...mbedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2023 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -16,17 +17,13 @@

package org.glassfish.tests.dirListing;

import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.net.URL;
import java.net.URLConnection;

Expand All @@ -37,7 +34,7 @@ public class WebTest {

private String contextPath = "test";

@BeforeClass
@BeforeAll
public static void setup() throws IOException {
}

Expand Down Expand Up @@ -65,7 +62,7 @@ private static void goGet(String host, int port,
}
lineNum++;
}
Assert.assertTrue(count==EXPECTED_COUNT);
Assertions.assertTrue(count==EXPECTED_COUNT);
} catch(Exception e) {
e.printStackTrace();
throw e;
Expand Down
69 changes: 40 additions & 29 deletions appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2023 Contributors to the Eclipse Foundation.
Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -30,33 +31,43 @@
<packaging>war</packaging>
<name>Filter URI Mapping Test (maven-plugin/filterURIMapping)</name>

<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<executions>
<execution>
<id>start</id>
<phase>integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>start-embedded</id>
<activation>
<property>
<name>!skipTests</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.glassfish.embedded</groupId>
<artifactId>maven-embedded-glassfish-plugin</artifactId>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
<goal>deploy</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>undeploy</goal>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand All @@ -67,8 +78,8 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
</project>
Expand Down
Loading