Author: pferraro Date: 2009-01-28 09:25:11 -0500 (Wed, 28 Jan 2009) New Revision: 2236 Modified: trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java Log: Improve reliability of test via more precise sleeping. 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-28 10:54:00 UTC (rev 2235) +++ trunk/mod_cluster/src/test/java/org/jboss/modcluster/load/metric/RequestCountLoadMetricTestCase.java 2009-01-28 14:25:11 UTC (rev 2236) @@ -49,17 +49,29 @@ EasyMock.replay(this.server); + long start = System.currentTimeMillis(); + double load = this.metric.getLoad(this.context); EasyMock.verify(this.server); + + Assert.assertEquals(0, load, 0); + EasyMock.reset(this.server); + + long sleep = 500 - (System.currentTimeMillis() - start); - Thread.sleep(500); + if (sleep > 0) + { + Thread.sleep(sleep); + } EasyMock.expect(this.server.getAttribute(this.name1, RequestCountLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(1); EasyMock.expect(this.server.getAttribute(this.name2, RequestCountLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(2); EasyMock.replay(this.server); + + start = System.currentTimeMillis(); load = this.metric.getLoad(this.context); @@ -69,8 +81,13 @@ EasyMock.reset(this.server); - Thread.sleep(500); + sleep = 500 - (System.currentTimeMillis() - start); + if (sleep > 0) + { + Thread.sleep(sleep); + } + // Test incremental load EasyMock.expect(this.server.getAttribute(this.name1, RequestCountLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(2); EasyMock.expect(this.server.getAttribute(this.name2, RequestCountLoadMetric.DEFAULT_ATTRIBUTE)).andReturn(3);