Renaming brooklyn.test.entity.* Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d702c5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d702c5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d702c5b
Branch: refs/heads/master Commit: 0d702c5b1549640bb4eda9e4879d89187d9a0550 Parents: 77dff88 Author: Yavor Yanchev <[email protected]> Authored: Wed Aug 12 15:57:10 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Wed Aug 12 15:57:10 2015 +0300 ---------------------------------------------------------------------- .../test/java/brooklyn/BrooklynVersionTest.java | 3 +- .../brooklyn/camp/lite/CampYamlLiteTest.java | 6 +- .../brooklyn/camp/lite/TestAppAssembly.java | 3 +- .../camp/lite/TestAppAssemblyInstantiator.java | 4 +- .../catalog/internal/CatalogDtoTest.java | 7 +- .../catalog/internal/CatalogVersioningTest.java | 3 +- ...stomAggregatingEnricherDeprecatedTest.groovy | 6 +- .../enricher/CustomAggregatingEnricherTest.java | 2 +- .../java/brooklyn/enricher/EnrichersTest.java | 2 +- ...SensorPropagatingEnricherDeprecatedTest.java | 2 +- .../enricher/SensorPropagatingEnricherTest.java | 2 +- .../TransformingEnricherDeprecatedTest.groovy | 4 +- .../enricher/TransformingEnricherTest.java | 2 +- .../enricher/basic/BasicEnricherTest.java | 4 +- .../entity/BrooklynAppLiveTestSupport.java | 4 +- .../entity/BrooklynAppUnitTestSupport.java | 4 +- .../entity/EffectorSayHiGroovyTest.groovy | 2 +- .../entity/EntityPreManagementTest.java | 6 +- .../basic/AbstractApplicationLegacyTest.java | 4 +- .../entity/basic/AbstractEntityLegacyTest.java | 6 +- .../brooklyn/entity/basic/AttributeMapTest.java | 4 +- .../brooklyn/entity/basic/AttributeTest.java | 2 +- .../entity/basic/BasicStartableTest.java | 6 +- .../entity/basic/BrooklynShutdownHooksTest.java | 4 +- .../basic/ConfigEntityInheritanceTest.java | 2 +- .../entity/basic/ConfigMapGroovyTest.groovy | 2 +- .../brooklyn/entity/basic/DataEntityTest.java | 4 +- .../basic/DependentConfigurationTest.java | 2 +- .../entity/basic/DynamicEntityTest.java | 2 +- .../brooklyn/entity/basic/DynamicGroupTest.java | 4 +- .../brooklyn/entity/basic/EntitiesTest.java | 2 +- .../basic/EntityConfigMapUsageLegacyTest.java | 4 +- .../entity/basic/EntityConfigMapUsageTest.java | 2 +- .../brooklyn/entity/basic/EntityConfigTest.java | 2 +- .../entity/basic/EntityFunctionsTest.java | 2 +- .../entity/basic/EntityPredicatesTest.java | 2 +- .../entity/basic/EntityRegistrationTest.java | 2 +- .../brooklyn/entity/basic/EntitySpecTest.java | 6 +- .../entity/basic/EntitySubscriptionTest.java | 4 +- .../entity/basic/EntitySuppliersTest.java | 2 +- .../brooklyn/entity/basic/EntityTypeTest.java | 4 +- .../basic/MapConfigKeyAndFriendsMoreTest.java | 2 +- ...apListAndOtherStructuredConfigKeyTest.groovy | 4 +- .../entity/basic/PolicyRegistrationTest.java | 4 +- .../entity/basic/ServiceStateLogicTest.java | 4 +- .../drivers/EntityDriverRegistryTest.java | 2 +- .../downloads/BasicDownloadsRegistryTest.java | 4 +- .../DownloadProducerFromLocalRepoTest.java | 4 +- .../DownloadProducerFromPropertiesTest.java | 4 +- .../downloads/DownloadSubstitutersTest.java | 2 +- .../entity/effector/EffectorBasicTest.java | 2 +- .../effector/EffectorConcatenateTest.java | 4 +- .../entity/effector/EffectorTaskTest.java | 2 +- .../entity/group/DynamicClusterTest.java | 4 +- ...DynamicClusterWithAvailabilityZonesTest.java | 2 +- .../entity/group/DynamicFabricTest.java | 4 +- .../entity/group/DynamicMultiGroupTest.java | 6 +- .../entity/group/DynamicRegionsFabricTest.java | 2 +- .../entity/group/GroupPickUpEntitiesTest.java | 2 +- .../java/brooklyn/entity/group/GroupTest.java | 2 +- .../group/MembershipTrackingPolicyTest.java | 2 +- .../entity/group/QuarantineGroupTest.java | 2 +- .../BalancingNodePlacementStrategyTest.java | 2 +- .../ProportionalZoneFailureDetectorTest.java | 2 +- .../ApplicationBuilderOverridingTest.java | 6 +- .../entity/proxying/EntityManagerTest.java | 6 +- .../entity/proxying/EntityProxyTest.java | 2 +- .../proxying/InternalEntityFactoryTest.java | 10 +- .../entity/rebind/ActivePartialRebindTest.java | 2 +- .../entity/rebind/RebindCatalogItemTest.java | 2 +- ...talogWhenCatalogPersistenceDisabledTest.java | 3 +- .../entity/rebind/RebindEnricherTest.java | 6 +- .../rebind/RebindEntityDynamicTypeInfoTest.java | 4 +- .../entity/rebind/RebindEntityTest.java | 6 +- .../entity/rebind/RebindFailuresTest.java | 2 +- .../brooklyn/entity/rebind/RebindFeedTest.java | 4 +- .../entity/rebind/RebindFeedWithHaTest.java | 4 +- .../brooklyn/entity/rebind/RebindGroupTest.java | 2 +- .../rebind/RebindLocalhostLocationTest.java | 2 +- .../entity/rebind/RebindLocationTest.java | 2 +- .../entity/rebind/RebindManagerSorterTest.java | 4 +- .../entity/rebind/RebindManagerTest.java | 4 +- .../entity/rebind/RebindPolicyTest.java | 4 +- .../rebind/RebindSshMachineLocationTest.java | 2 +- .../entity/rebind/RebindTestFixtureWithApp.java | 5 +- .../brooklyn/entity/rebind/RebindTestUtils.java | 2 +- ...ntoPersisterInMemorySizeIntegrationTest.java | 2 +- .../BrooklynMementoPersisterTestFixture.java | 4 +- .../persister/FileBasedObjectStoreTest.java | 2 +- .../persister/XmlMementoSerializerTest.java | 6 +- .../transformer/CompoundTransformerTest.java | 2 +- .../brooklyn/entity/trait/FailingEntity.java | 3 +- .../entity/trait/FailingEntityImpl.java | 2 +- .../entity/trait/StartableMethodsTest.java | 2 +- .../event/feed/ConfigToAttributesTest.java | 4 +- .../java/brooklyn/event/feed/PollerTest.java | 2 +- .../event/feed/function/FunctionFeedTest.java | 2 +- .../feed/http/HttpFeedIntegrationTest.java | 2 +- .../brooklyn/event/feed/http/HttpFeedTest.java | 2 +- .../feed/shell/ShellFeedIntegrationTest.java | 2 +- .../event/feed/ssh/SshFeedIntegrationTest.java | 2 +- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- .../WindowsPerformanceCounterFeedTest.java | 2 +- .../PortForwardManagerLocationResolverTest.java | 2 +- .../access/PortForwardManagerRebindTest.java | 4 +- .../location/access/PortForwardManagerTest.java | 2 +- .../location/basic/AbstractLocationTest.java | 2 +- ...regatingMachineProvisioningLocationTest.java | 2 +- .../basic/ByonLocationResolverTest.java | 2 +- ...stMachineProvisioningLocationRebindTest.java | 2 +- ...ixedListMachineProvisioningLocationTest.java | 2 +- .../basic/HostLocationResolverTest.java | 2 +- .../basic/LocalhostLocationResolverTest.java | 2 +- ...ocalhostMachineProvisioningLocationTest.java | 2 +- .../location/basic/LocationConfigTest.java | 2 +- .../location/basic/LocationExtensionsTest.java | 2 +- .../location/basic/LocationPredicatesTest.java | 4 +- .../location/basic/LocationRegistryTest.java | 2 +- .../location/basic/MachineDetailsTest.java | 2 +- .../location/basic/MultiLocationRebindTest.java | 2 +- .../basic/MultiLocationResolverTest.java | 2 +- .../location/basic/MultiLocationTest.java | 2 +- .../SingleMachineLocationResolverTest.java | 2 +- .../SingleMachineProvisioningLocationTest.java | 2 +- .../SshMachineLocationIntegrationTest.java | 4 +- .../location/basic/SshMachineLocationTest.java | 4 +- .../basic/TestPortSupplierLocation.java | 2 +- .../location/cloud/CloudMachineNamerTest.java | 6 +- .../location/cloud/CustomMachineNamerTest.java | 6 +- .../AcmeEntitlementManagerTestFixture.java | 2 +- .../entitlement/EntitlementsTest.java | 2 +- .../entitlement/EntityEntitlementTest.java | 2 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 4 +- .../HighAvailabilityManagerSplitBrainTest.java | 4 +- .../ha/HighAvailabilityManagerTestFixture.java | 2 +- .../brooklyn/management/ha/HotStandbyTest.java | 6 +- .../management/ha/TestEntityFailingRebind.java | 3 +- .../brooklyn/management/ha/WarmStandbyTest.java | 4 +- .../management/internal/AccessManagerTest.java | 6 +- .../internal/EntityExecutionManagerTest.java | 6 +- .../internal/LocalManagementContextTest.java | 2 +- .../internal/LocalSubscriptionManagerTest.java | 2 +- .../brooklyn/management/osgi/OsgiPathTest.java | 2 +- .../osgi/OsgiVersionMoreEntityTest.java | 4 +- .../brooklyn/policy/basic/PolicyConfigTest.java | 2 +- .../policy/basic/PolicySubscriptionTest.java | 2 +- .../EntityCleanupLongevityTestFixture.java | 6 +- .../qa/performance/AbstractPerformanceTest.java | 2 +- .../qa/performance/EntityPerformanceTest.java | 2 +- .../EntityPersistencePerformanceTest.java | 2 +- .../SubscriptionPerformanceTest.java | 2 +- .../brooklyn/test/entity/BlockingEntity.java | 45 ----- .../test/entity/BlockingEntityImpl.java | 59 ------ .../entity/LocalManagementContextForTests.java | 157 ---------------- .../brooklyn/test/entity/NoopStartable.java | 29 --- .../brooklyn/test/entity/TestApplication.java | 60 ------ .../test/entity/TestApplicationImpl.java | 98 ---------- .../entity/TestApplicationNoEnrichersImpl.java | 29 --- .../java/brooklyn/test/entity/TestCluster.java | 30 --- .../brooklyn/test/entity/TestClusterImpl.java | 65 ------- .../java/brooklyn/test/entity/TestEntity.java | 113 ----------- .../brooklyn/test/entity/TestEntityImpl.java | 186 ------------------- .../test/entity/TestEntityNoEnrichersImpl.java | 32 ---- .../entity/TestEntityTransientCopyImpl.java | 28 --- .../util/ssh/BashCommandsIntegrationTest.java | 2 +- .../test/java/brooklyn/util/task/TasksTest.java | 4 +- .../util/text/TemplateProcessorTest.java | 4 +- .../brooklyn/test/entity/BlockingEntity.java | 45 +++++ .../test/entity/BlockingEntityImpl.java | 59 ++++++ .../entity/LocalManagementContextForTests.java | 157 ++++++++++++++++ .../brooklyn/test/entity/NoopStartable.java | 29 +++ .../brooklyn/test/entity/TestApplication.java | 60 ++++++ .../test/entity/TestApplicationImpl.java | 98 ++++++++++ .../entity/TestApplicationNoEnrichersImpl.java | 29 +++ .../brooklyn/test/entity/TestCluster.java | 30 +++ .../brooklyn/test/entity/TestClusterImpl.java | 65 +++++++ .../apache/brooklyn/test/entity/TestEntity.java | 113 +++++++++++ .../brooklyn/test/entity/TestEntityImpl.java | 186 +++++++++++++++++++ .../test/entity/TestEntityNoEnrichersImpl.java | 32 ++++ .../entity/TestEntityTransientCopyImpl.java | 28 +++ .../persister/jclouds/BlobStoreCleaner.java | 2 +- .../persister/jclouds/BlobStoreExpiryTest.java | 2 +- .../rebind/persister/jclouds/BlobStoreTest.java | 2 +- ...ailabilityManagerJcloudsObjectStoreTest.java | 2 +- .../JcloudsBlobStoreBasedObjectStoreTest.java | 2 +- .../jclouds/JcloudsExpect100ContinueTest.java | 2 +- .../JcloudsObjectStoreAccessorWriterTest.java | 2 +- .../jclouds/AbstractJcloudsLiveTest.java | 2 +- .../JcloudsByonLocationResolverTest.java | 2 +- .../jclouds/JcloudsLocationMetadataTest.java | 2 +- .../jclouds/JcloudsLocationResolverTest.java | 2 +- .../location/jclouds/JcloudsLocationTest.java | 2 +- .../location/jclouds/LiveTestEntity.java | 4 +- .../jclouds/RebindJcloudsLocationLiveTest.java | 2 +- .../os/AdvertiseWinrmLoginPolicyTest.java | 2 +- .../policy/os/CreateUserPolicyLiveTest.java | 2 +- .../policy/os/CreateUserPolicyTest.java | 2 +- .../enricher/HttpLatencyDetectorTest.java | 4 +- .../brooklyn/enricher/RebindEnricherTest.java | 2 +- .../enricher/TimeFractionDeltaEnricherTest.java | 4 +- .../entity/brooklyn/BrooklynMetricsTest.java | 10 +- .../autoscaling/AutoScalerPolicyMetricTest.java | 6 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 4 +- .../AutoScalerPolicyReconfigurationTest.java | 4 +- .../autoscaling/AutoScalerPolicyTest.java | 4 +- .../autoscaling/LocallyResizableEntity.java | 3 +- .../AbstractFollowTheSunPolicyTest.java | 4 +- .../ha/ConnectionFailureDetectorTest.java | 4 +- .../brooklyn/policy/ha/HaPolicyRebindTest.java | 4 +- ...ServiceFailureDetectorStabilizationTest.java | 6 +- .../policy/ha/ServiceFailureDetectorTest.java | 6 +- .../brooklyn/policy/ha/ServiceReplacerTest.java | 6 +- .../policy/ha/ServiceRestarterTest.java | 6 +- .../AbstractLoadBalancingPolicyTest.java | 2 +- .../BalanceableWorkerPoolTest.java | 2 +- .../ItemsInContainersGroupTest.java | 2 +- .../LoadBalancingPolicyConcurrencyTest.java | 2 +- .../brooklyn/entity/AbstractEc2LiveTest.java | 2 +- .../entity/AbstractGoogleComputeLiveTest.java | 2 +- .../entity/AbstractSoftlayerLiveTest.java | 2 +- .../entity/basic/SameServerEntityTest.java | 4 +- .../basic/SoftwareProcessEntityRebindTest.java | 2 +- .../entity/basic/SoftwareProcessEntityTest.java | 2 +- ...SoftwareProcessSshDriverIntegrationTest.java | 2 +- ...ftwareProcessAndChildrenIntegrationTest.java | 2 +- .../basic/lifecycle/StartStopSshDriverTest.java | 8 +- .../entity/brooklynnode/BrooklynNodeTest.java | 2 +- .../brooklyn/entity/chef/ChefConfigsTest.java | 2 +- .../chef/ChefServerTasksIntegrationTest.java | 2 +- .../brooklyn/entity/java/EntityPollingTest.java | 2 +- ...SoftwareProcessSshDriverIntegrationTest.java | 2 +- .../brooklyn/entity/java/JmxSupportTest.java | 2 +- .../entity/java/VanillaJavaAppRebindTest.java | 2 +- .../entity/java/VanillaJavaAppTest.java | 2 +- .../entity/pool/AbstractServerPoolTest.java | 4 +- .../entity/pool/ServerPoolLiveTest.java | 4 +- .../pool/ServerPoolLocationResolverTest.java | 4 +- .../entity/pool/ServerPoolRebindTest.java | 2 +- .../brooklyn/entity/pool/ServerPoolTest.java | 2 +- .../entity/software/AbstractDockerLiveTest.java | 2 +- .../MachineLifecycleEffectorTasksTest.java | 2 +- .../entity/software/SoftwareEffectorTest.java | 2 +- .../entity/software/SshEffectorTasksTest.java | 2 +- .../software/http/HttpRequestSensorTest.java | 4 +- .../software/ssh/SshCommandIntegrationTest.java | 4 +- .../brooklyn/event/feed/jmx/JmxFeedTest.java | 8 +- .../event/feed/jmx/RebindJmxFeedTest.java | 4 +- .../basic/WinRmMachineLocationLiveTest.java | 6 +- .../usage/ApplicationUsageTrackingTest.java | 4 +- .../management/usage/UsageListenerTest.java | 4 +- .../crate/CrateNodeIntegrationTest.java | 2 +- .../mariadb/MariaDbIntegrationTest.java | 2 +- .../database/mysql/MySqlClusterTestHelper.java | 2 +- .../postgresql/PostgreSqlIntegrationTest.java | 2 +- .../rubyrep/RubyRepIntegrationTest.java | 2 +- .../activemq/ActiveMQIntegrationTest.java | 2 +- .../messaging/kafka/KafkaIntegrationTest.java | 2 +- .../messaging/qpid/QpidIntegrationTest.java | 2 +- .../messaging/rabbit/RabbitIntegrationTest.java | 2 +- .../zookeeper/ZooKeeperEnsembleLiveTest.java | 2 +- .../bind/BindDnsServerIntegrationTest.java | 2 +- .../network/bind/BindDnsServerLiveTest.java | 2 +- .../nosql/couchbase/CouchbaseOfflineTest.java | 2 +- .../nosql/couchdb/AbstractCouchDBNodeTest.java | 2 +- .../nosql/couchdb/CouchDBClusterLiveTest.java | 2 +- .../ElasticSearchNodeIntegrationTest.java | 2 +- .../nosql/mongodb/MongoDBIntegrationTest.java | 2 +- .../MongoDBConfigServerIntegrationTest.java | 2 +- .../redis/RedisClusterIntegrationTest.java | 2 +- .../nosql/redis/RedisIntegrationTest.java | 2 +- .../nosql/riak/RiakNodeIntegrationTest.java | 2 +- .../entity/dns/AbstractGeoDnsServiceTest.java | 4 +- .../geoscaling/GeoscalingIntegrationTest.java | 4 +- .../entity/proxy/AbstractControllerTest.java | 4 +- .../brooklyn/entity/proxy/UrlMappingTest.java | 2 +- .../nginx/NginxRebindWithHaIntegrationTest.java | 2 +- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 2 +- .../AbstractWebAppFixtureIntegrationTest.java | 4 +- .../entity/webapp/DynamicWebAppClusterTest.java | 2 +- .../entity/webapp/DynamicWebAppFabricTest.java | 2 +- .../webapp/ElasticCustomLocationTest.java | 4 +- ...ElasticJavaWebAppServiceIntegrationTest.java | 2 +- .../webapp/TomcatAutoScalerPolicyTest.java | 2 +- .../webapp/WebAppLiveIntegrationTest.groovy | 2 +- ...namicWebAppClusterRebindIntegrationTest.java | 2 +- ...namicWebAppClusterRebindIntegrationTest.java | 2 +- ...Boss7ServerNonInheritingIntegrationTest.java | 3 +- .../JBoss7ServerRebindingIntegrationTest.java | 2 +- ...ultiVersionWebAppFixtureIntegrationTest.java | 2 +- .../JettyWebAppFixtureIntegrationTest.java | 2 +- .../NodeJsWebAppFixtureIntegrationTest.java | 2 +- ...mcat8ServerWebAppFixtureIntegrationTest.java | 3 +- ...omcatServerWebAppFixtureIntegrationTest.java | 2 +- .../camp/brooklyn/AbstractYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/AppYamlTest.java | 4 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 2 +- .../camp/brooklyn/EnrichersYamlTest.java | 2 +- .../camp/brooklyn/EntitiesYamlTest.java | 4 +- .../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +- .../camp/brooklyn/MapReferenceYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +- .../camp/brooklyn/PoliciesYamlTest.java | 2 +- .../catalog/AbstractCatalogXmlTest.java | 2 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 5 +- .../java/org/apache/brooklyn/cli/CliTest.java | 2 +- .../BrooklynEntityMirrorIntegrationTest.java | 4 +- .../brooklynnode/BrooklynNodeRestTest.java | 4 +- .../BrooklynLauncherHighAvailabilityTest.java | 4 +- .../BrooklynLauncherRebindCatalogTest.java | 3 +- .../BrooklynLauncherRebindTestFixture.java | 4 +- .../BrooklynLauncherRebindTestToFiles.java | 2 +- ...lynLauncherRebindToCloudObjectStoreTest.java | 4 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 8 +- .../launcher/BrooklynWebServerTest.java | 3 +- .../launcher/SimpleYamlLauncherForTests.java | 3 +- .../SoftlayerObtainPrivateLiveTest.java | 4 +- .../rest/client/BrooklynApiRestClientTest.java | 3 +- .../brooklyn/rest/domain/ApplicationTest.java | 2 +- .../brooklyn/rest/domain/SensorSummaryTest.java | 5 +- .../rest/resources/EntityResourceTest.java | 3 +- .../SensorResourceIntegrationTest.java | 2 +- .../rest/resources/ServerShutdownTest.java | 2 +- .../rest/resources/UsageResourceTest.java | 3 +- .../rest/testing/BrooklynRestApiTest.java | 2 +- .../util/BrooklynRestResourceUtilsTest.java | 4 +- .../json/BrooklynJacksonSerializerTest.java | 6 +- 326 files changed, 1390 insertions(+), 1379 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/BrooklynVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/BrooklynVersionTest.java b/core/src/test/java/brooklyn/BrooklynVersionTest.java index c03f732..7fbe976 100644 --- a/core/src/test/java/brooklyn/BrooklynVersionTest.java +++ b/core/src/test/java/brooklyn/BrooklynVersionTest.java @@ -40,7 +40,8 @@ import brooklyn.catalog.internal.CatalogItemDtoAbstract; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.osgi.OsgiTestResources; import org.apache.brooklyn.test.TestResourceUnavailableException; -import brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; + import brooklyn.util.text.Strings; public class BrooklynVersionTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java index 252443a..b0dd169 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java +++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java @@ -23,6 +23,9 @@ import static org.testng.Assert.assertNotNull; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import io.brooklyn.camp.spi.Assembly; import io.brooklyn.camp.spi.AssemblyTemplate; @@ -58,9 +61,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.osgi.OsgiStandaloneTest; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/camp/lite/TestAppAssembly.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssembly.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssembly.java index 0c02cb9..d82e564 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssembly.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssembly.java @@ -18,8 +18,9 @@ */ package brooklyn.camp.lite; +import org.apache.brooklyn.test.entity.TestApplication; + import io.brooklyn.camp.spi.Assembly; -import brooklyn.test.entity.TestApplication; public class TestAppAssembly extends Assembly { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java index 66b25ec..54cb17a 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java @@ -31,12 +31,12 @@ import java.util.Set; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.classloading.BrooklynClassLoadingContext; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java b/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java index 82ab493..e8286a6 100644 --- a/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java +++ b/core/src/test/java/brooklyn/catalog/internal/CatalogDtoTest.java @@ -29,12 +29,13 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.brooklyn.catalog.CatalogItem.CatalogBundle; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; + import brooklyn.catalog.internal.CatalogClasspathDo.CatalogScanningModes; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.BrooklynMavenArtifacts; import brooklyn.util.maven.MavenRetriever; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/catalog/internal/CatalogVersioningTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/catalog/internal/CatalogVersioningTest.java b/core/src/test/java/brooklyn/catalog/internal/CatalogVersioningTest.java index 3a8e281..2731dfc 100644 --- a/core/src/test/java/brooklyn/catalog/internal/CatalogVersioningTest.java +++ b/core/src/test/java/brooklyn/catalog/internal/CatalogVersioningTest.java @@ -29,10 +29,11 @@ import org.testng.annotations.Test; import org.apache.brooklyn.catalog.BrooklynCatalog; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; + import brooklyn.catalog.CatalogPredicates; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 234db70..f6233d9 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherDeprecatedTest.groovy @@ -34,9 +34,9 @@ import brooklyn.event.AttributeSensor import brooklyn.event.basic.BasicAttributeSensor import brooklyn.location.basic.SimulatedLocation import org.apache.brooklyn.test.TestUtils -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication -import brooklyn.test.entity.TestEntity +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication +import org.apache.brooklyn.test.entity.TestEntity import com.google.common.base.Function http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 280f11b..372a9be 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java @@ -21,6 +21,7 @@ package brooklyn.enricher; import java.util.Collection; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 5b21615..e021c3c 100644 --- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java +++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java @@ -34,13 +34,13 @@ import brooklyn.entity.basic.EntityAdjuncts; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.SensorEvent; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 ff8a80c..650b2a0 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java @@ -21,6 +21,7 @@ package brooklyn.enricher; import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -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/0d702c5b/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 ded18f3..664b96a 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.javalang.AtomicReferences; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 3a9b0ce..aff831c 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy @@ -35,8 +35,8 @@ import brooklyn.event.AttributeSensor import brooklyn.event.basic.BasicAttributeSensor import brooklyn.location.basic.SimulatedLocation import org.apache.brooklyn.test.TestUtils -import brooklyn.test.entity.TestApplication -import brooklyn.test.entity.TestEntity +import org.apache.brooklyn.test.entity.TestApplication +import org.apache.brooklyn.test.entity.TestEntity import brooklyn.util.collections.MutableMap public class TransformingEnricherDeprecatedTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 adf7c0d..b9f274d 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java @@ -19,6 +19,7 @@ package brooklyn.enricher; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -29,7 +30,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.math.MathFunctions; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java index 7c8f0e5..a0920ca 100644 --- a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java @@ -24,6 +24,8 @@ import java.util.Map; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; import org.testng.Assert; import org.testng.annotations.Test; @@ -35,8 +37,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationNoEnrichersImpl; import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java b/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java index e64101a..668a788 100644 --- a/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java +++ b/core/src/test/java/brooklyn/entity/BrooklynAppLiveTestSupport.java @@ -18,6 +18,8 @@ */ package brooklyn.entity; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -27,8 +29,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; /** * To be extended by live tests. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/BrooklynAppUnitTestSupport.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/BrooklynAppUnitTestSupport.java b/core/src/test/java/brooklyn/entity/BrooklynAppUnitTestSupport.java index bb13f1f..80d6acb 100644 --- a/core/src/test/java/brooklyn/entity/BrooklynAppUnitTestSupport.java +++ b/core/src/test/java/brooklyn/entity/BrooklynAppUnitTestSupport.java @@ -18,6 +18,8 @@ */ package brooklyn.entity; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -28,8 +30,6 @@ import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; /** * To be extended by unit/integration tests. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy index ece7c70..ee106b3 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiGroovyTest.groovy @@ -39,7 +39,7 @@ import brooklyn.entity.trait.Startable import org.apache.brooklyn.management.ManagementContext import org.apache.brooklyn.management.Task import brooklyn.management.internal.EffectorUtils -import brooklyn.test.entity.TestApplication +import org.apache.brooklyn.test.entity.TestApplication /** * Test the operation of the {@link Effector} implementations. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 d409130..85b56f4 100644 --- a/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java +++ b/core/src/test/java/brooklyn/entity/EntityPreManagementTest.java @@ -24,6 +24,9 @@ import java.util.List; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.TestUtils; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,9 +42,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; @SuppressWarnings({"rawtypes","unchecked"}) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java index cc0e7d7..662e261 100644 --- a/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AbstractApplicationLegacyTest.java @@ -24,6 +24,8 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,8 +36,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; /** * Tests the deprecated use of AbstractAppliation, where its constructor is called directly. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java index 00505f0..64e8b20 100644 --- a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java @@ -24,6 +24,9 @@ import static org.testng.Assert.assertTrue; import java.util.List; import java.util.Map; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,9 +35,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationImpl; import brooklyn.util.collections.MutableMap; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java b/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java index 6e95706..c5a0fd3 100644 --- a/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java @@ -30,6 +30,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,8 +41,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.AttributeMap; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/AttributeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AttributeTest.java b/core/src/test/java/brooklyn/entity/basic/AttributeTest.java index 174f512..907c752 100644 --- a/core/src/test/java/brooklyn/entity/basic/AttributeTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AttributeTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.test.entity.TestEntityImpl; public class AttributeTest { static AttributeSensor<String> COLOR = new BasicAttributeSensor<String>(String.class, "my.color"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java index 1af864f..a107692 100644 --- a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java @@ -27,6 +27,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -42,9 +45,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.Locations.LocationsFilter; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; public class BasicStartableTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java b/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java index 5b77766..984a684 100644 --- a/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java @@ -24,14 +24,14 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.brooklyn.test.entity.BlockingEntity; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BrooklynShutdownHooks.BrooklynShutdownHookJob; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.BlockingEntity; -import brooklyn.test.entity.TestEntity; import brooklyn.util.time.Duration; public class BrooklynShutdownHooksTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java index 73028a4..686e1a6 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.basic; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.ConfigMapTest.MyOtherEntity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; -import brooklyn.test.entity.TestApplication; /** * There is a bug where: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy b/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy index 627b6f2..2dd0425 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy +++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapGroovyTest.groovy @@ -27,7 +27,7 @@ import org.testng.annotations.Test import brooklyn.entity.basic.ConfigMapTest.MyOtherEntity import brooklyn.entity.basic.ConfigMapTest.MySubEntity -import brooklyn.test.entity.TestApplication +import org.apache.brooklyn.test.entity.TestApplication public class ConfigMapGroovyTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 8a6c5eb..7c02994 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -25,6 +25,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,8 +37,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 12ac08b..732a818 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -31,6 +31,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -41,7 +42,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.DependentConfiguration; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java index 221e0c2..35f4659 100644 --- a/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.effector.EffectorTaskTest; import brooklyn.entity.proxying.EntityInitializer; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; public class DynamicEntityTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java index f1af44f..b33f710 100644 --- a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java @@ -32,6 +32,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -46,8 +48,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java index 851d556..dc546aa 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.atomic.AtomicReference; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java index 0bd60f1..1304d36 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java @@ -25,14 +25,14 @@ import static org.testng.Assert.fail; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java index e4ee160..0b688f5 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,7 +36,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.DependentConfiguration; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java index bc2942a..8667b14 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java b/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java index 02fcd9b..e46efa5 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityFunctionsTest.java @@ -21,13 +21,13 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.entity.TestEntity; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java index bfa6933..9a2b9e7 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -28,7 +29,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Changeable; import brooklyn.location.Location; -import brooklyn.test.entity.TestEntity; import brooklyn.util.text.StringPredicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java b/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java index 3de411a..6e7a285 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Collection; import java.util.List; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java index 7ffecf5..7a8836f 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java @@ -25,6 +25,9 @@ import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,9 +40,6 @@ import brooklyn.event.basic.BasicConfigKey; import brooklyn.location.basic.SimulatedLocation; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; -import brooklyn.test.entity.TestEntityNoEnrichersImpl; import brooklyn.util.flags.SetFromFlag; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java index 1200415..43f449d 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.management.SubscriptionHandle; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,8 +32,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java index ba41199..3d835ad 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySuppliersTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestEntity; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java b/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java index ea27129..e021ccc 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java @@ -43,6 +43,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -55,8 +57,6 @@ import brooklyn.event.Sensor; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.event.basic.Sensors; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableSet; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java b/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java index 20834f6..187d6c0 100644 --- a/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java +++ b/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.basic; import java.util.List; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -36,7 +37,6 @@ import brooklyn.event.basic.SetConfigKey; import brooklyn.event.basic.SetConfigKey.SetModifications; import brooklyn.event.basic.StructuredConfigKey.StructuredModification; import brooklyn.event.basic.SubElementConfigKey; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy index b8c70bd..d95d0d1 100644 --- a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy +++ b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy @@ -35,8 +35,8 @@ import brooklyn.event.basic.ListConfigKey.ListModifications import brooklyn.event.basic.MapConfigKey.MapModifications import brooklyn.event.basic.SetConfigKey.SetModifications import brooklyn.location.basic.SimulatedLocation -import brooklyn.test.entity.TestApplication -import brooklyn.test.entity.TestEntity +import org.apache.brooklyn.test.entity.TestApplication +import org.apache.brooklyn.test.entity.TestEntity import brooklyn.util.collections.MutableMap import brooklyn.util.exceptions.Exceptions import brooklyn.util.task.DeferredSupplier http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 32d1f5a..c629785 100644 --- a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.TestUtils; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,8 +39,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityNoEnrichersImpl; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 afa4eaa..1626909 100644 --- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java @@ -20,6 +20,8 @@ package brooklyn.entity.basic; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -34,8 +36,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import brooklyn.util.collections.QuorumCheck.QuorumChecks; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java index 690c0bc..a5e625d 100644 --- a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.drivers; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,7 +31,6 @@ import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriver; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDependentEntity; import brooklyn.entity.drivers.RegistryEntityDriverFactoryTest.MyOtherSshDriver; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; public class EntityDriverRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java index e529481..e5b8f7a 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/BasicDownloadsRegistryTest.java @@ -21,6 +21,8 @@ package brooklyn.entity.drivers.downloads; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,8 +36,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java index c036775..16f022f 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromLocalRepoTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,8 +38,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java index 1716935..e2624b0 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadProducerFromPropertiesTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,8 +38,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java index 46a16af..b443dfb 100644 --- a/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/downloads/DownloadSubstitutersTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.fail; import java.util.Map; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.drivers.downloads.DownloadResolverManager.DownloadTargets import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import com.google.common.base.Functions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 1c5673b..91e57ec 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.management.HasTaskChildren; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -38,7 +39,6 @@ import brooklyn.entity.trait.FailingEntity; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.SimulatedLocation; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java index b2dbe71..81d89ff 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java @@ -29,6 +29,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.management.ExecutionManager; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplicationImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -42,8 +44,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.MethodEffector; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationImpl; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.BasicExecutionContext; import brooklyn.util.task.Tasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java index 551bd49..b651275 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.brooklyn.management.HasTaskChildren; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.Test; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; -import brooklyn.test.entity.TestEntity; 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/0d702c5b/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 38b8491..fc9ad37 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -55,6 +55,8 @@ import brooklyn.entity.basic.Lifecycle; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.proxying.EntitySpec; @@ -64,8 +66,6 @@ import brooklyn.event.SensorEvent; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.collections.QuorumCheck.QuorumChecks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java index 22ecbdf..3d92be1 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,7 +47,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.time.Duration; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 6c8c1ca..251a249 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -33,6 +33,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.test.TestUtils; +import org.apache.brooklyn.test.entity.BlockingEntity; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -51,8 +53,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.BlockingEntity; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java index ec52636..9ce810a 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java @@ -29,6 +29,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -44,9 +47,6 @@ import brooklyn.event.SensorEventListener; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet;
