Author: matthieu
Date: Wed Dec 16 15:34:15 2015
New Revision: 1720374
URL: http://svn.apache.org/viewvc?rev=1720374&view=rev
Log:
JAMES-1647 StopWatch.elapsedMillis doesn't exist anymore in recent guava
releases
Modified:
james/project/trunk/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
Modified:
james/project/trunk/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java?rev=1720374&r1=1720373&r2=1720374&view=diff
==============================================================================
---
james/project/trunk/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
(original)
+++
james/project/trunk/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java
Wed Dec 16 15:34:15 2015
@@ -127,7 +127,7 @@ public class KarafLiveTestSupport {
Object[] services = tracker.getServices();
if (services == null || services.length < expectedCount) {
final int actualCount = (services == null) ? 0 :
services.length;
- if (stopwatch.elapsedMillis() > timeoutInMilliseconds) {
+ if (stopwatch.elapsed(TimeUnit.MILLISECONDS) >
timeoutInMilliseconds) {
fail(String.format("Expected to find %d services of
type %s. Found only %d in %d milliseconds",
expectedCount, clazz.getCanonicalName(),
actualCount, timeoutInMilliseconds));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
