You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/14 17:35:58 UTC
[02/11] git commit: Fix for test
LocationUsageTrackingTest.testUsageIncludesStartAndStopEvents
Fix for test LocationUsageTrackingTest.testUsageIncludesStartAndStopEvents
It is possible to create the event in the same ms as the stopwatch:
java.lang.AssertionError: date=1404984334453; pre=1404984334448; post=1404984334453 expected [true] but found [false]
Just include the start and stop times in the allowed range. Also display the time in ms so the problem is visible.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ce8ae494
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ce8ae494
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ce8ae494
Branch: refs/heads/master
Commit: ce8ae494833545297c1e52cea7d3915a867b274c
Parents: 3bdba4f
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Jul 10 12:28:42 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jul 10 12:28:42 2014 +0300
----------------------------------------------------------------------
.../java/brooklyn/management/usage/LocationUsageTrackingTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ce8ae494/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
index 1540f89..08acd76 100644
--- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
+++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
@@ -96,7 +96,8 @@ public class LocationUsageTrackingTest extends BrooklynAppUnitTestSupport {
assertEquals(event2.getApplicationId(), app.getId());
assertEquals(event2.getEntityId(), entity.getId());
assertEquals(event2.getState(), Lifecycle.DESTROYED);
- assertTrue(event2.getDate().getTime() > preStop && event2.getDate().getTime() < postStop, "date="+event2.getDate()+"; pre="+preStop+"; post="+postStop);
+ long eventTime = event2.getDate().getTime();
+ assertTrue(eventTime >= preStop && eventTime <= postStop, "date="+eventTime+"; pre="+preStop+"; post="+postStop);
}
public static class DynamicLocalhostMachineProvisioningLocation extends LocalhostMachineProvisioningLocation {