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

Execute tests in servlet-2.5-mvc-3 #4473

Merged
merged 4 commits into from
May 20, 2020
Merged

Execute tests in servlet-2.5-mvc-3 #4473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de93f8c
Execute tests in servlet-2.5-mvc-3
jbescos May 19, 2020
8daf7b8
Fixing charset issue
jbescos May 19, 2020
f8b50f5
Revert "Fixing charset issue"
jbescos May 19, 2020
db3bfa6
Ignore test with iso in Jetty 9
jbescos May 19, 2020
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
48 changes: 32 additions & 16 deletions tests/integration/servlet-2.5-mvc-3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -70,9 +70,39 @@
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-tld</id>
<phase>test</phase>
<configuration>
<target>
<copy file="../../../ext/mvc-jsp/src/main/resources/META-INF/taglib.tld" todir="src/main/webapp/WEB-INF"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>delete-tld</id>
<phase>post-integration-test</phase>
<configuration>
<target>
<delete file="src/main/webapp/WEB-INF/taglib.tld"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -92,20 +122,6 @@
<artifactId>jaxb-osgi</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/BookstoreITCase.java</exclude>
<exclude>**/ItemITCase.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/servlet-2.5-mvc-3/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -27,7 +27,7 @@
</init-param>
<init-param>
<param-name>jersey.config.server.mvc.templateBasePath.jsp</param-name>
<param-value>/jsp/</param-value>
<param-value>/jsp</param-value>
</init-param>
<!-- pass to next filter if Jersey/App returns 404 -->
<init-param>
Expand Down
5 changes: 3 additions & 2 deletions ...c-3/src/test/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/ItemITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -21,7 +21,7 @@
import javax.ws.rs.core.Response;

import org.glassfish.jersey.tests.integration.servlet_25_mvc_3.resource.Book;

import org.junit.Ignore;
import org.junit.Test;

import java.nio.charset.Charset;
Expand Down Expand Up @@ -52,6 +52,7 @@ public void testResourceAsHtmlUtf8() throws Exception {
}

@Test
@Ignore("Jetty 9 is ignoring the charset")
public void testResourceAsHtmlIso88592() throws Exception {
final Response response = item1resource().path("iso").request().get();
response.bufferEntity();
Expand Down