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
This commit is contained in:
parent
793a646e91
commit
ebf596b8a8
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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,11 +119,12 @@ 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();
|
||||
|
|
Loading…
Reference in New Issue