You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/04/27 22:04:08 UTC
[2/3] incubator-brooklyn git commit: Address PR #609 comments
Address PR #609 comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1fe61fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1fe61fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1fe61fd
Branch: refs/heads/master
Commit: a1fe61fd96cc0b8efb1622f1926b8df3ec7603d5
Parents: d9a7701
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Apr 24 15:58:16 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Apr 24 18:30:57 2015 +0300
----------------------------------------------------------------------
.../java/brooklyn/entity/basic/ServiceStateLogicTest.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1fe61fd/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java
index 0c16632..b39c585 100644
--- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java
@@ -24,7 +24,6 @@ import org.testng.annotations.Test;
import brooklyn.entity.BrooklynAppUnitTestSupport;
import brooklyn.entity.Entity;
-import brooklyn.entity.basic.EntitySubscriptionTest.RecordingSensorEventListener;
import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers;
import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic;
import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic;
@@ -33,7 +32,6 @@ import brooklyn.entity.proxying.EntitySpec;
import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.Sensors;
import brooklyn.location.Location;
-import brooklyn.location.basic.SimulatedLocation;
import brooklyn.policy.Enricher;
import brooklyn.test.EntityTestUtils;
import brooklyn.test.entity.TestEntity;
@@ -261,10 +259,7 @@ public class ServiceStateLogicTest extends BrooklynAppUnitTestSupport {
.configure(DynamicCluster.MEMBER_SPEC, EntitySpec.create(TestEntityWithoutEnrichers.class))
.configure(DynamicCluster.INITIAL_SIZE, 1));
- RecordingSensorEventListener r = new RecordingSensorEventListener();
- app.subscribe(cluster, Attributes.SERVICE_STATE_ACTUAL, r);
-
- cluster.start(ImmutableList.of(new SimulatedLocation()));
+ cluster.start(ImmutableList.of(app.newSimulatedLocation()));
EntityTestUtils.assertGroupSizeEqualsEventually(cluster, 1);
//manually set state to healthy as enrichers are disabled