From 3452c65412daa91212baa9263ed702155e8386cf Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 18 Jun 2008 08:30:21 +0000
Subject: [PATCH] fix: forgotten cancellation of timers that could lead to
spurious errors when running larger test suites
SVN: 6667
---
.../cisd/common/concurrent/TimerUtilitiesTest.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/TimerUtilitiesTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/TimerUtilitiesTest.java
index ff40e6723e3..a0298631574 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/TimerUtilitiesTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/TimerUtilitiesTest.java
@@ -85,7 +85,7 @@ public class TimerUtilitiesTest
// We immediately return.
}
};
- timer.schedule(task, 50L, 1000L);
+ timer.schedule(task, 50L);
sem.acquire(); // Ensure we don't cancel() before the task is running.
timer.cancel();
assertTrue(TimerUtilities.tryJoinTimerThread(timer, 200L));
@@ -111,9 +111,10 @@ public class TimerUtilitiesTest
}
}
};
- timer.schedule(task, 0L, 200L);
+ timer.schedule(task, 0L);
sem.acquire(); // Ensure we don't cancel() before the task is running.
assertFalse(TimerUtilities.tryJoinTimerThread(timer, 100L));
+ timer.cancel(); // Ensure the timer doesn't get called again.
}
@Test
@@ -138,7 +139,7 @@ public class TimerUtilitiesTest
}
}
};
- timer.schedule(task, 0L, 1000L);
+ timer.schedule(task, 0L);
sem.acquire(); // Ensure we don't cancel() before the task is running.
timer.cancel();
assertTrue(TimerUtilities.tryInterruptTimerThread(timer));
@@ -174,6 +175,7 @@ public class TimerUtilitiesTest
assertTrue(TimerUtilities.tryInterruptTimerThread(timer));
assertFalse(TimerUtilities.tryJoinTimerThread(timer, 100L));
assertTrue(sem.tryAcquire());
+ timer.cancel(); // Ensure the timer doesn't get called again.
}
@Test
@@ -198,10 +200,11 @@ public class TimerUtilitiesTest
}
}
};
- timer.schedule(task, 0L, 1000L);
+ timer.schedule(task, 0L);
sem.acquire(); // Ensure we don't cancel() before the task is running.
assertTrue(TimerUtilities.tryShutdownTimer(timer, 100L));
assertTrue(sem.tryAcquire());
+ timer.cancel(); // Just to be sure.
}
@Test
@@ -234,9 +237,10 @@ public class TimerUtilitiesTest
}
}
};
- timer.schedule(task, 0L, 1000L);
+ timer.schedule(task, 0L);
sem.acquire(); // Ensure we don't cancel() before the task is running.
assertTrue(TimerUtilities.tryShutdownTimer(timer, 50L));
assertTrue(sem.tryAcquire());
+ timer.cancel(); // Just to be sure.
}
}
--
GitLab