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

add jpms test 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2019-02-11 15:55:27 +10:00
parent d9bfece0cc
commit 85fd1db963
2 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test-distribution/src/main/java/org/eclipse/jetty/tests/distribution/DistributionRunner.java
View File

@ -525,7 +525,10 @@ public class DistributionRunner {
return "java";
}
?
/**
* Stop the distribution
* @throws Exception
*/
public void stop()
throws Exception {
@ -542,9 +545,6 @@ public class DistributionRunner {
LOGGER.info("still alive so force destroy process");
this.pid.destroyForcibly();
}
if(httpClient!=null&&httpClient.isRunning()){
httpClient.stop();
}
}
/**
@ -563,6 +563,9 @@ public class DistributionRunner {
*/
public void cleanup() throws Exception {
stop();
if(httpClient!=null&&httpClient.isRunning()){
httpClient.stop();
}
if (Files.exists(this.jettyBase)) {
// cleanup jetty base
IO.delete(this.jettyBase.toFile());

59
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/JpmsActivatedTests.java Normal file
View File

@ -0,0 +1,59 @@
//
// ========================================================================
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
package org.eclipse.jetty.tests.distribution;
import java.io.File;
import java.nio.file.Path;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
public class JpmsActivatedTests
{
@Test
@DisabledOnJre(JRE.JAVA_8)
public void jpms_activated() throws Exception
{
DistributionRunner distributionRunner = DistributionRunner.Builder.newInstance() //
.jettyVersion(System.getProperty("jetty_version")) //
.mavenLocalRepository(System.getProperty("mavenRepoPath")) //
.waitStartTime(30) //
.build(); //
try
{
distributionRunner.start("--create-startd", "--approve-all-licenses", "--add-to-start=resources,server,http,webapp,deploy,jsp,jmx,jmx-remote,servlet,servlets");
distributionRunner.stop();
Path jettyBase = distributionRunner.getJettyBase();
File war = distributionRunner.resolveArtifact("org.eclipse.jetty.tests:test-simple-webapp:war:" + System.getProperty("jetty_version"));
distributionRunner.installWarFile(war, "test");
distributionRunner.start("--jpms");
distributionRunner.assertLogsContains("Started @");
distributionRunner.assertUrlStatus("/test/index.jsp", 200);
distributionRunner.assertUrlContains("/test/index.jsp", "Hello");
} finally {
distributionRunner.stop();
distributionRunner.cleanup();
}
}
}