You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/10/05 10:11:16 UTC

svn commit: r1394405 - in /karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression: KarafWithBundleTest.java RegressionTestSupport.java

Author: cschneider
Date: Fri Oct  5 08:11:16 2012
New Revision: 1394405

URL: http://svn.apache.org/viewvc?rev=1394405&view=rev
Log:
KARAF-1897 Changing HTTP port in regression tests

Added:
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java   (with props)
Modified:
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KarafWithBundleTest.java

Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KarafWithBundleTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KarafWithBundleTest.java?rev=1394405&r1=1394404&r2=1394405&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KarafWithBundleTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/KarafWithBundleTest.java Fri Oct  5 08:11:16 2012
@@ -96,7 +96,7 @@ public class KarafWithBundleTest {
     public void testService() throws Exception {
         waitForServlet();
         System.out.println("Trying to get url");
-        URL url = new URL("http://localhost:9080/test/services");
+        URL url = new URL("http://localhost:" + RegressionTestSupport.HTTP_PORT + "/test/services");
         URLConnection conn = url.openConnection();
         conn.setDoOutput(true);
         OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
@@ -121,7 +121,7 @@ public class KarafWithBundleTest {
                 .classifier("features").versionAsInProject(), "http").start(),
             // set the system property for pax web
             KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port",
-                "9080"),
+                RegressionTestSupport.HTTP_PORT),
             // create bundle to install
             streamBundle(bundle()
                 .add(EchoServlet.class)

Added: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java?rev=1394405&view=auto
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java (added)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java Fri Oct  5 08:11:16 2012
@@ -0,0 +1,7 @@
+package org.apache.karaf.tooling.exam.regression;
+
+public class RegressionTestSupport {
+
+    public static final String HTTP_PORT = "9080";
+
+}

Propchange: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/RegressionTestSupport.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain