Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

301089 fixed test 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1270 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-02-16 21:35:19 +00:00
parent 4ad2ddd43e
commit b616fc1e3a
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
View File

@ -22,8 +22,6 @@ public class OneWebApp
{ {
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
String jetty_home = System.getProperty("jetty.home","../jetty-distribution/target/distribution");
Server server = new Server(); Server server = new Server();
Connector connector = new SelectChannelConnector(); Connector connector = new SelectChannelConnector();

41
jetty-server/src/test/java/org/eclipse/jetty/server/handler/StatisticsHandlerTest.java
View File

@ -95,11 +95,11 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(1, _connector.getConnectionsOpen()); assertEquals(1, _connector.getConnectionsOpen());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getRequestsActiveMax()); assertEquals(1, _statsHandler.getRequestsActiveMax());
assertEquals(0, _statsHandler.getDispatched()); assertEquals(1, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
assertEquals(1, _statsHandler.getDispatchedActiveMax()); assertEquals(1, _statsHandler.getDispatchedActiveMax());
@ -131,11 +131,11 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(2, _connector.getConnectionsOpen()); assertEquals(2, _connector.getConnectionsOpen());
assertEquals(1, _statsHandler.getRequests()); assertEquals(2, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getRequestsActiveMax()); assertEquals(1, _statsHandler.getRequestsActiveMax());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(2, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
assertEquals(1, _statsHandler.getDispatchedActiveMax()); assertEquals(1, _statsHandler.getDispatchedActiveMax());
@ -168,11 +168,11 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(4, _connector.getConnectionsOpen()); assertEquals(4, _connector.getConnectionsOpen());
assertEquals(2, _statsHandler.getRequests()); assertEquals(4, _statsHandler.getRequests());
assertEquals(2, _statsHandler.getRequestsActive()); assertEquals(2, _statsHandler.getRequestsActive());
assertEquals(2, _statsHandler.getRequestsActiveMax()); assertEquals(2, _statsHandler.getRequestsActiveMax());
assertEquals(2, _statsHandler.getDispatched()); assertEquals(4, _statsHandler.getDispatched());
assertEquals(2, _statsHandler.getDispatchedActive()); assertEquals(2, _statsHandler.getDispatchedActive());
assertEquals(2, _statsHandler.getDispatchedActiveMax()); assertEquals(2, _statsHandler.getDispatchedActiveMax());
@ -251,10 +251,9 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(1, _connector.getConnectionsOpen()); assertEquals(1, _connector.getConnectionsOpen());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
barrier[1].await(); barrier[1].await();
@ -262,7 +261,7 @@ public class StatisticsHandlerTest extends TestCase
assertNotNull(continuationHandle.get()); assertNotNull(continuationHandle.get());
assertTrue(continuationHandle.get().isSuspended()); assertTrue(continuationHandle.get().isSuspended());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatchedActive()); assertEquals(0, _statsHandler.getDispatchedActive());
@ -291,9 +290,9 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(1, _connector.getConnectionsOpen()); assertEquals(1, _connector.getConnectionsOpen());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(2, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
barrier[1].await(); barrier[1].await();
@ -377,10 +376,9 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(1, _connector.getConnectionsOpen()); assertEquals(1, _connector.getConnectionsOpen());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
barrier[1].await(); barrier[1].await();
@ -400,7 +398,7 @@ public class StatisticsHandlerTest extends TestCase
} }
}); });
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatchedActive()); assertEquals(0, _statsHandler.getDispatchedActive());
@ -411,9 +409,9 @@ public class StatisticsHandlerTest extends TestCase
barrier[0].await(); barrier[0].await();
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(2, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
barrier[1].await(); barrier[1].await();
@ -496,10 +494,9 @@ public class StatisticsHandlerTest extends TestCase
assertEquals(1, _connector.getConnectionsOpen()); assertEquals(1, _connector.getConnectionsOpen());
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatched());
assertEquals(1, _statsHandler.getDispatchedActive()); assertEquals(1, _statsHandler.getDispatchedActive());
@ -519,7 +516,7 @@ public class StatisticsHandlerTest extends TestCase
} }
}); });
assertEquals(0, _statsHandler.getRequests()); assertEquals(1, _statsHandler.getRequests());
assertEquals(1, _statsHandler.getRequestsActive()); assertEquals(1, _statsHandler.getRequestsActive());
assertEquals(1, _statsHandler.getDispatched()); assertEquals(1, _statsHandler.getDispatched());
assertEquals(0, _statsHandler.getDispatchedActive()); assertEquals(0, _statsHandler.getDispatchedActive());