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:36:03 UTC
[07/11] git commit: Fix occasionally failing test,
check for start and stop times inclusively.
Fix occasionally failing test, check for start and stop times inclusively.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b365c225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b365c225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b365c225
Branch: refs/heads/master
Commit: b365c225964f69e927c5811f8fd3a67a9460f7f6
Parents: 6997575
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jul 11 10:37:32 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jul 11 10:37:32 2014 +0300
----------------------------------------------------------------------
.../brooklyn/management/usage/LocationUsageTrackingTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b365c225/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 08acd76..1b12ee4 100644
--- a/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
+++ b/software/base/src/test/java/brooklyn/management/usage/LocationUsageTrackingTest.java
@@ -79,7 +79,8 @@ public class LocationUsageTrackingTest extends BrooklynAppUnitTestSupport {
assertEquals(event1.getApplicationId(), app.getId());
assertEquals(event1.getEntityId(), entity.getId());
assertEquals(event1.getState(), Lifecycle.CREATED);
- assertTrue(event1.getDate().getTime() > preStart && event1.getDate().getTime() < postStart, "date="+event1.getDate()+"; pre="+preStart+"; post="+postStart);
+ long event1Time = event1.getDate().getTime();
+ assertTrue(event1Time >= preStart && event1Time <= postStart, "event1="+event1Time+"; pre="+preStart+"; post="+postStart);
// Stop the app; expect record of location no longer in use
long preStop = System.currentTimeMillis();
@@ -96,8 +97,8 @@ public class LocationUsageTrackingTest extends BrooklynAppUnitTestSupport {
assertEquals(event2.getApplicationId(), app.getId());
assertEquals(event2.getEntityId(), entity.getId());
assertEquals(event2.getState(), Lifecycle.DESTROYED);
- long eventTime = event2.getDate().getTime();
- assertTrue(eventTime >= preStop && eventTime <= postStop, "date="+eventTime+"; pre="+preStop+"; post="+postStop);
+ long event2Time = event2.getDate().getTime();
+ assertTrue(event2Time >= preStop && event2Time <= postStop, "event2="+event2Time+"; pre="+preStop+"; post="+postStop);
}
public static class DynamicLocalhostMachineProvisioningLocation extends LocalhostMachineProvisioningLocation {