http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42089916/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/AbstractToyMySqlEntityTest.java index 8283637..9fb2325 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/test/mysql/AbstractToyMySqlEntityTest.java @@ -24,9 +24,9 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; -import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.system.ProcessTaskWrapper; @@ -78,12 +78,12 @@ public abstract class AbstractToyMySqlEntityTest extends BrooklynAppLiveTestSupp protected void checkStartsRunning(Entity mysql) { // should be starting within a few seconds (and almost certainly won't complete in that time) - EntityTestUtils.assertAttributeEventually( - mysql, + EntityAsserts.assertAttributeEventually( + mysql, Attributes.SERVICE_STATE_ACTUAL, Predicates.or(Predicates.equalTo(Lifecycle.STARTING), Predicates.equalTo(Lifecycle.RUNNING))); // should be up and running within 5m - EntityTestUtils.assertAttributeEqualsEventually(MutableMap.of("timeout", Duration.FIVE_MINUTES), + EntityAsserts.assertAttributeEqualsEventually(MutableMap.of("timeout", Duration.FIVE_MINUTES), mysql, Attributes.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING); }
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42089916/software/base/src/test/java/org/apache/brooklyn/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/RebindJmxFeedTest.java index bc7d3c3..5d0a52c 100644 --- a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/RebindJmxFeedTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.api.sensor.Feed; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.feed.ConfigToAttributes; import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; @@ -39,10 +40,6 @@ import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.entity.java.UsesJmx.JmxAgentModes; import org.apache.brooklyn.entity.software.base.test.jmx.GeneralisedDynamicMBean; import org.apache.brooklyn.entity.software.base.test.jmx.JmxService; -import org.apache.brooklyn.feed.jmx.JmxAttributePollConfig; -import org.apache.brooklyn.feed.jmx.JmxFeed; -import org.apache.brooklyn.feed.jmx.JmxHelper; -import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -102,7 +99,7 @@ public class RebindJmxFeedTest extends RebindTestFixtureWithApp { jmxService = new JmxService(origEntity); GeneralisedDynamicMBean mbean = jmxService.registerMBean(MutableMap.of(JMX_ATTRIBUTE_NAME, "myval"), OBJECT_NAME); - EntityTestUtils.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "myval"); + EntityAsserts.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "myval"); assertEquals(origEntity.feeds().getFeeds().size(), 1); newApp = rebind(); @@ -113,7 +110,7 @@ public class RebindJmxFeedTest extends RebindTestFixtureWithApp { // Expect the feed to still be polling newEntity.sensors().set(SENSOR_STRING, null); - EntityTestUtils.assertAttributeEqualsEventually(newEntity, SENSOR_STRING, "myval"); + EntityAsserts.assertAttributeEqualsEventually(newEntity, SENSOR_STRING, "myval"); } public static class MyEntityWithJmxFeedImpl extends TestEntityImpl { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42089916/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java index 17d7f0a..f77727e 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/feed/windows/WindowsPerformanceCounterFeedTest.java @@ -30,10 +30,10 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.core.internal.winrm.WinRmToolResponse; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; @@ -114,9 +114,9 @@ public class WindowsPerformanceCounterFeedTest extends BrooklynAppUnitTestSuppor sendPerfCountersToSensors.onSuccess(new WinRmToolResponse(responseBuilder.toString(), "", 0)); - EntityTestUtils.assertAttributeEquals(entity, stringSensor, "99.9"); - EntityTestUtils.assertAttributeEquals(entity, integerSensor, 15); - EntityTestUtils.assertAttributeEquals(entity, doubleSensor, 3.1415926); + EntityAsserts.assertAttributeEquals(entity, stringSensor, "99.9"); + EntityAsserts.assertAttributeEquals(entity, integerSensor, 15); + EntityAsserts.assertAttributeEquals(entity, doubleSensor, 3.1415926); } private void addMockResponse(StringBuilder responseBuilder, String path, String value) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/42089916/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java b/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java index 53b95c8..91caa78 100644 --- a/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java +++ b/software/winrm/src/test/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicyTest.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.location.winrm; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; @@ -44,6 +44,6 @@ public class AdvertiseWinrmLoginPolicyTest extends BrooklynAppUnitTestSupport { String expected = "myuser : mypassword @ 1.2.3.4:5678"; - EntityTestUtils.assertAttributeEqualsEventually(entity, AdvertiseWinrmLoginPolicy.VM_USER_CREDENTIALS, expected); + EntityAsserts.assertAttributeEqualsEventually(entity, AdvertiseWinrmLoginPolicy.VM_USER_CREDENTIALS, expected); } }
