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

fix all ee9 demo context paths 

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

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

@ -81,10 +81,8 @@ public class DemoModulesTests extends AbstractJettyHomeTest
}
}
//TODO needs ee9-demo.mod
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testJspDump(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -103,6 +101,8 @@ public class DemoModulesTests extends AbstractJettyHomeTest
"--add-modules=http," + toEnvironment("demo", env)
};
String baseURI = "http://localhost:%d/%s-demo-jsp".formatted(httpPort, env);
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(5, TimeUnit.SECONDS));
@ -119,7 +119,7 @@ public class DemoModulesTests extends AbstractJettyHomeTest
assertTrue(runStart.awaitConsoleLogsFor("Started oejs.Server@", 20, TimeUnit.SECONDS));
startHttpClient();
ContentResponse response = client.GET("http://localhost:" + httpPort + "/ee10-demo-jsp/dump.jsp");
ContentResponse response = client.GET(baseURI + "/dump.jsp");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("PathInfo"));
assertThat(response.getContentAsString(), not(containsString("<%")));
@ -127,11 +127,9 @@ public class DemoModulesTests extends AbstractJettyHomeTest
}
}
//TODO needs ee9-demo.mod
@Tag("external")
@ParameterizedTest
//@ValueSource(strings = {"ee9", "ee10"})
@ValueSource(strings = {"ee10"})
@ValueSource(strings = {"ee9", "ee10"})
public void testAsyncRest(String env) throws Exception
{
Path jettyBase = newTestJettyBaseDirectory();
@ -150,6 +148,8 @@ public class DemoModulesTests extends AbstractJettyHomeTest
"--add-modules=http," + toEnvironment("demo", env)
};
String baseURI = "http://localhost:%d/%s-demo-async-rest".formatted(httpPort, env);
try (JettyHomeTester.Run runConfig = distribution.start(argsConfig))
{
assertTrue(runConfig.awaitFor(5, TimeUnit.SECONDS));
@ -168,19 +168,19 @@ public class DemoModulesTests extends AbstractJettyHomeTest
startHttpClient();
ContentResponse response;
response = client.GET("http://localhost:" + httpPort + "/ee10-demo-async-rest/testSerial?items=kayak");
response = client.GET(baseURI + "/testSerial?items=kayak");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Blocking: kayak"));
response = client.GET("http://localhost:" + httpPort + "/ee10-demo-async-rest/testSerial?items=mouse,beer,gnome");
response = client.GET(baseURI + "/testSerial?items=mouse,beer,gnome");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Blocking: mouse,beer,gnome"));
response = client.GET("http://localhost:" + httpPort + "/ee10-demo-async-rest/testAsync?items=kayak");
response = client.GET(baseURI + "/testAsync?items=kayak");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Asynchronous: kayak"));
response = client.GET("http://localhost:" + httpPort + "/ee10-demo-async-rest/testAsync?items=mouse,beer,gnome");
response = client.GET(baseURI + "/testAsync?items=mouse,beer,gnome");
assertEquals(HttpStatus.OK_200, response.getStatus(), new ResponseDetails(response));
assertThat(response.getContentAsString(), containsString("Asynchronous: mouse,beer,gnome"));
}