http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java index a4276ea..d5ed6db 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 95f3680..cbf5ec3 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.group; import org.apache.brooklyn.policy.PolicySpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,7 +38,6 @@ import brooklyn.event.SensorEvent; import brooklyn.event.SensorEventListener; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.javalang.Boxing; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/GroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupTest.java b/core/src/test/java/brooklyn/entity/group/GroupTest.java index 013b55e..ac1138b 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.group; import static org.testng.Assert.assertEquals; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,7 +38,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; public class GroupTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index f8d9422..1731391 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -40,7 +41,6 @@ import brooklyn.event.Sensor; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java index 06989bd..5517292 100644 --- a/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/QuarantineGroupTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.group; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +30,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java index d8dc532..81995162 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.group.zoneaware; import java.util.List; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,7 +31,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; import com.google.common.collect.LinkedHashMultimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java index c44bb78..6d7ce86 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.time.Duration; import com.google.common.base.Ticker; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java index d6c272b..a58183e 100644 --- a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java @@ -32,6 +32,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; 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; @@ -45,9 +48,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.StartableApplication; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java index 0de3ebd..a450b91 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java @@ -23,15 +23,15 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.apache.brooklyn.management.EntityManager; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; 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/proxying/EntityProxyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java index 06c2ae8..6ef796a 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.brooklyn.management.EntityManager; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,7 +40,6 @@ import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; import brooklyn.management.internal.ManagementContextInternal; -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/proxying/InternalEntityFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java b/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java index d336169..bb50de9 100644 --- a/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/InternalEntityFactoryTest.java @@ -23,6 +23,11 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplicationImpl; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,11 +37,6 @@ import brooklyn.entity.Entity; import brooklyn.entity.basic.AbstractApplication; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationImpl; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; public class InternalEntityFactoryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java index afeca2b..137639e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/ActivePartialRebindTest.java @@ -18,6 +18,7 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -29,7 +30,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestEntity; import brooklyn.util.text.Strings; public class ActivePartialRebindTest extends RebindTestFixtureWithApp { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java index 0018dd0..f41bf4f 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogItemTest.java @@ -39,6 +39,7 @@ import brooklyn.camp.lite.TestAppAssemblyInstantiator; import org.apache.brooklyn.catalog.CatalogItem; import org.apache.brooklyn.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.catalog.internal.BasicBrooklynCatalog; import brooklyn.catalog.internal.CatalogDto; @@ -49,7 +50,6 @@ import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.entity.TestEntity; import com.google.common.base.Joiner; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java index 3274319..6ac7e0e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindCatalogWhenCatalogPersistenceDisabledTest.java @@ -28,12 +28,13 @@ import org.testng.annotations.Test; import brooklyn.camp.lite.CampPlatformWithJustBrooklynMgmt; import org.apache.brooklyn.catalog.CatalogItem; +import org.apache.brooklyn.test.entity.TestEntity; + import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.entity.proxying.EntitySpec; import brooklyn.internal.BrooklynFeatureEnablement; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 1a4b82e..857a99b 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEnricherTest.java @@ -29,6 +29,9 @@ import java.util.Map; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -49,9 +52,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableSet; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java index e9e05e6..11170de 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityDynamicTypeInfoTest.java @@ -25,6 +25,8 @@ import java.io.File; import java.io.FileReader; import java.util.concurrent.ExecutionException; +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; @@ -36,8 +38,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.config.ConfigBag; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 8630236..d1fceec 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java @@ -38,6 +38,9 @@ import java.util.concurrent.Semaphore; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.mementos.EntityMemento; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; import org.testng.annotations.Test; @@ -69,9 +72,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocationConfigTest.MyLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.exceptions.RuntimeInterruptedException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java index 6287224..c2ca460 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFailuresTest.java @@ -33,6 +33,7 @@ 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.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.Test; @@ -51,7 +52,6 @@ import brooklyn.entity.trait.Identifiable; import brooklyn.event.AttributeSensor; import brooklyn.management.internal.LocalManagementContext; import brooklyn.policy.basic.AbstractPolicy; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.SetFromFlag; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 9459e89..a8c5692 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedTest.java @@ -25,6 +25,8 @@ import java.util.Collection; import java.util.List; 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.Assert; @@ -52,8 +54,6 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.BrooklynGarbageCollector; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import brooklyn.util.collections.MutableList; import brooklyn.util.http.BetterMockWebServer; import brooklyn.util.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 db6e500..d67648e 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindFeedWithHaTest.java @@ -28,6 +28,8 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.management.Task; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; +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,8 +41,6 @@ import brooklyn.entity.Feed; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.AttributeSensor; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.http.BetterMockWebServer; import brooklyn.util.repeat.Repeater; import brooklyn.util.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java index ef1af71..360b183 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindGroupTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; import brooklyn.entity.Entity; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.proxying.ImplementedBy; import brooklyn.test.Asserts; -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/rebind/RebindLocalhostLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java index 6625ecd..a69de14 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocalhostLocationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Collections; import org.apache.brooklyn.mementos.BrooklynMementoManifest; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; 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/rebind/RebindLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java index b9d0573..1a0f958 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindLocationTest.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.mementos.LocationMemento; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,7 +42,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.AbstractLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java index c62364d..c3073d3 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerSorterTest.java @@ -28,6 +28,8 @@ import java.util.Set; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.mementos.EntityMemento; import org.apache.brooklyn.mementos.TreeNode; +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; @@ -38,8 +40,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.dto.MementosGenerators; import brooklyn.entity.trait.Identifiable; -import brooklyn.test.entity.TestApplication; -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/rebind/RebindManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java index e018d75..d1ec74d 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindManagerTest.java @@ -23,12 +23,12 @@ import static org.testng.Assert.assertEquals; import java.util.concurrent.Callable; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.annotations.Test; import brooklyn.entity.Entity; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.task.BasicTask; import brooklyn.util.task.DynamicTasks; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java index 68d69d4..6e10bf9 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindPolicyTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.mementos.BrooklynMementoManifest; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.policy.Policy; import org.apache.brooklyn.policy.PolicySpec; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.Test; import brooklyn.config.ConfigKey; @@ -44,8 +46,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.Locations; import brooklyn.policy.basic.AbstractPolicy; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; 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/rebind/RebindSshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java index a73a305..d83db50 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindSshMachineLocationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.Collections; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -30,7 +31,6 @@ import org.testng.annotations.Test; import brooklyn.location.LocationSpec; import brooklyn.location.basic.FixedListMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; 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/rebind/RebindTestFixtureWithApp.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java index 81ca411..9bbabee 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestFixtureWithApp.java @@ -18,10 +18,11 @@ */ package brooklyn.entity.rebind; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; + import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.proxying.EntitySpec; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationNoEnrichersImpl; public class RebindTestFixtureWithApp extends RebindTestFixture<TestApplication> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java index 141a699..16486c2 100644 --- a/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java +++ b/core/src/test/java/brooklyn/entity/rebind/RebindTestUtils.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.management.ha.ManagementNodeState; import org.apache.brooklyn.mementos.BrooklynMemento; import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +51,6 @@ import brooklyn.location.Location; import brooklyn.management.ha.ManagementPlaneSyncRecordPersisterToObjectStore; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.io.FileUtil; import brooklyn.util.javalang.Serializers; import brooklyn.util.javalang.Serializers.ObjectReplacer; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java index dd0ddf7..5f43e41 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterInMemorySizeIntegrationTest.java @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.concurrent.TimeoutException; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.entity.rebind.persister.ListeningObjectStore.RecordingTransactionListener; -import brooklyn.test.entity.TestEntity; import brooklyn.util.text.Identifiers; import brooklyn.util.time.Duration; import brooklyn.util.time.Time; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java index 58b7cd1..d437a7a 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterTestFixture.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.mementos.BrooklynMementoPersister; import org.apache.brooklyn.mementos.BrooklynMementoRawData; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.SkipException; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -48,8 +50,6 @@ import brooklyn.entity.rebind.RecordingRebindExceptionHandler; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.test.policy.TestPolicy; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java index a94960a..363c097 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/FileBasedObjectStoreTest.java @@ -26,12 +26,12 @@ import java.io.File; import java.io.FileNotFoundException; import org.apache.brooklyn.management.ha.HighAvailabilityMode; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.io.FileUtil; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java index d77b204..0738a7c 100644 --- a/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/persister/XmlMementoSerializerTest.java @@ -37,6 +37,9 @@ import org.apache.brooklyn.mementos.BrooklynMementoPersister.LookupContext; import org.apache.brooklyn.policy.Enricher; import org.apache.brooklyn.policy.Policy; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -58,9 +61,6 @@ import brooklyn.entity.rebind.BrooklynObjectType; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.management.osgi.OsgiVersionMoreEntityTest; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -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/rebind/transformer/CompoundTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java index f8471c2..c9dd0ea 100644 --- a/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java +++ b/core/src/test/java/brooklyn/entity/rebind/transformer/CompoundTransformerTest.java @@ -28,6 +28,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.mementos.BrooklynMementoRawData; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -50,7 +51,6 @@ import brooklyn.entity.rebind.persister.FileBasedObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.event.basic.BasicConfigKey; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.TestApplication; import brooklyn.util.guava.SerializablePredicate; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java index 61a5ac1..bf4af6f 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntity.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntity.java @@ -20,11 +20,12 @@ package brooklyn.entity.trait; import java.util.List; +import org.apache.brooklyn.test.entity.TestEntity; + import brooklyn.config.ConfigKey; import brooklyn.entity.Entity; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.proxying.ImplementedBy; -import brooklyn.test.entity.TestEntity; import brooklyn.util.flags.SetFromFlag; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java index ec115ba..c5b48f2 100644 --- a/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/brooklyn/entity/trait/FailingEntityImpl.java @@ -21,11 +21,11 @@ package brooklyn.entity.trait; import java.util.Collection; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; -import brooklyn.test.entity.TestEntityImpl; 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/trait/StartableMethodsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java index 2c84325..d96c637 100644 --- a/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/brooklyn/entity/trait/StartableMethodsTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,7 +31,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.FailingEntity.RecordingEventListener; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.task.Tasks; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java b/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java index 42646e6..78c473c 100644 --- a/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java +++ b/core/src/test/java/brooklyn/event/feed/ConfigToAttributesTest.java @@ -20,6 +20,8 @@ package brooklyn.event.feed; import static org.testng.Assert.assertEquals; +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.event.basic.BasicAttributeSensorAndConfigKey; import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey; import brooklyn.management.internal.LocalManagementContext; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; public class ConfigToAttributesTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/event/feed/PollerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/PollerTest.java b/core/src/test/java/brooklyn/event/feed/PollerTest.java index 6cb75b9..8cba861 100644 --- a/core/src/test/java/brooklyn/event/feed/PollerTest.java +++ b/core/src/test/java/brooklyn/event/feed/PollerTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -33,7 +34,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.task.DynamicTasks; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 7e98acd..0402b02 100644 --- a/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/function/FunctionFeedTest.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; 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; @@ -50,7 +51,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 6252e77..8b8d3c2 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedIntegrationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertTrue; import java.net.URI; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; import brooklyn.test.Asserts; import brooklyn.test.HttpService; -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/event/feed/http/HttpFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java index 26de2a7..2556310 100644 --- a/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/http/HttpFeedTest.java @@ -25,6 +25,7 @@ import java.net.URL; import java.util.List; import java.util.concurrent.Callable; +import org.apache.brooklyn.test.entity.TestEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -45,7 +46,6 @@ import brooklyn.event.feed.FeedConfig; import brooklyn.event.feed.PollConfig; import brooklyn.location.Location; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.guava.Functionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 03ffa59..e8787a0 100644 --- a/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/shell/ShellFeedIntegrationTest.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; 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; @@ -43,7 +44,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.entity.TestEntity; import brooklyn.util.stream.Streams; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 fc9207e..a1d5d1a 100644 --- a/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java +++ b/core/src/test/java/brooklyn/event/feed/ssh/SshFeedIntegrationTest.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; 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.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/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 2d313f8..6054c37 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -21,6 +21,7 @@ package brooklyn.event.feed.windows; import java.util.Map; 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.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.MachineLocation; import brooklyn.location.MachineProvisioningLocation; -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/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 7a38659..ecc7711 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedTest.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Iterator; 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.AfterMethod; @@ -40,7 +41,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -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/0d702c5b/core/src/test/java/brooklyn/location/access/PortForwardManagerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/access/PortForwardManagerLocationResolverTest.java b/core/src/test/java/brooklyn/location/access/PortForwardManagerLocationResolverTest.java index a699bbc..a737cd1 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerLocationResolverTest.java @@ -18,6 +18,7 @@ */ package brooklyn.location.access; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -26,7 +27,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; public class PortForwardManagerLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java index ec7cf72..a7d5898 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -24,6 +24,8 @@ import static org.testng.Assert.assertNotEquals; import java.io.File; import org.apache.brooklyn.management.ha.MementoCopyMode; +import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -43,8 +45,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; import brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/access/PortForwardManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/access/PortForwardManagerTest.java b/core/src/test/java/brooklyn/location/access/PortForwardManagerTest.java index c999ce3..bf1ce2a 100644 --- a/core/src/test/java/brooklyn/location/access/PortForwardManagerTest.java +++ b/core/src/test/java/brooklyn/location/access/PortForwardManagerTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertNull; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.net.Networking; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java index c031d8c..e2f7b58 100644 --- a/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/AbstractLocationTest.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.Map; 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; @@ -34,7 +35,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; 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/location/basic/AggregatingMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java b/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java index e494a1f..457a8b1 100644 --- a/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/AggregatingMachineProvisioningLocationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.fail; import java.util.Map; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; 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/location/basic/ByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java index 307fc6a..603050d 100644 --- a/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java @@ -30,6 +30,7 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -45,7 +46,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; import brooklyn.util.net.UserAndHostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java index b2c745d..5ef883c 100644 --- a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java @@ -26,6 +26,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.Location; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableSet; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java index bf33ea7..ab73a25 100644 --- a/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -50,7 +51,6 @@ import brooklyn.location.MachineLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.RecordingMachineLocationCustomizer.Call; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java index 51359ef..ddb8ae4 100644 --- a/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/basic/HostLocationResolverTest.java @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -33,7 +34,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import brooklyn.location.MachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/LocalhostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocalhostLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/LocalhostLocationResolverTest.java index 69d0227..67d59f1 100644 --- a/core/src/test/java/brooklyn/location/basic/LocalhostLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocalhostLocationResolverTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.NoMachinesAvailableException; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java b/core/src/test/java/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java index c7e2525..b824032 100644 --- a/core/src/test/java/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.fail; import java.net.ServerSocket; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,7 +40,6 @@ import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.PortRange; import brooklyn.location.geo.HostGeoInfo; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java index 21b001d..e50269d 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationConfigTest.java @@ -21,6 +21,7 @@ package brooklyn.location.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; @@ -29,7 +30,6 @@ import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; -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/location/basic/LocationExtensionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java b/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java index 43024ac..04e3b40 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationExtensionsTest.java @@ -25,9 +25,9 @@ import static org.testng.Assert.fail; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; -import brooklyn.test.entity.LocalManagementContextForTests; 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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/LocationPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationPredicatesTest.java b/core/src/test/java/brooklyn/location/basic/LocationPredicatesTest.java index 39958d9..b9124ac 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationPredicatesTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationPredicatesTest.java @@ -21,6 +21,8 @@ package brooklyn.location.basic; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,8 +31,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestEntity; public class LocationPredicatesTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/LocationRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/LocationRegistryTest.java b/core/src/test/java/brooklyn/location/basic/LocationRegistryTest.java index aa4be19..6d718fe 100644 --- a/core/src/test/java/brooklyn/location/basic/LocationRegistryTest.java +++ b/core/src/test/java/brooklyn/location/basic/LocationRegistryTest.java @@ -18,6 +18,7 @@ */ package brooklyn.location.basic; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -29,7 +30,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.LocationDefinition; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; public class LocationRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java index 2ba0560..8833b1f 100644 --- a/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java +++ b/core/src/test/java/brooklyn/location/basic/MachineDetailsTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.MachineDetails; import brooklyn.location.OsDetails; -import brooklyn.test.entity.TestApplication; public class MachineDetailsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java index 239be4b..cb5efcc 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationRebindTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.List; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableSet; import brooklyn.util.net.Networking; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/MultiLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MultiLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/MultiLocationResolverTest.java index 85bcfbd..c4ff215 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationResolverTest.java @@ -31,6 +31,7 @@ import java.util.NoSuchElementException; import javax.annotation.Nullable; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -44,7 +45,6 @@ import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; 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/location/basic/MultiLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/MultiLocationTest.java b/core/src/test/java/brooklyn/location/basic/MultiLocationTest.java index 59eb0b0..f4cf2cd 100644 --- a/core/src/test/java/brooklyn/location/basic/MultiLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/MultiLocationTest.java @@ -20,6 +20,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -33,7 +34,6 @@ import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.cloud.AvailabilityZoneExtension; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableSet; import brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/SingleMachineLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SingleMachineLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/SingleMachineLocationResolverTest.java index d62971f..496b7d3 100644 --- a/core/src/test/java/brooklyn/location/basic/SingleMachineLocationResolverTest.java +++ b/core/src/test/java/brooklyn/location/basic/SingleMachineLocationResolverTest.java @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.util.Map; import java.util.NoSuchElementException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java b/core/src/test/java/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java index b88dac5..3a8e17d 100644 --- a/core/src/test/java/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SingleMachineProvisioningLocationTest.java @@ -20,6 +20,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertNotNull; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -27,7 +28,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; public class SingleMachineProvisioningLocationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java index 60ad222..3c65eed 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationIntegrationTest.java @@ -29,14 +29,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.crypto.SecureKeys; import brooklyn.util.internal.ssh.sshj.SshjTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java index 17d6ee2..e648534 100644 --- a/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/brooklyn/location/basic/SshMachineLocationTest.java @@ -34,6 +34,8 @@ import java.util.Map; import java.util.concurrent.Callable; import org.apache.brooklyn.management.ManagementContext; +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; @@ -55,8 +57,6 @@ import brooklyn.location.MachineLocation; import brooklyn.location.PortRange; import brooklyn.location.basic.PortRanges.LinearPortRange; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.file.ArchiveUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java index 2d3c3bb..7fcac6d 100644 --- a/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java +++ b/core/src/test/java/brooklyn/location/basic/TestPortSupplierLocation.java @@ -20,6 +20,7 @@ package brooklyn.location.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -27,7 +28,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.proxying.EntitySpec; import brooklyn.event.basic.PortAttributeSensorAndConfigKey; import brooklyn.event.feed.ConfigToAttributes; -import brooklyn.test.entity.TestEntity; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java b/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java index 0bff9d0..264978c 100644 --- a/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java +++ b/core/src/test/java/brooklyn/location/cloud/CloudMachineNamerTest.java @@ -21,6 +21,9 @@ package brooklyn.location.cloud; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +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; @@ -33,9 +36,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.cloud.names.AbstractCloudMachineNamer; import brooklyn.location.cloud.names.BasicCloudMachineNamer; import brooklyn.location.cloud.names.CloudMachineNamer; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.config.ConfigBag; import brooklyn.util.text.Strings; public class CloudMachineNamerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java b/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java index 322acd1..328db19 100644 --- a/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java +++ b/core/src/test/java/brooklyn/location/cloud/CustomMachineNamerTest.java @@ -18,6 +18,9 @@ */ package brooklyn.location.cloud; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -27,9 +30,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.cloud.names.CustomMachineNamer; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.config.ConfigBag; import com.google.common.collect.ImmutableMap;
