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 2022/01/19 12:13:33 UTC
[brooklyn-server] branch master updated: BasicGroup instead of DynamicGroup in PropagateToMembersTest
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
The following commit(s) were added to refs/heads/master by this push:
new a7adbb8 BasicGroup instead of DynamicGroup in PropagateToMembersTest
new 3f250e1 This closes #1293
a7adbb8 is described below
commit a7adbb8c13a7dbd51ab887501a80ba84ccfa18ba
Author: Mykola Mandra <my...@cloudsoft.io>
AuthorDate: Wed Jan 19 10:38:12 2022 +0000
BasicGroup instead of DynamicGroup in PropagateToMembersTest
Signed-off-by: Mykola Mandra <my...@cloudsoft.io>
---
.../brooklyn/enricher/stock/PropagateToMembersTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/PropagateToMembersTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/PropagateToMembersTest.java
index 31ede54..cb11b5b 100644
--- a/core/src/test/java/org/apache/brooklyn/enricher/stock/PropagateToMembersTest.java
+++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/PropagateToMembersTest.java
@@ -27,7 +27,7 @@ import org.apache.brooklyn.core.entity.EntityAsserts;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.sensor.StaticSensor;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
-import org.apache.brooklyn.entity.group.DynamicGroup;
+import org.apache.brooklyn.entity.group.BasicGroup;
import org.apache.brooklyn.entity.stock.BasicEntity;
import org.apache.brooklyn.util.core.config.ConfigBag;
import org.junit.Assert;
@@ -65,7 +65,7 @@ public class PropagateToMembersTest extends BrooklynAppUnitTestSupport {
final BasicEntity memberEntity = app.createAndManageChild(EntitySpec.create(BasicEntity.class));
// Create group entity, configure enricher and set member to test propagation at.
- final DynamicGroup groupEntity = app.createAndManageChild(EntitySpec.create(DynamicGroup.class)
+ final BasicGroup groupEntity = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
.members(ImmutableList.of(memberEntity))
.addInitializer(new StaticSensor<String>(ConfigBag.newInstance(ImmutableMap.of(
StaticSensor.SENSOR_NAME, "sensor-being-modified",
@@ -93,7 +93,7 @@ public class PropagateToMembersTest extends BrooklynAppUnitTestSupport {
final BasicEntity memberEntity = app.createAndManageChild(EntitySpec.create(BasicEntity.class));
// Create group entity, configure enricher and set member to test propagation at.
- final DynamicGroup groupEntity = app.createAndManageChild(EntitySpec.create(DynamicGroup.class)
+ final BasicGroup groupEntity = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
.addInitializer(new StaticSensor<String>(ConfigBag.newInstance(ImmutableMap.of(
StaticSensor.SENSOR_NAME, "sensor-being-modified",
StaticSensor.STATIC_VALUE, sensorInitialValue))))
@@ -124,7 +124,7 @@ public class PropagateToMembersTest extends BrooklynAppUnitTestSupport {
final BasicEntity memberEntity = app.createAndManageChild(EntitySpec.create(BasicEntity.class));
// Create group entity, configure enricher and set member to test propagation at.
- final DynamicGroup groupEntity = app.createAndManageChild(EntitySpec.create(DynamicGroup.class)
+ final BasicGroup groupEntity = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
.members(ImmutableList.of(memberEntity))
.enricher(EnricherSpec.create(PropagateToMembers.class)
.configure(PropagateToMembers.PROPAGATING, ImmutableList.of(sensorToPropagate))));
@@ -158,7 +158,7 @@ public class PropagateToMembersTest extends BrooklynAppUnitTestSupport {
final BasicEntity memberEntityB = app.createAndManageChild(EntitySpec.create(BasicEntity.class));
// Create group entity, configure enricher and set member to test propagation at.
- final DynamicGroup groupEntity = app.createAndManageChild(EntitySpec.create(DynamicGroup.class)
+ final BasicGroup groupEntity = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
.members(ImmutableList.of(memberEntityA, memberEntityB))
.enricher(EnricherSpec.create(PropagateToMembers.class)
.configure(PropagateToMembers.PROPAGATING, ImmutableList.of(sensorToPropagateX, sensorToPropagateY))));
@@ -171,9 +171,11 @@ public class PropagateToMembersTest extends BrooklynAppUnitTestSupport {
groupEntity.sensors().set(sensorToPropagateX, sensorModifiedValue);
groupEntity.sensors().set(sensorToPropagateY, sensorModifiedValue);
- // Verify that sensors of the group entity and members have expected values.
+ // Verify that sensors of the group entity has expected values.
EntityAsserts.assertAttributeEqualsEventually(groupEntity, sensorToPropagateX, sensorModifiedValue);
EntityAsserts.assertAttributeEqualsEventually(groupEntity, sensorToPropagateY, sensorModifiedValue);
+
+ // Verify that sensors of the group members have expected values.
EntityAsserts.assertAttributeEqualsEventually(memberEntityA, sensorToPropagateX, sensorModifiedValue);
EntityAsserts.assertAttributeEqualsEventually(memberEntityA, sensorToPropagateY, sensorModifiedValue);
EntityAsserts.assertAttributeEqualsEventually(memberEntityB, sensorToPropagateX, sensorModifiedValue);