(brooklyn-server) branch master updated: add conveniences for entity tests

[heneveld]

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 531a72de93 add conveniences for entity tests
531a72de93 is described below

commit 531a72de93496435a70e25c44e121d6b88fd6581
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Sat Jun 1 02:09:11 2024 +0100

    add conveniences for entity tests
---
 .../main/java/org/apache/brooklyn/core/entity/EntityAsserts.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAsserts.java 
b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAsserts.java
index 836ca17c19..74436f3b51 100644
--- a/core/src/main/java/org/apache/brooklyn/core/entity/EntityAsserts.java
+++ b/core/src/main/java/org/apache/brooklyn/core/entity/EntityAsserts.java
@@ -32,7 +32,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor;
 import org.apache.brooklyn.api.sensor.SensorEvent;
 import org.apache.brooklyn.api.sensor.SensorEventListener;
 import org.apache.brooklyn.config.ConfigKey;
+import org.apache.brooklyn.core.config.ConfigKeys;
 import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
+import org.apache.brooklyn.core.sensor.Sensors;
 import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.time.Duration;
@@ -58,10 +60,16 @@ public class EntityAsserts {
     public static <T> void assertAttributeEquals(Entity entity, 
AttributeSensor<T> attribute, T expected) {
         assertEquals(entity.getAttribute(attribute), expected, "entity=" + 
entity + "; attribute=" + attribute);
     }
+    public static <T> void assertAttributeEquals(Entity entity, String 
attributeName, T expected) {
+        assertAttributeEquals(entity, Sensors.newSensor(Object.class, 
attributeName), expected);
+    }
 
     public static <T> void assertConfigEquals(Entity entity, ConfigKey<T> 
configKey, T expected) {
         assertEquals(entity.getConfig(configKey), expected, "entity=" + entity 
+ "; configKey=" + configKey);
     }
+    public static <T> void assertConfigEquals(Entity entity, String 
configKeyName, T expected) {
+        assertConfigEquals(entity, ConfigKeys.newConfigKey(Object.class, 
configKeyName), expected);
+    }
 
     public static <T> void assertAttributeEqualsEventually(final Entity 
entity, final AttributeSensor<T> attribute, final T expected) {
         assertAttributeEqualsEventually(Maps.newLinkedHashMap(), entity, 
attribute, expected);