Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ee9 demo context paths 

Signed-off-by: Greg Wilkins <gregw@webtide.com>
This commit is contained in:
Greg Wilkins 2022-08-10 17:33:47 +10:00
parent 21944ab95c
commit d9b53a6174
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jaas-webapp/src/main/config/modules/demo.d/ee9-demo-jaas.xml
View File

@ -6,7 +6,7 @@
<!-- =============================================================== -->
<Configure id='wac' class="org.eclipse.jetty.ee9.webapp.WebAppContext">
<Set name="contextPath">/test-jaas</Set>
<Set name="contextPath">/ee9-test-jaas</Set>
<Set name="war"><Property name="jetty.webapps" default="." />/ee9-demo-jaas.war
</Set>
<Set name="extractWAR">true</Set>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
View File

@ -12,7 +12,7 @@ Configure and deploy the test web application
<!-- + contextPath -->
<!-- + war OR resourceBase -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Set name="contextPath">/test</Set>
<Set name="contextPath">/ee9-test</Set>
<Set name="war"><Property name="jetty.webapps" default="." />/ee9-demo-jetty.war
</Set>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jndi-webapp/src/main/config/modules/demo.d/ee9-demo-jndi.xml
View File

@ -12,7 +12,7 @@
</Arg>
</New>
<Set name="contextPath">/test-jndi</Set>
<Set name="contextPath">/ee9-test-jndi</Set>
<Set name="war"><Property name="jetty.webapps" default="." />/ee9-demo-jndi.war
</Set>
<Set name="extractWAR">true</Set>

2
jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-spec/jetty-ee9-demo-spec-webapp/src/main/config/modules/demo.d/ee9-demo-spec.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="wac" class="org.eclipse.jetty.ee9.webapp.WebAppContext">
<Set name="contextPath">/test-spec</Set>
<Set name="contextPath">/ee9-test-spec</Set>
<Set name="war"><Property name="jetty.webapps" />/ee9-demo-spec.war
</Set>
<Set name="configurationDiscovered">true</Set>

29
tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DemoModulesTests.java
View File

@ -37,10 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class DemoModulesTests extends AbstractJettyHomeTest
{
//TODO needs ee9-demo.mod
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testDemoAddServerClasses(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -189,10 +187,8 @@ public class DemoModulesTests extends AbstractJettyHomeTest
}
}
//TODO needs ee9-demo module
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testSpec(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -228,20 +224,22 @@ public class DemoModulesTests extends AbstractJettyHomeTest
startHttpClient();
String baseURI = "http://localhost:%d/%s-test-spec".formatted(httpPort, env);
//test the async listener
ContentResponse response = client.POST("http://localhost:" + httpPort + "/test-spec/asy/xx").send();
ContentResponse response = client.POST(baseURI + "/asy/xx").send();
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("<span class=\"pass\">PASS</span>"));
assertThat(response.getContentAsString(), not(containsString("<span class=\"fail\">FAIL</span>")));
//test the servlet 3.1/4 features
response = client.POST("http://localhost:" + httpPort + "/test-spec/test/xx").send();
response = client.POST(baseURI + "/test/xx").send();
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("<span class=\"pass\">PASS</span>"));
assertThat(response.getContentAsString(), not(containsString("<span class=\"fail\">FAIL</span>")));
//test dynamic jsp
response = client.POST("http://localhost:" + httpPort + "/test-spec/dynamicjsp/xx").send();
response = client.POST(baseURI + "/dynamicjsp/xx").send();
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Programmatically Added Jsp File"));
}
@ -250,8 +248,7 @@ public class DemoModulesTests extends AbstractJettyHomeTest
@Disabled //TODO needs DefaultServlet and ee9-demo
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testJPMS(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -293,10 +290,8 @@ public class DemoModulesTests extends AbstractJettyHomeTest
}
}
//TODO: no ee9-demo module
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testSessionDump(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -327,15 +322,17 @@ public class DemoModulesTests extends AbstractJettyHomeTest
{
assertTrue(runStart.awaitConsoleLogsFor("Started oejs.Server@", 10, TimeUnit.SECONDS));
String baseURI = "http://localhost:%d/%s-test".formatted(httpPort, env);
startHttpClient();
client.setFollowRedirects(true);
ContentResponse response = client.GET("http://localhost:" + httpPort + "/test/session/");
ContentResponse response = client.GET(baseURI + "/session/");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
// Submit "New Session"
Fields form = new Fields();
form.add("Action", "New Session");
response = client.POST("http://localhost:" + httpPort + "/test/session/")
response = client.POST(baseURI + "/session/")
.body(new FormRequestContent(form))
.send();
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));