Fix test expectations - apps now unmanage themselves on stop.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/30e6b443 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/30e6b443 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/30e6b443 Branch: refs/heads/master Commit: 30e6b4435c813feed48ca5fcadbf49ae6db1baff Parents: 389acac Author: Svetoslav Neykov <[email protected]> Authored: Thu Jun 11 17:43:18 2015 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Tue Jul 7 17:29:16 2015 +0300 ---------------------------------------------------------------------- .../management/usage/ApplicationUsageTrackingTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/30e6b443/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index 337391f..5f520be 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -19,6 +19,7 @@ package brooklyn.management.usage; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; @@ -190,16 +191,14 @@ public class ApplicationUsageTrackingTest { assertApplicationUsage(usage2, app); assertApplicationEvent(usage2.getEvents().get(2), Lifecycle.STOPPING, preStop, postStop); assertApplicationEvent(usage2.getEvents().get(3), Lifecycle.STOPPED, preStop, postStop); + //Apps unmanage themselves on stop + assertApplicationEvent(usage2.getEvents().get(4), Lifecycle.DESTROYED, preStop, postStop); - // Destroy - long preDestroy = System.currentTimeMillis(); - Entities.unmanage(app); - long postDestroy = System.currentTimeMillis(); + assertFalse(mgmt.getEntityManager().isManaged(app), "App should already be unmanaged"); Set<ApplicationUsage> usages3 = mgmt.getUsageManager().getApplicationUsage(Predicates.alwaysTrue()); ApplicationUsage usage3 = Iterables.getOnlyElement(usages3); assertApplicationUsage(usage3, app); - assertApplicationEvent(usage3.getEvents().get(4), Lifecycle.DESTROYED, preDestroy, postDestroy); assertEquals(usage3.getEvents().size(), 5, "usage="+usage3); }
