Merge pull request #2562 from ydubreuil/enhance-systempropertiestest

Enhance tests of jenkins.util.SystemProperties

test/src/test/java/jenkins/util/SystemPropertiesTest.java

@@ -23,11 +23,13 @@
  */
 package jenkins.util;
 
-import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
-import net.sourceforge.htmlunit.corejs.javascript.RhinoSecurityManager;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
+
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.hamcrest.Matchers;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -60,11 +62,30 @@ public class SystemPropertiesTest {
                 SystemProperties.getString("foo.bar"), equalTo("myVal"));
     }
     
+    @Test
+    public void shouldInitializeFromWebAppProperty() throws Exception {
+        assertThat("Property is undefined before test",
+                SystemProperties.getString("foo.bar"), equalTo(null));
+        setWebAppInitParameter("foo.bar", "myVal");
+        assertThat("Web App property should assign the value",
+                SystemProperties.getString("foo.bar"), equalTo("myVal"));
+    }
+
     @Test
     public void shouldUseSystemPropertyAsAHighPriority() throws Exception {
-        ServletContext c = j.jenkins.servletContext;
+        setWebAppInitParameter("install-wizard-path", "myVal1");
         System.setProperty("install-wizard-path", "myVal2");
         assertThat("System property should take system property with a high priority", 
                 SystemProperties.getString("install-wizard-path"), equalTo("myVal2"));
     }
+
+    /**
+     * Hack to set a web app initial parameter afterwards. Only works with Jetty.
+     * @param property property to set
+     * @param value value of the property
+     */
+    protected void setWebAppInitParameter(String property, String value) {
+        Assume.assumeThat(j.jenkins.servletContext, Matchers.instanceOf(ContextHandler.Context.class));
+        ((ContextHandler.Context)j.jenkins.servletContext).getContextHandler().getInitParams().put(property, value);
+    }
 }