[java-idp-integration-tests] 02/07: Do not configure Jetty if 'tomcat' system property is true

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=ade1510cae224bb240223d942a0c3ff70bfd0891

commit ade1510cae224bb240223d942a0c3ff70bfd0891
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Mar 23 17:02:21 2018 -0500

    Do not configure Jetty if 'tomcat' system property is true
---
 .../java/net/shibboleth/idp/test/BaseIntegrationTest.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 7edc76e..de3b9fe 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -430,13 +430,18 @@ public abstract class BaseIntegrationTest
     }
 
     /**
-     * Set up paths to Jetty if they exist.
+     * Set up paths to Jetty if they exist and if 'tomcat' system property is not true.
      * 
      * @throws Exception if an error occurs
      */
     @BeforeClass
     public void setUpJettyPaths() throws Exception {
 
+        if (Boolean.getBoolean("tomcat")) {
+            log.debug("Not setting up Jetty because system property 'tomcat' is true");
+            return;
+        }
+
         // Path to the project build directory.
         final Path buildPath = Paths.get(TEST_DISTRIBUTIONS_DIRECTORY);
         log.debug("Path to build directory '{}'", buildPath.toAbsolutePath());
@@ -486,6 +491,11 @@ public abstract class BaseIntegrationTest
     @BeforeClass(enabled = true, dependsOnMethods = {"setUpEndpoints"}) // must run after setUpEndpoints
     public void setUpJettyTestbed() throws IOException {
 
+        if (pathToJettyBase == null) {
+            log.debug("Not setting up jetty-base because directory does not exist.");
+            return;
+        }
+
         // Jetty 9.3
         final Path startIni = pathToJettyBase.resolve("start.ini");
         log.debug("Path to start.ini '{}'", startIni.toAbsolutePath());
@@ -811,7 +821,7 @@ public abstract class BaseIntegrationTest
      * @throws ComponentInitializationException
      */
     public void startServer() throws ComponentInitializationException {
-        if (Boolean.valueOf(System.getProperty("tomcat"))) {
+        if (Boolean.getBoolean("tomcat")) {
             startTomcatServer();
         } else {
             startJettyServer();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.