http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/ha/WarmStandbyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/ha/WarmStandbyTest.java b/core/src/test/java/org/apache/brooklyn/core/management/ha/WarmStandbyTest.java index 8324c16..681e17b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/ha/WarmStandbyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/ha/WarmStandbyTest.java @@ -33,6 +33,9 @@ import org.apache.brooklyn.core.management.ha.ManagementPlaneSyncRecordPersister import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -46,9 +49,6 @@ import brooklyn.entity.rebind.persister.InMemoryObjectStore; import brooklyn.entity.rebind.persister.ListeningObjectStore; import brooklyn.entity.rebind.persister.PersistMode; import brooklyn.entity.rebind.persister.PersistenceObjectStore; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Duration; @Test public class WarmStandbyTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/internal/AccessManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/internal/AccessManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/management/internal/AccessManagerTest.java index 891c3a4..39b6656 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/internal/AccessManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/internal/AccessManagerTest.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,8 +40,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.ImmutableSet; public class AccessManagerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java index 721057d..4ae1224 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/internal/EntityExecutionManagerTest.java @@ -41,9 +41,15 @@ import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.ExecutionListener; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -58,12 +64,6 @@ import brooklyn.entity.basic.BrooklynTaskTags.WrappedEntity; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.event.basic.BasicAttributeSensor; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; import com.google.common.base.Function; import com.google.common.base.Objects; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java b/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java index d88765c..1be4846 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/internal/LocalManagementContextTest.java @@ -29,13 +29,13 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext.PropertiesReloadListener; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.os.Os; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynProperties.Factory.Builder; -import brooklyn.util.os.Os; import com.google.common.base.Charsets; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java index 8dcbec2..b3de3d6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiPathTest.java @@ -23,6 +23,8 @@ import java.io.IOException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; import org.osgi.framework.BundleException; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -32,8 +34,6 @@ import brooklyn.config.BrooklynProperties; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.BrooklynServerPaths; import brooklyn.entity.basic.Entities; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiStandaloneTest.java index 7180b1b..de46afb 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiStandaloneTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiStandaloneTest.java @@ -31,9 +31,13 @@ import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.osgi.Osgis; import org.apache.brooklyn.core.util.osgi.Osgis.ManifestHelper; import org.apache.brooklyn.test.TestResourceUnavailableException; - -import brooklyn.util.exceptions.Exceptions; - +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.maven.MavenArtifact; +import org.apache.brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; import org.apache.commons.io.FileUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -46,13 +50,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; - /** * Tests some assumptions about OSGi behaviour, in standalone mode (not part of brooklyn). * See {@link OsgiTestResources} for description of test resources. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java index edc73d6..7f64634 100644 --- a/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/management/osgi/OsgiVersionMoreEntityTest.java @@ -55,9 +55,8 @@ import brooklyn.entity.proxying.InternalPolicyFactory; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; - -import brooklyn.util.guava.Maybe; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.os.Os; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java index 852e658..b7e1448 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java @@ -23,14 +23,14 @@ import static org.testng.Assert.assertEquals; import java.util.Map; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableSet; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableSet; /** * Test that policy can be created and accessed, by construction and by spec http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java index 295d621..4c25199 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java @@ -27,13 +27,13 @@ import java.util.concurrent.CountDownLatch; import org.apache.brooklyn.core.policy.basic.BasicPolicyTest.MyPolicy; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.util.concurrent.Callables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java index b775598..ef40c80 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java @@ -29,14 +29,13 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; import brooklyn.event.basic.BasicSensorEvent; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; - import com.google.common.collect.ImmutableList; public class PolicySubscriptionTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/BrooklynMavenArtifactsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/BrooklynMavenArtifactsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/BrooklynMavenArtifactsTest.java index a86d1e0..7e98475 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/BrooklynMavenArtifactsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/BrooklynMavenArtifactsTest.java @@ -20,20 +20,19 @@ package org.apache.brooklyn.core.util; import org.apache.brooklyn.core.util.BrooklynMavenArtifacts; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.maven.MavenArtifact; +import org.apache.brooklyn.util.maven.MavenRetriever; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.maven.MavenArtifact; -import brooklyn.util.maven.MavenRetriever; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - @Test public class BrooklynMavenArtifactsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsHttpTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsHttpTest.java b/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsHttpTest.java index 6ea434d..1b2cef4 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsHttpTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsHttpTest.java @@ -25,6 +25,8 @@ import java.io.IOException; import java.io.InputStream; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Strings; import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; @@ -41,8 +43,6 @@ import org.testng.annotations.Test; import brooklyn.test.TestHttpRequestHandler; import brooklyn.test.TestHttpServer; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Strings; public class ResourceUtilsHttpTest { private ResourceUtils utils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsTest.java index 10cf455..e71aec7 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/ResourceUtilsTest.java @@ -33,17 +33,16 @@ import java.util.NoSuchElementException; import java.util.Properties; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/config/ConfigBagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/config/ConfigBagTest.java b/core/src/test/java/org/apache/brooklyn/core/util/config/ConfigBagTest.java index f4db6c2..13bf843 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/config/ConfigBagTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/config/ConfigBagTest.java @@ -25,19 +25,19 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.config.ConfigBagTest; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; public class ConfigBagTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/crypto/SecureKeysAndSignerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/crypto/SecureKeysAndSignerTest.java b/core/src/test/java/org/apache/brooklyn/core/util/crypto/SecureKeysAndSignerTest.java index d681b0f..ef3524e 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/crypto/SecureKeysAndSignerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/crypto/SecureKeysAndSignerTest.java @@ -30,12 +30,11 @@ import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.crypto.FluentKeySigner; import org.apache.brooklyn.core.util.crypto.SecureKeys; import org.apache.brooklyn.core.util.crypto.SecureKeys.PassphraseProblem; +import org.apache.brooklyn.util.crypto.AuthorizedKeysParser; +import org.apache.brooklyn.util.os.Os; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.crypto.AuthorizedKeysParser; -import brooklyn.util.os.Os; - import com.google.common.io.Files; public class SecureKeysAndSignerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveBuilderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveBuilderTest.java b/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveBuilderTest.java index 0ce8298..3c33572 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveBuilderTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveBuilderTest.java @@ -34,13 +34,12 @@ import java.util.zip.ZipInputStream; import javax.annotation.Nullable; import org.apache.brooklyn.core.util.file.ArchiveBuilder; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; - import com.google.common.base.Charsets; import com.google.common.base.Predicate; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveUtilsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveUtilsTest.java index a13ef63..f7b89d8 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/file/ArchiveUtilsTest.java @@ -37,8 +37,7 @@ import org.apache.brooklyn.core.util.ResourceUtils; import org.apache.brooklyn.core.util.file.ArchiveBuilder; import org.apache.brooklyn.core.util.file.ArchiveUtils; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.os.Os; import com.google.api.client.repackaged.com.google.common.base.Joiner; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/flags/MethodCoercionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/flags/MethodCoercionsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/flags/MethodCoercionsTest.java index 2d1efa3..f619f69 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/flags/MethodCoercionsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/flags/MethodCoercionsTest.java @@ -18,13 +18,12 @@ */ package org.apache.brooklyn.core.util.flags; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import org.apache.brooklyn.core.util.flags.MethodCoercions; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/FlagUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/FlagUtilsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/FlagUtilsTest.java index 02becf6..e4c2481 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/FlagUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/FlagUtilsTest.java @@ -30,18 +30,18 @@ import java.util.Set; import org.apache.brooklyn.api.entity.trait.Configurable; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.flags.FlagUtils; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/RepeaterTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/RepeaterTest.groovy b/core/src/test/java/org/apache/brooklyn/core/util/internal/RepeaterTest.groovy index 08ef0da..2345e35 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/RepeaterTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/RepeaterTest.groovy @@ -28,7 +28,7 @@ import org.apache.brooklyn.core.util.internal.Repeater; import org.testng.annotations.Test import brooklyn.util.internal.TimeExtras; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Duration; import com.google.common.base.Stopwatch http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/TypeCoercionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/TypeCoercionsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/TypeCoercionsTest.java index f1bb3f9..dbd482e 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/TypeCoercionsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/TypeCoercionsTest.java @@ -30,6 +30,8 @@ import java.util.Set; import org.apache.brooklyn.core.util.flags.ClassCoercionException; import org.apache.brooklyn.core.util.flags.TypeCoercions; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.text.StringPredicates; import org.codehaus.groovy.runtime.GStringImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,8 +39,6 @@ import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.basic.Lifecycle; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.text.StringPredicates; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/ShellToolAbstractTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/ShellToolAbstractTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/ShellToolAbstractTest.java index 794a512..42b9127 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/ShellToolAbstractTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/ShellToolAbstractTest.java @@ -36,14 +36,13 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.time.Time; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Identifiers; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractIntegrationTest.java index 309d4fb..3b89d5f 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractIntegrationTest.java @@ -35,18 +35,17 @@ import java.util.Map; import org.apache.brooklyn.core.util.internal.ssh.ShellTool; import org.apache.brooklyn.core.util.internal.ssh.SshException; import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractPerformanceTest.java index 1730816..75b2d5c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/SshToolAbstractPerformanceTest.java @@ -28,16 +28,15 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.brooklyn.core.util.internal.ssh.SshTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.text.Identifiers; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliToolIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliToolIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliToolIntegrationTest.java index f8efa87..804513c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliToolIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/cli/SshCliToolIntegrationTest.java @@ -32,13 +32,12 @@ import org.apache.brooklyn.core.util.internal.ssh.SshException; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.internal.ssh.SshToolAbstractIntegrationTest; import org.apache.brooklyn.core.util.internal.ssh.cli.SshCliTool; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessToolStaticsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessToolStaticsTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessToolStaticsTest.java index eacd761..e8e5293 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessToolStaticsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/process/ProcessToolStaticsTest.java @@ -24,13 +24,12 @@ import java.util.Arrays; import java.util.List; import org.apache.brooklyn.core.util.internal.ssh.process.ProcessTool; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.os.Os; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.os.Os; - public class ProcessToolStaticsTest { ByteArrayOutputStream out; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java index e3b4b7d..f7ceaa1 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolAsyncStubIntegrationTest.java @@ -29,13 +29,12 @@ import org.apache.brooklyn.core.internal.BrooklynFeatureEnablement; import org.apache.brooklyn.core.util.internal.ssh.SshAbstractTool.SshAction; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool.ShellAction; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolIntegrationTest.java index bf1aafb..2aa92b0 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/internal/ssh/sshj/SshjToolIntegrationTest.java @@ -41,14 +41,13 @@ import org.apache.brooklyn.core.util.internal.ssh.SshException; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.internal.ssh.SshToolAbstractIntegrationTest; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeTimeoutException; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeTimeoutException; -import brooklyn.util.os.Os; -import brooklyn.util.time.Duration; - import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/ssh/BashCommandsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/ssh/BashCommandsIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/ssh/BashCommandsIntegrationTest.java index 77f91f6..f699da4 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/ssh/BashCommandsIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/ssh/BashCommandsIntegrationTest.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.core.util.ssh; -import static brooklyn.util.ssh.BashCommands.sudo; import static java.lang.String.format; +import static org.apache.brooklyn.util.ssh.BashCommands.sudo; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; @@ -38,6 +38,13 @@ import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.ssh.BashCommands; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,14 +58,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.text.Identifiers; -import brooklyn.util.text.Strings; -import brooklyn.util.time.Duration; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionPerformanceTest.java index 71d2586..73a6be6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionPerformanceTest.java @@ -31,14 +31,13 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.ScheduledTask; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Predicate; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionTest.java index c730738..b4ef5f9 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTaskExecutionTest.java @@ -37,15 +37,14 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTasksFutureTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTasksFutureTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTasksFutureTest.java index 020a98c..4a9dff2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTasksFutureTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/BasicTasksFutureTest.java @@ -32,6 +32,9 @@ import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -39,10 +42,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; public class BasicTasksFutureTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/CompoundTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/CompoundTaskExecutionTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/CompoundTaskExecutionTest.java index 89bde95..65d6bd9 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/CompoundTaskExecutionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/CompoundTaskExecutionTest.java @@ -36,6 +36,8 @@ import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.CompoundTask; import org.apache.brooklyn.core.util.task.ParallelTask; import org.apache.brooklyn.core.util.task.SequentialTask; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterClass; @@ -43,9 +45,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import org.testng.collections.Lists; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/DynamicSequentialTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/DynamicSequentialTaskTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/DynamicSequentialTaskTest.java index c4f8d4c..ea7bcb1 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/DynamicSequentialTaskTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/DynamicSequentialTaskTest.java @@ -36,6 +36,13 @@ import org.apache.brooklyn.core.util.task.DynamicSequentialTask; import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskTags; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.CountdownTimer; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -43,14 +50,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.CountdownTimer; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/NonBasicTaskExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/NonBasicTaskExecutionTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/NonBasicTaskExecutionTest.java index 980a701..e2663c2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/NonBasicTaskExecutionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/NonBasicTaskExecutionTest.java @@ -35,15 +35,14 @@ import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.ForwardingTask; import org.apache.brooklyn.core.util.task.TaskInternal; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; - /** * Test the operation of the {@link BasicTask} class. * http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/ScheduledExecutionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/ScheduledExecutionTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/ScheduledExecutionTest.java index 3b338da..e8dd6e2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/ScheduledExecutionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/ScheduledExecutionTest.java @@ -34,19 +34,18 @@ import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.ScheduledTask; import org.apache.brooklyn.core.util.task.Tasks; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.exceptions.RuntimeInterruptedException; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.exceptions.RuntimeInterruptedException; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/SingleThreadedSchedulerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/SingleThreadedSchedulerTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/SingleThreadedSchedulerTest.java index e3420c8..588a7f9 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/SingleThreadedSchedulerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/SingleThreadedSchedulerTest.java @@ -36,15 +36,14 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.core.util.task.BasicExecutionManager; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.SingleThreadedScheduler; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; - import com.google.common.util.concurrent.Callables; public class SingleThreadedSchedulerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/TaskFinalizationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/TaskFinalizationTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/TaskFinalizationTest.java index 1ff181b..0ec552b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/TaskFinalizationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/TaskFinalizationTest.java @@ -23,13 +23,12 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; public class TaskFinalizationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/TasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/TasksTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/TasksTest.java index 0800984..e3fd36d0 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/TasksTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/TasksTest.java @@ -33,15 +33,15 @@ import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ValueResolver; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.time.Duration; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.EntityFunctions; -import brooklyn.util.guava.Functionals; -import brooklyn.util.repeat.Repeater; -import brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/ValueResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/ValueResolverTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/ValueResolverTest.java index 9f65bc4..8472c32 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/ValueResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/ValueResolverTest.java @@ -24,14 +24,14 @@ import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.core.util.task.ValueResolver; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Time; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.util.guava.Maybe; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; /** * see also {@link TasksTest} for more tests http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/ssh/SshTasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/ssh/SshTasksTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/ssh/SshTasksTest.java index 94fe3e6..b6c3317 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/ssh/SshTasksTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/ssh/SshTasksTest.java @@ -46,9 +46,8 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; /** * Some tests for {@link SshTasks}. Note more tests in {@link BashCommandsIntegrationTest}, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/task/system/SystemTasksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/task/system/SystemTasksTest.java b/core/src/test/java/org/apache/brooklyn/core/util/task/system/SystemTasksTest.java index b673056..adea349 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/task/system/SystemTasksTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/task/system/SystemTasksTest.java @@ -26,13 +26,13 @@ import org.apache.brooklyn.core.util.task.ssh.SshTasks; import org.apache.brooklyn.core.util.task.system.ProcessTaskFactory; import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper; import org.apache.brooklyn.core.util.task.system.SystemTasks; +import org.apache.brooklyn.util.os.Os; 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.util.os.Os; /** * Some tests for {@link SystemTasks}. See {@link SshTasks}. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/text/TemplateProcessorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/text/TemplateProcessorTest.java b/core/src/test/java/org/apache/brooklyn/core/util/text/TemplateProcessorTest.java index 05f4fde..45e5221 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/text/TemplateProcessorTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/text/TemplateProcessorTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.text.TemplateProcessor; +import org.apache.brooklyn.test.FixedLocaleTest; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.Assert; @@ -32,7 +33,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.test.FixedLocaleTest; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java b/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java index 6a15ee9..3c42b8d 100644 --- a/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/util/xstream/StringKeyMapConverterTest.java @@ -23,10 +23,9 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.brooklyn.core.util.xstream.StringKeyMapConverter; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.Maps; import com.thoughtworks.xstream.XStream; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/access/BrooklynAccessUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/BrooklynAccessUtilsTest.java b/core/src/test/java/org/apache/brooklyn/location/access/BrooklynAccessUtilsTest.java index e5a8574..602bfd4 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/BrooklynAccessUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/BrooklynAccessUtilsTest.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.basic.SupportsPortForwarding; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.net.Cidr; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -39,7 +40,6 @@ import com.google.common.net.HostAndPort; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Attributes; -import brooklyn.util.net.Cidr; public class BrooklynAccessUtilsTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java index d36dec0..38e3ffa 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerRebindTest.java @@ -28,14 +28,18 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ha.MementoCopyMode; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.rebind.RebindOptions; import brooklyn.entity.rebind.RebindTestFixtureWithApp; @@ -47,11 +51,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; -import brooklyn.util.text.Identifiers; -import brooklyn.util.time.Time; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java index ef5cf93..da6223a 100644 --- a/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/access/PortForwardManagerTest.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -38,8 +39,6 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.net.Networking; - import com.google.common.base.Predicate; import com.google.common.net.HostAndPort; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java index d24ac65..fb85bc2 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/AbstractLocationTest.java @@ -31,13 +31,13 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java index c282fa2..2b2ce27 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/ByonLocationResolverTest.java @@ -34,7 +34,13 @@ import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.UserAndHostAndPort; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.text.StringPredicates; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -45,12 +51,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.net.UserAndHostAndPort; -import brooklyn.util.os.Os; -import brooklyn.util.text.StringPredicates; import com.google.common.base.Function; import com.google.common.base.Joiner; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java index 84cc898..3eaf486 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationRebindTest.java @@ -28,6 +28,8 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.os.Os; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,8 +37,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.os.Os; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java index 9ddc3bf..5945aed 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/FixedListMachineProvisioningLocationTest.java @@ -31,8 +31,13 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.stream.Streams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -47,13 +52,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.stream.Streams; /** * Provisions {@link SshMachineLocation}s in a specific location from a list of known machines http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java index c53762e..486988a 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LegacyAbstractLocationTest.java @@ -27,11 +27,10 @@ import java.util.Collections; import java.util.Map; import org.apache.brooklyn.core.util.flags.SetFromFlag; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; - import com.google.common.collect.ImmutableList; public class LegacyAbstractLocationTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java index f04e6cd..26c0261 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostLocationResolverTest.java @@ -30,6 +30,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.text.StringEscapes.JavaStringEscapes; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -37,7 +38,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.util.text.StringEscapes.JavaStringEscapes; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java index cd1df7a..ad4ab04 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocalhostMachineProvisioningLocationTest.java @@ -25,6 +25,8 @@ import static org.testng.Assert.fail; import java.net.ServerSocket; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,9 +44,6 @@ import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.geo.HostGeoInfo; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; - public class LocalhostMachineProvisioningLocationTest { private static final Logger log = LoggerFactory.getLogger(LocalhostMachineProvisioningLocationTest.class); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java index cbf1aaa..27e2dfa 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/LocationConfigTest.java @@ -22,6 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.testng.Assert; @@ -29,7 +30,6 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java index 6d2e841..f559d70 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationRebindTest.java @@ -26,7 +26,11 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.os.Os; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,10 +38,6 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.Entities; import brooklyn.entity.rebind.RebindTestUtils; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.net.Networking; -import brooklyn.util.os.Os; import com.google.common.base.Function; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java index 8ccf2e4..f1829c7 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationResolverTest.java @@ -38,6 +38,9 @@ import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -45,9 +48,6 @@ import org.testng.annotations.Test; import brooklyn.config.BrooklynProperties; import brooklyn.entity.basic.Entities; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; import com.google.common.base.Objects; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java index 314c81b..9ee544f 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/MultiLocationTest.java @@ -20,7 +20,10 @@ package org.apache.brooklyn.location.basic; import static org.testng.Assert.assertTrue; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -35,10 +38,6 @@ import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.net.Networking; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java b/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java index fdbcf1c..1e2cd33 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SimulatedLocation.java @@ -31,9 +31,8 @@ import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.api.location.PortSupplier; - -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java index 19b58fd..a57cfe2 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationIntegrationTest.java @@ -33,13 +33,13 @@ import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool.SshjToolBuilder; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; 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.util.collections.MutableMap; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java index f7f8bf9..57234a4 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationPerformanceTest.java @@ -27,18 +27,17 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.test.PerformanceTestUtils; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.stream.Streams; -import brooklyn.util.text.Identifiers; -import brooklyn.util.time.Time; - import com.google.common.base.Stopwatch; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java index fd5884c..3c1ec8f 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationReuseIntegrationTest.java @@ -37,12 +37,11 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.internal.ssh.sshj.SshjTool; - -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Duration; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Duration; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java index ca51182..81b0b07 100644 --- a/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/basic/SshMachineLocationTest.java @@ -50,8 +50,16 @@ import org.apache.brooklyn.core.util.internal.ssh.SshException; import org.apache.brooklyn.core.util.internal.ssh.SshTool; import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.BasicExecutionManager; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.net.Urls; +import org.apache.brooklyn.util.os.Os; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -63,14 +71,6 @@ import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorBody; import brooklyn.entity.effector.EffectorTaskTest; import brooklyn.entity.effector.Effectors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; -import brooklyn.util.net.Networking; -import brooklyn.util.net.Urls; -import brooklyn.util.os.Os; -import brooklyn.util.stream.Streams; -import brooklyn.util.time.Duration; import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList;
