try to prevent false failure of testTimedSearchTask

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@770151 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2009-04-30 10:32:56 +00:00
parent 46619cfa23
commit 9ba59706b0
2 changed files with 7 additions and 4 deletions

View File

@ -116,8 +116,8 @@ public class TestPerfTasksLogic extends TestCase {
CountingSearchTestTask.numSearches = 0;
Benchmark benchmark = execBenchmark(algLines);
assertTrue(CountingSearchTestTask.numSearches > 0);
long elapsed = CountingSearchTestTask.lastMillis - CountingSearchTestTask.startMillis;
assertTrue("elapsed time was " + elapsed + " msec", elapsed < 2000);
long elapsed = CountingSearchTestTask.prevLastMillis - CountingSearchTestTask.startMillis;
assertTrue("elapsed time was " + elapsed + " msec", elapsed <= 1500);
}
public void testHighlighting() throws Exception {

View File

@ -27,6 +27,7 @@ public class CountingSearchTestTask extends SearchTask {
public static int numSearches = 0;
public static long startMillis;
public static long lastMillis;
public static long prevLastMillis;
public CountingSearchTestTask(PerfRunData runData) {
super(runData);
@ -39,9 +40,11 @@ public class CountingSearchTestTask extends SearchTask {
}
private static synchronized void incrNumSearches() {
prevLastMillis = lastMillis;
lastMillis = System.currentTimeMillis();
if (0 == numSearches)
startMillis = lastMillis;
if (0 == numSearches) {
startMillis = prevLastMillis = lastMillis;
}
numSearches++;
}