http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java index 6079258..7b9d470 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/SoftwareProcessSshDriverIntegrationTest.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -42,7 +43,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.BrooklynNetworkUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Networking;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java index 2ad2ef7..8cf2eef 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/VanillaSoftwareProcessAndChildrenIntegrationTest.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; import org.apache.brooklyn.test.EntityTestUtils; +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.entity.basic.SoftwareProcess.ChildStartableMode; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java index 287dbb2..92f5c8c 100644 --- a/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java +++ b/software/base/src/test/java/brooklyn/entity/basic/lifecycle/StartStopSshDriverTest.java @@ -30,6 +30,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +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.BeforeMethod; import org.testng.annotations.Test; @@ -39,10 +43,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityLocal; import brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationImpl; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableList; import brooklyn.util.collections.MutableSet; import brooklyn.util.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java index 6b7ab73..24935ac 100644 --- a/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java +++ b/software/base/src/test/java/brooklyn/entity/brooklynnode/BrooklynNodeTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -39,7 +40,6 @@ import brooklyn.event.feed.ConfigToAttributes; import brooklyn.location.Location; import brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.collections.MutableSet; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/chef/ChefConfigsTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefConfigsTest.java b/software/base/src/test/java/brooklyn/entity/chef/ChefConfigsTest.java index 9c8f4e3..96f19b9 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefConfigsTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefConfigsTest.java @@ -20,13 +20,13 @@ package brooklyn.entity.chef; import java.util.Set; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.test.entity.TestApplication; public class ChefConfigsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java index fc964c1..cdd8454 100644 --- a/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/chef/ChefServerTasksIntegrationTest.java @@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -31,7 +32,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; -import brooklyn.test.entity.TestApplication; import brooklyn.util.stream.StreamGobbler; import brooklyn.util.task.system.ProcessTaskWrapper; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java index 333df4d..70d9047 100644 --- a/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/EntityPollingTest.java @@ -22,6 +22,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -38,7 +39,6 @@ import brooklyn.event.feed.jmx.JmxFeed; import brooklyn.location.MachineLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.test.JmxService; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java index 167838c..26053f4 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JavaSoftwareProcessSshDriverIntegrationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; 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; @@ -38,7 +39,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.MachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; import brooklyn.util.collections.MutableMap; import brooklyn.util.os.Os; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java index 9828ff6..caaf757 100644 --- a/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/JmxSupportTest.java @@ -20,6 +20,7 @@ package brooklyn.entity.java; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.entity.java.UsesJmx.JmxAgentModes; -import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.exceptions.Exceptions; import brooklyn.util.flags.TypeCoercions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java index dbe4047..336a6af 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppRebindTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import java.io.File; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,7 +40,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java index 466e28b..7ef1ffd 100644 --- a/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java +++ b/software/base/src/test/java/brooklyn/entity/java/VanillaJavaAppTest.java @@ -39,6 +39,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -55,7 +56,6 @@ import brooklyn.event.feed.jmx.JmxHelper; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.ResourceUtils; import brooklyn.util.collections.MutableMap; import brooklyn.util.crypto.FluentKeySigner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java index 30f1222..cc718be 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/AbstractServerPoolTest.java @@ -24,6 +24,8 @@ import java.util.List; 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; @@ -37,8 +39,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java index c2a75b0..67a9204 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLiveTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertTrue; import java.util.Map; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.Test; import com.google.common.base.CaseFormat; @@ -32,8 +34,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.entity.Entity; import brooklyn.entity.basic.Attributes; import brooklyn.location.Location; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; public class ServerPoolLiveTest extends AbstractServerPoolTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java index fbb360b..b542bcf 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolLocationResolverTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertEquals; import java.util.Map; +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; @@ -40,8 +42,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.dynamic.DynamicLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; public class ServerPoolLocationResolverTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java index c99a6ec..e434c64 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolRebindTest.java @@ -25,6 +25,7 @@ import java.io.File; import java.util.Collection; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -36,7 +37,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import com.google.common.base.Optional; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java index 7a64dff..917ee2d 100644 --- a/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java +++ b/software/base/src/test/java/brooklyn/entity/pool/ServerPoolTest.java @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Iterator; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Lifecycle; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation.LocalhostMachine; -import brooklyn.test.entity.TestApplication; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java index 7e89017..cc340ad 100644 --- a/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/AbstractDockerLiveTest.java @@ -23,7 +23,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.base.CaseFormat; @@ -31,6 +30,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java index 5394c11..65cdb7d 100644 --- a/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/MachineLifecycleEffectorTasksTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.List; import org.apache.brooklyn.management.Task; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -51,7 +52,6 @@ import brooklyn.event.basic.DependentConfiguration; import brooklyn.event.basic.Sensors; import brooklyn.location.jclouds.BailOutJcloudsLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.task.TaskInternal; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java index 951325c..841b0c4 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SoftwareEffectorTest.java @@ -22,6 +22,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.Assert; @@ -36,7 +37,6 @@ import brooklyn.entity.software.SshEffectorTasks.SshEffectorBody; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.config.ConfigBag; import brooklyn.util.task.system.ProcessTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java index f22130c..e0d2c44 100644 --- a/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/SshEffectorTasksTest.java @@ -25,6 +25,7 @@ import java.util.Arrays; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.management.TaskAdaptable; import org.apache.brooklyn.management.TaskFactory; +import org.apache.brooklyn.test.entity.TestApplication; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +39,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.exceptions.PropagatedRuntimeException; import brooklyn.util.net.Urls; import brooklyn.util.task.ssh.SshFetchTaskWrapper; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java index ba11077..9437929 100644 --- a/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/http/HttpRequestSensorTest.java @@ -19,6 +19,8 @@ package brooklyn.entity.software.http; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -32,8 +34,6 @@ import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java index caff43a..be7d65d 100644 --- a/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java +++ b/software/base/src/test/java/brooklyn/entity/software/ssh/SshCommandIntegrationTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertTrue; import java.io.File; import org.apache.brooklyn.test.EntityTestUtils; +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; @@ -38,8 +40,6 @@ import brooklyn.event.AttributeSensor; import brooklyn.event.basic.Sensors; import brooklyn.location.Location; import brooklyn.location.basic.SshMachineLocation; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.MutableMap; import brooklyn.util.config.ConfigBag; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java index 663aba9..c5ddd85 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/JmxFeedTest.java @@ -42,6 +42,10 @@ import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import org.apache.brooklyn.test.TestUtils; +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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -71,10 +75,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.test.Asserts; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestApplicationImpl; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java index 2234e99..9fce61b 100644 --- a/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java +++ b/software/base/src/test/java/brooklyn/event/feed/jmx/RebindJmxFeedTest.java @@ -23,6 +23,8 @@ import static org.testng.Assert.assertEquals; import java.util.Collection; import org.apache.brooklyn.test.EntityTestUtils; +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.AfterMethod; @@ -45,8 +47,6 @@ import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; import brooklyn.test.GeneralisedDynamicMBean; import brooklyn.test.JmxService; -import brooklyn.test.entity.TestEntity; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java b/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java index 735a23f..5baf071 100644 --- a/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java +++ b/software/base/src/test/java/brooklyn/location/basic/WinRmMachineLocationLiveTest.java @@ -19,6 +19,10 @@ package brooklyn.location.basic; import static org.testng.Assert.assertEquals; + +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; + import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; import org.slf4j.Logger; @@ -33,8 +37,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.jclouds.JcloudsLocation; import brooklyn.location.jclouds.JcloudsWinRmMachineLocation; import brooklyn.management.internal.ManagementContextInternal; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java index 5f520be..8a7e636 100644 --- a/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/ApplicationUsageTrackingTest.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +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; @@ -43,8 +45,6 @@ import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageListener.ApplicationMetadata; import brooklyn.management.usage.ApplicationUsage.ApplicationEvent; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.time.Time; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java index 612d2b3..9812d45 100644 --- a/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java +++ b/software/base/src/test/java/brooklyn/management/usage/UsageListenerTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertTrue; import java.util.List; +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; @@ -34,8 +36,6 @@ import brooklyn.location.Location; import brooklyn.management.internal.ManagementContextInternal; import brooklyn.management.internal.UsageManager; import brooklyn.test.Asserts; -import brooklyn.test.entity.LocalManagementContextForTests; -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/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java index a8f7be3..4f25d91 100644 --- a/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/crate/CrateNodeIntegrationTest.java @@ -21,6 +21,7 @@ package brooklyn.entity.database.crate; import static org.testng.Assert.assertFalse; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; public class CrateNodeIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java index a14818e..0a68c31 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/mariadb/MariaDbIntegrationTest.java @@ -22,6 +22,7 @@ import java.io.File; import java.net.InetAddress; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -37,7 +38,6 @@ import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java index 511d601..368a5f1 100644 --- a/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java +++ b/software/database/src/test/java/brooklyn/entity/database/mysql/MySqlClusterTestHelper.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import java.util.List; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +35,6 @@ import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java index b4ce563..a7c80eb 100644 --- a/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlIntegrationTest.java @@ -19,6 +19,7 @@ package brooklyn.entity.database.postgresql; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -33,7 +34,6 @@ import brooklyn.entity.database.VogellaExampleAccess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java index f7c2ae4..45a8135 100644 --- a/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java +++ b/software/database/src/test/java/brooklyn/entity/database/rubyrep/RubyRepIntegrationTest.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -44,7 +45,6 @@ import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.PortRanges; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; public class RubyRepIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java index dd0837b..3235696 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/activemq/ActiveMQIntegrationTest.java @@ -32,6 +32,7 @@ import javax.jms.TextMessage; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -46,7 +47,6 @@ import brooklyn.entity.java.UsesJmx.JmxAgentModes; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java index 83be0e5..3c9bb70 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/kafka/KafkaIntegrationTest.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.Callable; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,7 +39,6 @@ import brooklyn.location.Location; import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java index 87a0460..c81505a 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/qpid/QpidIntegrationTest.java @@ -35,6 +35,7 @@ import javax.jms.TextMessage; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.apache.qpid.client.AMQConnectionFactory; import org.apache.qpid.configuration.ClientProperties; import org.slf4j.Logger; @@ -51,7 +52,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java index a54b89d..268b212 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/rabbit/RabbitIntegrationTest.java @@ -24,6 +24,7 @@ import static org.testng.Assert.assertFalse; import java.io.IOException; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -38,7 +39,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java index a612140..dda2843 100644 --- a/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java +++ b/software/messaging/src/test/java/brooklyn/entity/messaging/zookeeper/ZooKeeperEnsembleLiveTest.java @@ -27,13 +27,13 @@ import brooklyn.entity.trait.Startable; import brooklyn.entity.zookeeper.ZooKeeperEnsemble; import brooklyn.entity.zookeeper.ZooKeeperNode; import brooklyn.location.Location; -import brooklyn.test.entity.TestApplication; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.Uninterruptibles; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java index e9adbe0..e420b42 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerIntegrationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.policy.EnricherSpec; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; @@ -47,7 +48,6 @@ import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixture; -import brooklyn.test.entity.TestApplication; public class BindDnsServerIntegrationTest extends RebindTestFixture<TestApplication> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java index ec6535b..b559357 100644 --- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java +++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerLiveTest.java @@ -22,6 +22,7 @@ import static org.apache.brooklyn.test.EntityTestUtils.assertAttributeEqualsEven import static org.testng.Assert.assertEquals; import org.apache.brooklyn.policy.EnricherSpec; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,6 @@ import brooklyn.entity.basic.SameServerEntity; import brooklyn.entity.group.DynamicCluster; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.Location; -import brooklyn.test.entity.TestApplication; import brooklyn.util.repeat.Repeater; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseOfflineTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseOfflineTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseOfflineTest.java index de1d49a..56294e9 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseOfflineTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseOfflineTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.entity.nosql.couchbase; import org.apache.brooklyn.entity.nosql.couchbase.CouchbaseNodeSshDriver; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -28,7 +29,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.location.basic.BasicOsDetails; import brooklyn.location.basic.BasicOsDetails.OsArchs; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.LocalManagementContextForTests; public class CouchbaseOfflineTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java index d7bfa6b..8429dc4 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/AbstractCouchDBNodeTest.java @@ -19,6 +19,7 @@ package org.apache.brooklyn.entity.nosql.couchdb; import org.apache.brooklyn.entity.nosql.couchdb.CouchDBNode; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -28,7 +29,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.internal.TimeExtras; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java index 65e452d..64bf3c7 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/couchdb/CouchDBClusterLiveTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.entity.nosql.couchdb.CouchDBCluster; import org.apache.brooklyn.entity.nosql.couchdb.CouchDBNode; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; -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/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java index 9c5bda1..0394571 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/elasticsearch/ElasticSearchNodeIntegrationTest.java @@ -25,6 +25,7 @@ import java.net.URISyntaxException; import org.apache.brooklyn.entity.nosql.elasticsearch.ElasticSearchNode; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.apache.http.client.methods.HttpGet; import org.bouncycastle.util.Strings; import org.testng.annotations.AfterMethod; @@ -39,7 +40,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.event.feed.http.HttpValueFunctions; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.http.HttpTool; import brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java index 28c82c4..5947c61 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/MongoDBIntegrationTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertFalse; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.mongodb.DBObject; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java index f915e19..79f1a7e 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBConfigServerIntegrationTest.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.entity.nosql.mongodb.MongoDBServer; import org.apache.brooklyn.entity.nosql.mongodb.MongoDBTestHelper; import org.apache.brooklyn.entity.nosql.mongodb.sharding.MongoDBConfigServer; import org.apache.brooklyn.test.EntityTestUtils; +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.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterIntegrationTest.java index aabd2a2..7bb04b2 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisClusterIntegrationTest.java @@ -28,6 +28,7 @@ import org.apache.brooklyn.entity.nosql.redis.RedisCluster; import org.apache.brooklyn.entity.nosql.redis.RedisSlave; import org.apache.brooklyn.entity.nosql.redis.RedisStore; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -40,7 +41,6 @@ import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisIntegrationTest.java index 6cca4c9..4895953 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/redis/RedisIntegrationTest.java @@ -22,6 +22,7 @@ import javax.annotation.Nullable; import org.apache.brooklyn.entity.nosql.redis.RedisStore; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,7 +32,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.Location; import brooklyn.location.basic.PortRanges; -import brooklyn.test.entity.TestApplication; import brooklyn.util.time.Duration; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeIntegrationTest.java index 9722154..ad8e26f 100644 --- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeIntegrationTest.java +++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeIntegrationTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertFalse; import org.apache.brooklyn.entity.nosql.riak.RiakNode; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,7 +33,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; public class RiakNodeIntegrationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java index 12ffce9..6cfc5f8 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.entity.dns.AbstractGeoDnsServiceImpl; import org.apache.brooklyn.entity.dns.AbstractGeoDnsServiceTest; import org.apache.brooklyn.management.ManagementContext; 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; @@ -60,8 +62,6 @@ import brooklyn.location.basic.SimulatedLocation; import brooklyn.location.basic.SshMachineLocation; import brooklyn.location.geo.HostGeoInfo; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntity; import brooklyn.util.collections.CollectionFunctionals; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java index b49d9eb..ab71184 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingIntegrationTest.java @@ -25,6 +25,8 @@ import java.net.InetAddress; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingScriptGenerator; import org.apache.brooklyn.management.ManagementContext; +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; @@ -43,8 +45,6 @@ import brooklyn.location.geo.HostGeoLookup; import brooklyn.location.geo.MaxMind2HostGeoLookup; import brooklyn.location.geo.UtraceHostGeoLookup; 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.internal.BrooklynSystemProperties; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java index 42649e8..f166958 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +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; @@ -53,8 +55,6 @@ import brooklyn.location.NoMachinesAvailableException; import brooklyn.location.basic.FixedListMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocation; 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.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/UrlMappingTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/UrlMappingTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/UrlMappingTest.java index ba51549..3c398c9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/UrlMappingTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/UrlMappingTest.java @@ -26,6 +26,7 @@ import java.util.HashSet; import javax.annotation.Nullable; import org.apache.brooklyn.entity.proxy.nginx.UrlMapping; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -47,7 +48,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java index a283bba..804a933 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java @@ -33,6 +33,7 @@ import org.apache.brooklyn.management.ha.HighAvailabilityMode; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -54,7 +55,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.location.basic.SshMachineLocationReuseIntegrationTest.RecordingSshjTool; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.internal.ssh.SshTool; import brooklyn.util.net.Networking; import brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java index 76c4bb5..cfc65fc 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java @@ -29,6 +29,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.management.ManagementContext; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -44,7 +45,6 @@ import brooklyn.location.Location; import brooklyn.location.MachineLocation; import brooklyn.location.basic.Machines; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index f21a14a..c8df7db 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -73,9 +73,9 @@ import org.apache.brooklyn.management.SubscriptionHandle; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.LocalManagementContextForTests; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import brooklyn.util.crypto.FluentKeySigner; import brooklyn.util.crypto.SecureKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java index ec063f4..7d56da3 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestJavaWebAppEntity; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -35,7 +36,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Startable; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java index 63954e8..56780b0 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/DynamicWebAppFabricTest.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppFabric; import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestJavaWebAppEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,6 @@ import brooklyn.entity.basic.EntityLocal; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.trait.Changeable; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticCustomLocationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticCustomLocationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticCustomLocationTest.java index 7a13ac2..6812a08 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticCustomLocationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticCustomLocationTest.java @@ -22,6 +22,8 @@ import java.util.Map; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService.ElasticJavaWebAppServiceAwareLocation; +import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestEntityImpl; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -33,8 +35,6 @@ import brooklyn.entity.basic.BasicConfigurableEntityFactory; import brooklyn.entity.basic.ConfigurableEntityFactory; import brooklyn.entity.basic.Entities; import brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.entity.TestApplication; -import brooklyn.test.entity.TestEntityImpl; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java index 93859a2..17dacc7 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java @@ -21,6 +21,7 @@ package org.apache.brooklyn.entity.webapp; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -28,7 +29,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java index 2158d2d..53bd9a9 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl; import org.apache.brooklyn.management.ManagementContext; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -38,7 +39,6 @@ import brooklyn.location.LocationSpec; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; -import brooklyn.test.entity.TestApplication; import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy index db16cbd..38c9148 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppLiveIntegrationTest.groovy @@ -47,7 +47,7 @@ import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl import brooklyn.location.Location import brooklyn.location.basic.BasicLocationRegistry import org.apache.brooklyn.test.TestUtils -import brooklyn.test.entity.TestApplicationImpl +import org.apache.brooklyn.test.entity.TestApplicationImpl import brooklyn.util.internal.TimeExtras /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java index 59232e6..1ccde87 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -48,7 +49,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -import brooklyn.test.entity.TestApplication; import brooklyn.util.internal.TimeExtras; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java index 30c0068..dbc5d4f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -47,7 +48,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindTestUtils; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; import brooklyn.management.internal.LocalManagementContext; -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/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java index 8a4ab3e..86ab33f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java @@ -39,8 +39,7 @@ import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; - -import brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.test.entity.TestApplication; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java index 93b19fe..1f5d270 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.entity.TestApplication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -41,7 +42,6 @@ import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixtureWithApp; import brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.test.entity.TestApplication; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d702c5b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java index 2de395e..e23a95c 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java @@ -22,13 +22,13 @@ import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; import org.apache.brooklyn.entity.webapp.jboss.JBoss6Server; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; +import org.apache.brooklyn.test.entity.TestApplication; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import brooklyn.entity.basic.SoftwareProcess; import brooklyn.entity.proxying.EntitySpec; import brooklyn.location.basic.PortRanges; -import brooklyn.test.entity.TestApplication; public class JBossServersMultiVersionWebAppFixtureIntegrationTest extends AbstractWebAppFixtureIntegrationTest {
