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

Jump to bottom

Enable integration tests using new jetty plugin #4599

Merged
merged 1 commit into from
Oct 9, 2020
Merged

Enable integration tests using new jetty plugin #4599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>${jetty.plugin.version}</version>
<version>${mortbay.jetty.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Expand All @@ -711,7 +711,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
<version>${jetty.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.glassfish.build</groupId>
Expand Down Expand Up @@ -1916,14 +1916,14 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty.plugin.version}</version>
<version>${mortbay.jetty.plugin.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.plugin.version}</version>
<version>${mortbay.jetty.plugin.version}</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -2145,6 +2145,8 @@
<jaxb.ri.version>3.0.0-M5</jaxb.ri.version>
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
<jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
<jetty.version>11.0.0.beta2</jetty.version>
<jetty.plugin.version>11.0.0.beta2</jetty.plugin.version>
<jsonb.api.version>2.0.0</jsonb.api.version>
<jsonp.ri.version>2.0.0</jsonp.ri.version>
<jsonp.jaxrs.version>2.0.0</jsonp.jaxrs.version>
Expand All @@ -2154,8 +2156,7 @@

<javax.annotation.version>1.3.5</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->

<jetty.plugin.version>6.1.26</jetty.plugin.version>
<jetty.version>11.0.0.beta2</jetty.version>
<mortbay.jetty.plugin.version>6.1.26</mortbay.jetty.plugin.version>
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>

<mimepull.version>1.9.13</mimepull.version>
Expand Down
19 changes: 0 additions & 19 deletions tests/integration/j-376/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,4 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification -->
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 0 additions & 4 deletions ...integration/j-376/src/test/java/org/glassfish/jersey/tests/integration/j376/J376Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public static void tearDownTest() {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testConstructorInjection() {
final String response = target.path("constructor").request().post(Entity.entity("name=John&age=32",
MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class);
Expand All @@ -56,7 +55,6 @@ public void testConstructorInjection() {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testFieldInjection() {
final String response = target.path("field").request().post(Entity.entity("name=Bill&age=21",
MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class);
Expand All @@ -65,7 +63,6 @@ public void testFieldInjection() {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testMethodInjection() {
final String response = target.path("method").request().post(Entity.entity("name=Mike&age=42",
MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class);
Expand All @@ -90,7 +87,6 @@ public void testAppScopedResource() {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testBeanParamInAppScoped() {
final String response = target.path("appScope").request().post(Entity.entity("name=John&age=35",
MediaType.APPLICATION_FORM_URLENCODED_TYPE), String.class);
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jaxrs-component-inject/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/jaxrs/inject/ApplicationInjectITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jersey-1107/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,27 +54,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1107/ApplicationHandlerITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jersey-1223/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1223/ApplicationHandlerITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jersey-1604/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1604/ConnectionCloseITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jersey-1667/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1667/Jersey1667ITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 1 addition & 18 deletions tests/integration/jersey-1829/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1829/ApplicationHandlerITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/jersey-1883/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
3 changes: 0 additions & 3 deletions ...883/src/test/java/org/glassfish/jersey/tests/integration/jersey1883/Jersey1883ITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ protected TestContainerFactory getTestContainerFactory() throws TestContainerExc
}

@Test
@Ignore //TODO - remove after Jakartification
public void testGetRestNoLife() throws Exception {
Response response = target("rest1").path("no-life").request().get();
assertThat(response.readEntity(String.class), equalTo("ciao #1"));
Expand All @@ -72,7 +71,6 @@ public void testGetRestNoLife() throws Exception {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testGetRestSingletonLife() throws Exception {
Response response = target("rest2").path("singleton-life").request().get();
assertThat(response.readEntity(String.class), equalTo("hello #1"));
Expand All @@ -88,7 +86,6 @@ public void testGetRestSingletonLife() throws Exception {
}

@Test
@Ignore //TODO - remove after Jakartification
public void testGetRestLife() throws Exception {
Response response = target("rest3").path("life").request().get();
assertThat(response.readEntity(String.class), equalTo("hi #2"));
Expand Down
8 changes: 1 addition & 7 deletions tests/integration/jersey-1928/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes> <!--JDK 11 -->
<exclude>org/glassfish/jersey/tests/integration/jersey1928/Jersey1928ITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
</plugins>
Expand Down
25 changes: 4 additions & 21 deletions tests/integration/jersey-1960/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet2.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -61,27 +61,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<!-- TODO remove after jakartification is done -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/tests/integration/jersey1960/Jersey1960ITCase.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<!--TODO jakartify this -->
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet5.version}</version>
</dependency>
</dependencies>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 4 additions & 4 deletions ...y-1960/src/main/java/org/glassfish/jersey/tests/integration/jersey1960/RequestFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.Response;

import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.glassfish.jersey.message.MessageUtils;

Expand Down
Loading