Author: pferraro
Date: 2009-01-29 09:47:21 -0500 (Thu, 29 Jan 2009)
New Revision: 2245
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/ReceiveTrafficLoadMetricTestCase.java
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/SendTrafficLoadMetricTestCase.java
Log:
Try to improve test reliability
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/ReceiveTrafficLoadMetricTestCase.java
===================================================================
---
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/ReceiveTrafficLoadMetricTestCase.java 2009-01-29
14:45:07 UTC (rev 2244)
+++
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/ReceiveTrafficLoadMetricTestCase.java 2009-01-29
14:47:21 UTC (rev 2245)
@@ -44,6 +44,8 @@
@Override
public void getLoad() throws Exception
{
+ Thread.sleep(1);
+
EasyMock.expect(this.server.getAttribute(this.name1,
ReceiveTrafficLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(0);
EasyMock.expect(this.server.getAttribute(this.name2,
ReceiveTrafficLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(0);
@@ -64,7 +66,7 @@
EasyMock.replay(this.server);
- long sleep = 500 - (System.currentTimeMillis() - start);
+ long sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -77,7 +79,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(60.0, load, 1.0);
+ Assert.assertEquals(30.0, load, 1.0);
EasyMock.reset(this.server);
@@ -86,7 +88,7 @@
EasyMock.replay(this.server);
- sleep = 500 - (System.currentTimeMillis() - start);
+ sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -97,7 +99,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(40.0, load, 1.0);
+ Assert.assertEquals(20.0, load, 1.0);
EasyMock.reset(this.server);
}
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java
===================================================================
---
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java 2009-01-29
14:45:07 UTC (rev 2244)
+++
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java 2009-01-29
14:47:21 UTC (rev 2245)
@@ -64,7 +64,7 @@
EasyMock.replay(this.server);
- long sleep = 500 - (System.currentTimeMillis() - start);
+ long sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -77,7 +77,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(60.0, load, 1.0);
+ Assert.assertEquals(30.0, load, 1.0);
EasyMock.reset(this.server);
@@ -87,7 +87,7 @@
EasyMock.replay(this.server);
- sleep = 500 - (System.currentTimeMillis() - start);
+ sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -98,7 +98,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(40.0, load, 1.0);
+ Assert.assertEquals(20.0, load, 1.0);
EasyMock.reset(this.server);
}
Modified:
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/SendTrafficLoadMetricTestCase.java
===================================================================
---
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/SendTrafficLoadMetricTestCase.java 2009-01-29
14:45:07 UTC (rev 2244)
+++
trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/SendTrafficLoadMetricTestCase.java 2009-01-29
14:47:21 UTC (rev 2245)
@@ -64,7 +64,7 @@
EasyMock.replay(this.server);
- long sleep = 500 - (System.currentTimeMillis() - start);
+ long sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -77,7 +77,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(60.0, load, 1.0);
+ Assert.assertEquals(30.0, load, 1.0);
EasyMock.reset(this.server);
@@ -86,7 +86,7 @@
EasyMock.replay(this.server);
- sleep = 500 - (System.currentTimeMillis() - start);
+ sleep = 1000 - (System.currentTimeMillis() - start);
if (sleep > 0)
{
@@ -97,7 +97,7 @@
EasyMock.verify(this.server);
- Assert.assertEquals(40.0, load, 1.0);
+ Assert.assertEquals(20.0, load, 1.0);
EasyMock.reset(this.server);
}