Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2010-12-03 09:53:47 +0000
committerGreg Wilkins2010-12-03 09:53:47 +0000
commitebf596b8a832d2a32fe36cf5e5686290664bef9d (patch)
tree26ea56f649782b207f8cbefbc244d4c4a79c44c5
parent793a646e91e2867c35836c7f164f7520b8b3f449 (diff)
downloadorg.eclipse.jetty.project-ebf596b8a832d2a32fe36cf5e5686290664bef9d.tar.gz
org.eclipse.jetty.project-ebf596b8a832d2a32fe36cf5e5686290664bef9d.tar.xz
org.eclipse.jetty.project-ebf596b8a832d2a32fe36cf5e5686290664bef9d.zip
331703 Fixed failing OSGI test TestJettyOSGiBootWithJsp.java on MacOSX
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2575 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootCore.java5
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java6
3 files changed, 8 insertions, 4 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 69fcb44d8e..cc1d36a346 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,3 +1,4 @@
+ + 331703 Fixed failing OSGI test TestJettyOSGiBootWithJsp.java on MacOSX
+ 331567 IPAccessHandlerTest failed on MacOS fix
+ 328789 Clean up tmp files from test harnesses
+ 331230 Fixed low thread warnings when acceptors>threadpool
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootCore.java
index c8e49ac861..077d3d75fb 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootCore.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootCore.java
@@ -33,12 +33,12 @@ import junit.framework.Assert;
import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpExchange;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.osgi.boot.internal.serverfactory.DefaultJettyAtJettyHomeHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
@@ -169,11 +169,12 @@ public class TestJettyOSGiBootCore
client.start();
ContentExchange getExchange = new ContentExchange();
- getExchange.setURL("http://localhost:9876/greetings");
+ getExchange.setURL("http://127.0.0.1:9876/greetings");
getExchange.setMethod(HttpMethods.GET);
client.send(getExchange);
int state = getExchange.waitForDone();
+ Assert.assertEquals("state should be done", HttpExchange.STATUS_COMPLETED, state);
String content = null;
int responseStatus = getExchange.getResponseStatus();
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
index 6c94eb2f9f..1e9a0941c3 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
@@ -27,6 +27,7 @@ import junit.framework.Assert;
import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpExchange;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.Test;
@@ -118,12 +119,13 @@ public class TestJettyOSGiBootWithJsp
client.start();
ContentExchange getExchange = new ContentExchange();
- getExchange.setURL("http://localhost:9876/jsp/dump.jsp");
+ getExchange.setURL("http://127.0.0.1:9876/jsp/dump.jsp");
getExchange.setMethod(HttpMethods.GET);
client.send(getExchange);
int state = getExchange.waitForDone();
-
+ Assert.assertEquals("state should be done", HttpExchange.STATUS_COMPLETED, state);
+
String content = null;
int responseStatus = getExchange.getResponseStatus();
Assert.assertEquals(HttpStatus.OK_200, responseStatus);

Back to the top