Author: kkolinko
Date: Fri Sep 9 20:18:26 2011
New Revision: 1167349
URL: http://svn.apache.org/viewvc?rev=1167349&view=rev
Log:
Merge r1166757 from trunk:
Fix Eclipse warnings in unit tests
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 9 20:18:26 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1167349&r1=1167348&r2=1167349&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Fri Sep 9 20:18:26 2011
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpSession;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -160,6 +161,7 @@ public class TestCometProcessor extends
// Write should trigger an exception once the connector stops since the
// socket should be closed
assertNotNull(writeThread.getException());
+ assertNull(readThread.getException());
}
private boolean isCometSupported() {
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java?rev=1167349&r1=1167348&r2=1167349&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/connector/TestMaxConnections.java
Fri Sep 9 20:18:26 2011
@@ -60,7 +60,7 @@ public class TestMaxConnections extends
}
assertTrue("The number of successful requests should have been 4-5,
actual "+passcount,4==passcount || 5==passcount);
-
+ System.out.println("There were [" + connectfail + "] connection
failures");
}
private static class ConnectThread extends Thread {
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java?rev=1167349&r1=1167348&r2=1167349&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/session/Benchmarks.java Fri
Sep 9 20:18:26 2011
@@ -152,7 +152,7 @@ public class Benchmarks {
* 16 threads - ~45,600ms
*/
@Test
- public void testManagerBaseCreateSession() throws LifecycleException {
+ public void testManagerBaseCreateSession() {
doTestManagerBaseCreateSession(1, 1000000);
doTestManagerBaseCreateSession(2, 1000000);
doTestManagerBaseCreateSession(4, 1000000);
@@ -163,8 +163,8 @@ public class Benchmarks {
}
- private void doTestManagerBaseCreateSession(int threadCount, int iterCount)
- throws LifecycleException {
+ private void doTestManagerBaseCreateSession(int threadCount,
+ int iterCount) {
// Create a default session manager
StandardManager mgr = new StandardManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
