[BROOKLYN-162] Update package name to a.o.b in usage/test-support
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9e04407d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9e04407d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9e04407d Branch: refs/heads/master Commit: 9e04407d1d3618deb720d915817da8745e9247fb Parents: fc42b17 Author: Hadrian Zbarcea <[email protected]> Authored: Thu Aug 6 19:34:12 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Thu Aug 6 19:34:12 2015 -0400 ---------------------------------------------------------------------- ...stomAggregatingEnricherDeprecatedTest.groovy | 2 +- .../enricher/CustomAggregatingEnricherTest.java | 2 +- .../java/brooklyn/enricher/EnrichersTest.java | 4 +- ...SensorPropagatingEnricherDeprecatedTest.java | 2 +- .../enricher/SensorPropagatingEnricherTest.java | 2 +- .../TransformingEnricherDeprecatedTest.groovy | 2 +- .../enricher/TransformingEnricherTest.java | 2 +- .../entity/EntityPreManagementTest.java | 2 +- .../brooklyn/entity/basic/DataEntityTest.java | 2 +- .../basic/DependentConfigurationTest.java | 2 +- .../entity/basic/PolicyRegistrationTest.java | 2 +- .../entity/basic/ServiceStateLogicTest.java | 2 +- .../entity/effector/EffectorBasicTest.java | 2 +- .../entity/group/DynamicClusterTest.java | 4 +- .../entity/group/DynamicFabricTest.java | 2 +- .../entity/group/GroupPickUpEntitiesTest.java | 2 +- .../entity/rebind/RebindEnricherTest.java | 2 +- .../entity/rebind/RebindEntityTest.java | 4 +- .../brooklyn/entity/rebind/RebindFeedTest.java | 2 +- .../entity/rebind/RebindFeedWithHaTest.java | 2 +- .../event/feed/function/FunctionFeedTest.java | 2 +- .../feed/http/HttpFeedIntegrationTest.java | 2 +- .../feed/shell/ShellFeedIntegrationTest.java | 2 +- .../event/feed/ssh/SshFeedIntegrationTest.java | 2 +- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- .../WindowsPerformanceCounterFeedTest.java | 2 +- .../SshMachineLocationPerformanceTest.java | 2 +- .../brooklyn/management/ha/HotStandbyTest.java | 2 +- .../EntityPersistencePerformanceTest.java | 2 +- ...lusterDatabaseExampleAppIntegrationTest.java | 7 +- .../os/AdvertiseWinrmLoginPolicyTest.java | 2 +- .../policy/os/CreateUserPolicyLiveTest.java | 2 +- .../policy/os/CreateUserPolicyTest.java | 2 +- .../enricher/HttpLatencyDetectorTest.java | 2 +- .../brooklyn/enricher/RebindEnricherTest.java | 2 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 2 +- .../policy/ha/ServiceFailureDetectorTest.java | 2 +- .../brooklyn/policy/ha/ServiceReplacerTest.java | 2 +- ...ctSoftwareProcessRestartIntegrationTest.java | 2 +- .../basic/SoftwareProcessEntityRebindTest.java | 2 +- .../entity/basic/SoftwareProcessEntityTest.java | 2 +- ...ftwareProcessAndChildrenIntegrationTest.java | 2 +- .../basic/lifecycle/ScriptHelperTest.java | 2 +- .../BrooklynClusterIntegrationTest.java | 2 +- .../BrooklynNodeIntegrationTest.java | 4 +- .../brooklynnode/SelectMasterEffectorTest.java | 2 +- .../brooklyn/entity/java/EntityPollingTest.java | 2 +- .../entity/java/VanillaJavaAppRebindTest.java | 2 +- .../entity/machine/MachineEntityRebindTest.java | 2 +- .../entity/pool/AbstractServerPoolTest.java | 2 +- .../brooklyn/entity/pool/ServerPoolTest.java | 2 +- .../entity/software/StaticSensorTest.java | 2 +- .../software/http/HttpRequestSensorTest.java | 2 +- .../mysql/AbstractToyMySqlEntityTest.java | 2 +- .../software/ssh/SshCommandIntegrationTest.java | 2 +- .../brooklyn/event/feed/jmx/JmxFeedTest.java | 4 +- .../brooklyn/event/feed/jmx/JmxHelperTest.java | 2 +- .../event/feed/jmx/RebindJmxFeedTest.java | 2 +- .../basic/MachineDetailsEc2LiveTest.java | 2 +- .../MachineDetailsGoogleComputeLiveTest.java | 2 +- .../crate/CrateNodeIntegrationTest.java | 2 +- .../PostgreSqlRebindIntegrationTest.java | 2 +- .../messaging/activemq/ActiveMQEc2LiveTest.java | 2 +- .../activemq/ActiveMQGoogleComputeLiveTest.java | 4 +- .../activemq/ActiveMQIntegrationTest.java | 2 +- .../messaging/kafka/KafkaIntegrationTest.java | 2 +- .../entity/messaging/qpid/QpidEc2LiveTest.java | 2 +- .../messaging/qpid/QpidIntegrationTest.java | 4 +- .../messaging/rabbit/RabbitEc2LiveTest.java | 2 +- .../messaging/rabbit/RabbitIntegrationTest.java | 2 +- .../storm/StormAbstractCloudLiveTest.java | 2 +- .../messaging/storm/StormEc2LiveTest.java | 2 +- .../zookeeper/ZooKeeperEc2LiveTest.java | 2 +- .../zookeeper/ZooKeeperEnsembleLiveTest.java | 4 +- .../monitoring/monit/MonitIntegrationTest.java | 2 +- .../bind/BindDnsServerIntegrationTest.java | 2 +- .../network/bind/BindDnsServerLiveTest.java | 2 +- .../CassandraDatacenterIntegrationTest.java | 2 +- .../cassandra/CassandraDatacenterLiveTest.java | 2 +- ...assandraDatacenterRebindIntegrationTest.java | 2 +- .../cassandra/CassandraDatacenterTest.java | 2 +- .../nosql/cassandra/CassandraFabricTest.java | 2 +- .../cassandra/CassandraNodeEc2LiveTest.java | 2 +- .../cassandra/CassandraNodeIntegrationTest.java | 4 +- .../nosql/cassandra/CassandraNodeLiveTest.java | 2 +- .../CouchbaseSyncGatewayEc2LiveTest.java | 2 +- .../nosql/couchdb/CouchDBClusterLiveTest.java | 2 +- .../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 2 +- .../couchdb/CouchDBNodeIntegrationTest.java | 2 +- .../nosql/couchdb/CouchDBNodeLiveTest.java | 2 +- .../ElasticSearchClusterIntegrationTest.java | 2 +- .../ElasticSearchNodeIntegrationTest.java | 2 +- .../nosql/mongodb/MongoDBEc2LiveTest.java | 4 +- .../nosql/mongodb/MongoDBIntegrationTest.java | 2 +- .../mongodb/MongoDBRebindIntegrationTest.java | 2 +- .../nosql/mongodb/MongoDBSoftLayerLiveTest.java | 2 +- .../MongoDBConfigServerIntegrationTest.java | 2 +- ...MongoDBShardedDeploymentIntegrationTest.java | 2 +- .../redis/RedisClusterIntegrationTest.java | 2 +- .../entity/nosql/redis/RedisEc2LiveTest.java | 2 +- .../nosql/redis/RedisIntegrationTest.java | 2 +- .../nosql/riak/RiakClusterEc2LiveTest.java | 2 +- .../entity/nosql/riak/RiakNodeEc2LiveTest.java | 2 +- .../riak/RiakNodeGoogleComputeLiveTest.java | 2 +- .../nosql/riak/RiakNodeIntegrationTest.java | 2 +- .../nosql/riak/RiakNodeSoftlayerLiveTest.java | 2 +- .../nosql/solr/SolrServerEc2LiveTest.java | 2 +- .../nosql/solr/SolrServerIntegrationTest.java | 2 +- .../entity/nosql/solr/SolrServerLiveTest.java | 2 +- .../osgi/karaf/KarafContainerEc2LiveTest.java | 2 +- .../entity/osgi/karaf/KarafContainerTest.java | 2 +- .../entity/dns/AbstractGeoDnsServiceTest.java | 2 +- .../nginx/NginxClusterIntegrationTest.java | 4 +- .../entity/proxy/nginx/NginxEc2LiveTest.java | 4 +- .../nginx/NginxHttpsSslIntegrationTest.java | 2 +- .../proxy/nginx/NginxIntegrationTest.java | 10 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 11 +- .../nginx/NginxRebindWithHaIntegrationTest.java | 4 +- .../nginx/NginxUrlMappingIntegrationTest.java | 3 +- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 2 +- .../AbstractWebAppFixtureIntegrationTest.java | 9 +- ...lledDynamicWebAppClusterIntegrationTest.java | 5 +- .../ControlledDynamicWebAppClusterTest.java | 2 +- .../entity/webapp/DynamicWebAppClusterTest.java | 2 +- .../entity/webapp/DynamicWebAppFabricTest.java | 2 +- ...ElasticJavaWebAppServiceIntegrationTest.java | 2 +- .../webapp/TomcatAutoScalerPolicyTest.java | 2 +- .../webapp/WebAppConcurrentDeployTest.java | 4 +- .../webapp/WebAppLiveIntegrationTest.groovy | 4 +- ...namicWebAppClusterRebindIntegrationTest.java | 8 +- ...namicWebAppClusterRebindIntegrationTest.java | 8 +- .../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +- ...Boss6ServerNonInheritingIntegrationTest.java | 2 +- .../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +- .../jboss/JBoss7ServerDockerLiveTest.java | 5 +- ...Boss7ServerNonInheritingIntegrationTest.java | 4 +- .../JBoss7ServerRebindingIntegrationTest.java | 6 +- .../Jboss7ServerGoogleComputeLiveTest.java | 2 +- .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 2 +- .../NodeJsWebAppFixtureIntegrationTest.java | 6 +- .../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 2 +- .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 3 +- .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 3 +- .../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +- .../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +- .../EnrichersSlightlySimplerYamlTest.java | 2 +- .../brooklyn/JavaWebAppsIntegrationTest.java | 3 +- .../brooklyn/ReloadBrooklynPropertiesTest.java | 2 +- .../brooklyn/VanillaBashNetcatYamlTest.java | 2 +- .../BrooklynJavascriptGuiLauncherTest.java | 2 +- .../BrooklynEntityMirrorIntegrationTest.java | 4 +- .../brooklynnode/BrooklynNodeRestTest.java | 4 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 2 +- .../brooklyn/launcher/WebAppRunnerTest.java | 2 +- .../blueprints/AbstractBlueprintTest.java | 2 +- .../SoftlayerObtainPrivateLiveTest.java | 2 +- .../org/apache/brooklyn/qa/load/LoadTest.java | 3 +- .../rest/client/BrooklynApiRestClientTest.java | 2 +- .../brooklynnode/DeployBlueprintTest.java | 2 +- .../rest/BrooklynRestApiLauncherTest.java | 2 +- .../rest/resources/ApplicationResourceTest.java | 2 +- .../rest/resources/EntityResourceTest.java | 2 +- .../SensorResourceIntegrationTest.java | 2 +- .../rest/resources/SensorResourceTest.java | 2 +- .../ServerResourceIntegrationTest.java | 2 +- .../rest/resources/ServerShutdownTest.java | 2 +- .../java/brooklyn/test/EntityTestUtils.java | 180 ------ .../main/java/brooklyn/test/HttpTestUtils.java | 391 -------------- .../java/brooklyn/test/NetworkingTestUtils.java | 68 --- .../brooklyn/test/PerformanceTestUtils.java | 99 ---- .../main/java/brooklyn/test/TestUtils.groovy | 540 ------------------ .../brooklyn/test/TrustingSslSocketFactory.java | 134 ----- .../main/java/brooklyn/test/WebAppMonitor.java | 213 -------- .../apache/brooklyn/test/EntityTestUtils.java | 181 +++++++ .../org/apache/brooklyn/test/HttpTestUtils.java | 392 ++++++++++++++ .../brooklyn/test/NetworkingTestUtils.java | 69 +++ .../brooklyn/test/PerformanceTestUtils.java | 99 ++++ .../org/apache/brooklyn/test/TestUtils.groovy | 541 +++++++++++++++++++ .../brooklyn/test/TrustingSslSocketFactory.java | 134 +++++ .../org/apache/brooklyn/test/WebAppMonitor.java | 214 ++++++++ 180 files changed, 1855 insertions(+), 1828 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy index adba709..234db70 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy @@ -33,7 +33,7 @@ import brooklyn.entity.proxying.EntitySpec import brooklyn.event.AttributeSensor import brooklyn.event.basic.BasicAttributeSensor import brooklyn.location.basic.SimulatedLocation -import brooklyn.test.TestUtils +import org.apache.brooklyn.test.TestUtils import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication import brooklyn.test.entity.TestEntity http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java index 70d0c10..280f11b 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher; import java.util.Collection; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -34,7 +35,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/EnrichersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/EnrichersTest.java b/core/src/test/java/brooklyn/enricher/EnrichersTest.java index b20f722..dbf544f 100644 --- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java +++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java @@ -30,14 +30,16 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityAdjuncts; + import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.EntityTestUtils; + import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.basic.Sensors; import brooklyn.policy.Enricher; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java index 4941273..ff8a80c 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.javalang.AtomicReferences; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java index 38c72c6..5bca552 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java @@ -20,6 +20,7 @@ package brooklyn.enricher; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; import brooklyn.policy.EnricherSpec; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy index f880232..3a9b0ce 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy @@ -34,7 +34,7 @@ import brooklyn.entity.proxying.EntitySpec import brooklyn.event.AttributeSensor import brooklyn.event.basic.BasicAttributeSensor import brooklyn.location.basic.SimulatedLocation -import brooklyn.test.TestUtils +import org.apache.brooklyn.test.TestUtils import brooklyn.test.entity.TestApplication import brooklyn.test.entity.TestEntity import brooklyn.util.collections.MutableMap http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java b/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java index 1f14da9..adf7c0d 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java @@ -18,6 +18,7 @@ */ package brooklyn.enricher; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -28,7 +29,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.math.MathFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java index 8e5d466..9bbad13 100644 --- a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java +++ b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java @@ -21,6 +21,7 @@ package brooklyn.entity; import java.util.ArrayList; import java.util.List; +import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.management.EntityManager; import brooklyn.management.ManagementContext; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.TestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java index 008b1df..ff009fe 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.ManagementContext; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java index 709ed8d..bc1d712 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -40,7 +41,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.DependentConfiguration; import brooklyn.management.Task; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java index 168f72c..279c2c7 100644 --- a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.fail; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.test.TestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +37,6 @@ import brooklyn.policy.EnricherSpec; import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.TestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityNoEnrichersImpl; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/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 ae1e1a0..256cd99 100644 --- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.policy.Enricher; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import brooklyn.util.collections.QuorumCheck.QuorumChecks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java index 66618f8..58f0bb5 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.effector; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -37,7 +38,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.HasTaskChildren; import brooklyn.management.Task; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.TestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java index b8a1839..a7b0bec 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -51,7 +51,10 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityFactory; import brooklyn.entity.basic.Lifecycle; + import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.EntityTestUtils; + import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Changeable; @@ -61,7 +64,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.Task; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java index 40131ab..a52b84f 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -50,7 +51,6 @@ import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.Task; import brooklyn.test.Asserts; -import brooklyn.test.TestUtils; import brooklyn.test.entity.BlockingEntity; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java index afdb528..b1a51a0 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.group; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +37,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.policy.PolicySpec; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.javalang.Boxing; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java index f2fc6da..cf30366 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -26,6 +26,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Map; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -48,7 +49,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.Enricher; import brooklyn.policy.EnricherSpec; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java index 9b1e05d..280d06f 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -18,8 +18,8 @@ */ package brooklyn.entity.rebind; -import static brooklyn.test.EntityTestUtils.assertAttributeEquals; -import static brooklyn.test.EntityTestUtils.assertConfigEquals; +import static org.apache.brooklyn.test.EntityTestUtils.assertAttributeEquals; +import static org.apache.brooklyn.test.EntityTestUtils.assertConfigEquals; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java index 4f5acd1..9459e89 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java @@ -24,6 +24,7 @@ import java.net.URL; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -51,7 +52,6 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.BrooklynGarbageCollector; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java index 2c9c69b..25ea808 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.management.Task; import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.http.BetterMockWebServer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java index 468239b..7e98acd 100644 --- a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -49,7 +50,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java index 2675837..6252e77 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +37,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.HttpService; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java index 4d2ed42..03ffa59 100644 --- a/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.Arrays; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,7 +43,6 @@ import brooklyn.event.feed.ssh.SshPollValue; import brooklyn.event.feed.ssh.SshValueFunctions; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java b/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java index 16bab62..fc9207e 100644 --- a/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.event.feed.ssh; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -40,7 +41,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java index 9a9210f..2d313f8 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -20,6 +20,7 @@ package brooklyn.event.feed.windows; import java.util.Map; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.MachineLocation; import brooklyn.location.MachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java index f4ba43b..7a38659 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java @@ -26,6 +26,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Iterator; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -39,7 +40,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.text.Strings; import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/location/basic/SshMachineLocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationPerformanceTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationPerformanceTest.java index 0143e66..5f265ee 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationPerformanceTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationPerformanceTest.java @@ -25,13 +25,13 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.PerformanceTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.test.PerformanceTestUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java index f33f716..2259db4 100644 --- a/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java +++ b/core/src/test/java/brooklyn/management/ha/HotStandbyTest.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -56,7 +57,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import brooklyn.management.internal.AbstractManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java index 3baeb60..1d54bc8 100644 --- a/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java +++ b/core/src/test/java/brooklyn/qa/performance/EntityPersistencePerformanceTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.PerformanceTestUtils; import org.testng.annotations.Test; import brooklyn.entity.proxying.EntitySpec; @@ -30,7 +31,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.Policy; import brooklyn.policy.PolicySpec; -import brooklyn.test.PerformanceTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java index f032d95..726d36e 100644 --- a/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java +++ b/examples/simple-web-cluster/src/test/java/org/apache/brooklyn/demo/RebindWebClusterDatabaseExampleAppIntegrationTest.java @@ -19,6 +19,10 @@ package org.apache.brooklyn.demo; import org.apache.brooklyn.demo.WebClusterDatabaseExampleApp; +import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.HttpTestUtils; +import org.apache.brooklyn.test.WebAppMonitor; + import static com.google.common.base.Preconditions.checkNotNull; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -55,9 +59,6 @@ import brooklyn.location.Location; import brooklyn.policy.Enricher; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; -import brooklyn.test.HttpTestUtils; -import brooklyn.test.WebAppMonitor; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java index 2bc43c7..93e5c11 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/AdvertiseWinrmLoginPolicyTest.java @@ -18,6 +18,7 @@ */ package brooklyn.policy.os; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; @@ -25,7 +26,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.WinRmMachineLocation; import brooklyn.policy.PolicySpec; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java index 2913096..eaa8b2f 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyLiveTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -37,7 +38,6 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.policy.PolicySpec; import brooklyn.policy.os.CreateUserPolicy; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java index 855d994..833214e 100644 --- a/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java +++ b/locations/jclouds/src/test/java/brooklyn/policy/os/CreateUserPolicyTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -38,7 +39,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; import brooklyn.policy.PolicySpec; import brooklyn.policy.os.CreateUserPolicy; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestEntity; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java index b8504ad..b62cf48 100644 --- a/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java +++ b/policy/src/test/java/brooklyn/enricher/HttpLatencyDetectorTest.java @@ -21,6 +21,7 @@ package brooklyn.enricher; import java.net.URL; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -34,7 +35,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java index dc08e19..762a9fd 100644 --- a/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java +++ b/policy/src/test/java/brooklyn/enricher/RebindEnricherTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertNotNull; import java.net.URL; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.util.http.BetterMockWebServer; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java index 7191030..ba7d249 100644 --- a/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java +++ b/policy/src/test/java/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,7 +36,6 @@ import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java index 7250e8e..f8c80bc 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceFailureDetectorTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -46,7 +47,6 @@ import brooklyn.management.ManagementContext; import brooklyn.policy.EnricherSpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java index 8d2fb86..b1bd375 100644 --- a/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/brooklyn/policy/ha/ServiceReplacerTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -54,7 +55,6 @@ import brooklyn.management.ManagementContext; import brooklyn.policy.PolicySpec; import brooklyn.policy.ha.HASensors.FailureDescriptor; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java index d70ed76..79f3eca 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/AbstractSoftwareProcessRestartIntegrationTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.basic; import java.util.Map; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.SoftwareProcess.RestartSoftwareParameters; import brooklyn.entity.basic.SoftwareProcess.StopSoftwareParameters; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.util.collections.CollectionFunctionals; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java index 6911790..6fe4183 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityRebindTest.java @@ -28,6 +28,7 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -43,7 +44,6 @@ import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.AbstractLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.ManagementContext; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java index 4d2e7fd..0693d7e 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessEntityTest.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.jclouds.util.Throwables2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,7 +69,6 @@ import brooklyn.management.EntityManager; import brooklyn.management.Task; import brooklyn.management.TaskAdaptable; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index ae2ae62..2ad2ef7 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.basic; import java.util.Collections; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess.ChildStartableMode; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java index 971e22c..9e52e15 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/ScriptHelperTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,7 +43,6 @@ import brooklyn.event.feed.function.FunctionPollConfig; import brooklyn.location.LocationSpec; import brooklyn.location.basic.FixedListMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.util.time.Duration; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java index d623a38..fcbd753 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynClusterIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.brooklynnode; import java.io.File; import java.util.List; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -32,7 +33,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.brooklynnode.BrooklynNode.ExistingFileBehaviour; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java index 182c24a..04b375a 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeIntegrationTest.java @@ -31,6 +31,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.HttpTestUtils; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.slf4j.Logger; @@ -62,8 +64,6 @@ import brooklyn.location.basic.Locations; import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; -import brooklyn.test.EntityTestUtils; -import brooklyn.test.HttpTestUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java index 84b763d..cd3c18d 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/SelectMasterEffectorTest.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.EntityTestUtils; import org.apache.http.client.methods.HttpPost; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +50,6 @@ import brooklyn.event.feed.AttributePollHandler; import brooklyn.event.feed.DelegatingPollHandler; import brooklyn.event.feed.Poller; import brooklyn.management.ha.ManagementNodeState; -import brooklyn.test.EntityTestUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java index 4b6f1fb..333df4d 100644 --- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.java; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -36,7 +37,6 @@ import brooklyn.event.feed.jmx.JmxAttributePollConfig; import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.location.MachineLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.JmxService; import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index 4600cd7..dbe4047 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/machine/MachineEntityRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityRebindTest.java b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityRebindTest.java index 1153ff9..0312b42 100644 --- a/software/base/src/test/java/brooklyn/entity/machine/MachineEntityRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/machine/MachineEntityRebindTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.machine; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; @@ -28,7 +29,6 @@ import brooklyn.entity.basic.EmptySoftwareProcess; import brooklyn.entity.basic.Lifecycle; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; -import brooklyn.test.EntityTestUtils; public class MachineEntityRebindTest extends RebindTestFixtureWithApp { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index 5575e87..16e6aa0 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.fail; import java.util.List; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -36,7 +37,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.ManagementContext; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java index 962400f..7a64dff 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Iterator; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java index 4b9a641..2af8a07 100644 --- a/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/StaticSensorTest.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.software; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.Sensors; -import brooklyn.test.EntityTestUtils; import brooklyn.util.config.ConfigBag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index de60fb1..ba11077 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.software.http; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; import brooklyn.test.entity.TestApplication; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java index 43f1f16..d884abc 100644 --- a/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/mysql/AbstractToyMySqlEntityTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.software.mysql; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -33,7 +34,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index c3358f2..caff43a 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -37,7 +38,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java index 9b8c916..663aba9 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java @@ -18,7 +18,7 @@ */ package brooklyn.event.feed.jmx; -import static brooklyn.test.TestUtils.executeUntilSucceeds; +import static org.apache.brooklyn.test.TestUtils.executeUntilSucceeds; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -41,6 +41,7 @@ import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; +import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -70,7 +71,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.test.TestUtils; import brooklyn.test.entity.TestApplication; import brooklyn.test.entity.TestApplicationImpl; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java index 5985f98..fda9f15 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxHelperTest.java @@ -33,6 +33,7 @@ import javax.management.NotificationListener; import javax.management.ObjectName; import javax.management.StandardEmitterMBean; +import org.apache.brooklyn.test.TestUtils; import org.jclouds.util.Throwables2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +44,6 @@ import org.testng.collections.Lists; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.test.TestUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java index 4e82e74..2234e99 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.Collection; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -42,7 +43,6 @@ import brooklyn.event.feed.ConfigToAttributes; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; -import brooklyn.test.EntityTestUtils; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; import brooklyn.test.entity.TestEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java index 06f7634..47694b0 100644 --- a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsEc2LiveTest.java @@ -21,6 +21,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.MachineDetails; import brooklyn.location.OsDetails; -import brooklyn.test.EntityTestUtils; import brooklyn.util.collections.MutableMap; // This test really belongs in brooklyn-location but depends on AbstractEc2LiveTest in brooklyn-software-base http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java index ae52709..f0fa949 100644 --- a/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/location/basic/MachineDetailsGoogleComputeLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.MachineDetails; import brooklyn.location.OsDetails; -import brooklyn.test.EntityTestUtils; import brooklyn.util.collections.MutableMap; // This test really belongs in brooklyn-location but depends on AbstractGoogleComputeLiveTest in brooklyn-software-base http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java index 839fd3f..a8f7be3 100644 --- a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.database.crate; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; public class CrateNodeIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java index b58e685..d74cb15 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlRebindIntegrationTest.java @@ -18,13 +18,13 @@ */ package brooklyn.entity.database.postgresql; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.EntityTestUtils; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java index 69bc238..5d1c0fa 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQEc2LiveTest.java @@ -28,13 +28,13 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import brooklyn.entity.AbstractEc2LiveTest; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java index 2813026..eebde2f 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQGoogleComputeLiveTest.java @@ -22,9 +22,11 @@ import brooklyn.entity.AbstractGoogleComputeLiveTest; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; + import com.google.common.collect.ImmutableList; + import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.Test; import javax.jms.Connection; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9e04407d/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java index 2434fda..dd0837b 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java @@ -31,6 +31,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.brooklyn.test.EntityTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -45,7 +46,6 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.test.EntityTestUtils; import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList;
