Author: sebb
Date: Mon Jul 9 18:16:26 2007
New Revision: 554800
URL: http://svn.apache.org/viewvc?view=rev&rev=554800
Log:
Allow for timing variations
Modified:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Modified:
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/samplers/TestSampleResult.java?view=diff&rev=554800&r1=554799&r2=554800
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/samplers/TestSampleResult.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Mon Jul 9 18:16:26 2007
@@ -40,7 +40,7 @@
// Check sample increments OK
res.sampleStart();
- Thread.sleep(100);
+ Thread.sleep(110); // Needs to be greater than the minimum to
allow for boundary errors
res.sampleEnd();
long time = res.getTime();
if(time < 100){
@@ -105,6 +105,9 @@
// Sample that will get two sub results, simulates a web page load
SampleResult resWithSubResults = new SampleResult();
+
+ long beginTest = System.currentTimeMillis();
+
resWithSubResults.sampleStart();
Thread.sleep(100);
resWithSubResults.setBytes(300);
@@ -139,6 +142,8 @@
resNoSubResults2.sampleEnd();
long sample2Time = resNoSubResults2.getTime();
+ long overallTime = System.currentTimeMillis() - beginTest;
+
assertTrue(resNoSubResults2.isSuccessful());
assertEquals(200, resNoSubResults2.getBytes());
assertEquals("sample with no subresults",
resNoSubResults2.getSampleLabel());
@@ -156,7 +161,13 @@
long totalTime = resWithSubResults.getTime();
// Check the sample times
- assertEquals(sampleWithSubResultsTime + sample1Time + sample2Time,
totalTime);
+ long allsamplesTime = sampleWithSubResultsTime + sample1Time +
sample2Time;
+ if (totalTime < allsamplesTime) {
+ fail("Total: "+totalTime+" < sum(samples): "+ allsamplesTime);
+ }
+ if (totalTime > overallTime) {
+ fail("Total: "+totalTime+" > overall time: "+ overallTime);
+ }
// Check that calculator gets the correct statistics from the
sample
Calculator calculator = new Calculator();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
