http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java index c85060c..9df4cfd 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/HostGeoInfo.java @@ -29,13 +29,12 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.util.flags.TypeCoercions; import org.apache.brooklyn.location.basic.AbstractLocation; import org.apache.brooklyn.location.basic.LocationConfigKeys; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.guava.Maybe; +import org.apache.brooklyn.util.internal.BrooklynSystemProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.guava.Maybe; -import brooklyn.util.internal.BrooklynSystemProperties; - import com.google.common.base.Objects; /**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java index 8738817..04e0f0a 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java @@ -27,14 +27,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.brooklyn.core.util.ResourceUtils; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Durations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.text.StringPredicates; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Durations; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Predicates; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/geo/MaxMind2HostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/MaxMind2HostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/location/geo/MaxMind2HostGeoLookup.java index f907329..b2fc5c9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/MaxMind2HostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/MaxMind2HostGeoLookup.java @@ -23,13 +23,12 @@ import java.io.IOException; import java.net.InetAddress; import java.net.MalformedURLException; +import org.apache.brooklyn.util.internal.BrooklynSystemProperties; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.internal.BrooklynSystemProperties; -import brooklyn.util.net.Networking; -import brooklyn.util.text.Strings; - import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.maxmind.geoip2.DatabaseReader; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/main/java/org/apache/brooklyn/location/geo/UtraceHostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/UtraceHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/location/geo/UtraceHostGeoLookup.java index 9b2537c..795ccb8 100644 --- a/core/src/main/java/org/apache/brooklyn/location/geo/UtraceHostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/location/geo/UtraceHostGeoLookup.java @@ -30,15 +30,14 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.JavaClassNames; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.time.Duration; +import org.apache.brooklyn.util.time.Durations; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.net.Networking; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Durations; - import com.google.common.base.Throwables; public class UtraceHostGeoLookup implements HostGeoLookup { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/BrooklynVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/BrooklynVersionTest.java b/core/src/test/java/brooklyn/BrooklynVersionTest.java index ebcfbd9..1c0ecde 100644 --- a/core/src/test/java/brooklyn/BrooklynVersionTest.java +++ b/core/src/test/java/brooklyn/BrooklynVersionTest.java @@ -41,8 +41,7 @@ import org.apache.brooklyn.core.management.internal.LocalManagementContext; import org.apache.brooklyn.core.management.osgi.OsgiTestResources; import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; - -import brooklyn.util.text.Strings; +import org.apache.brooklyn.util.text.Strings; public class BrooklynVersionTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java index 70b3e5f..4ba6d59 100644 --- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java +++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java @@ -25,6 +25,8 @@ import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.stream.Streams; import java.io.IOException; import java.io.InputStreamReader; @@ -62,8 +64,6 @@ import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; import brooklyn.entity.effector.AddChildrenEffector; import brooklyn.entity.effector.Effectors; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.stream.Streams; import com.google.common.base.Joiner; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java index 5e25bde..47b3c3f 100644 --- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java +++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java @@ -34,10 +34,10 @@ import org.apache.brooklyn.camp.spi.instantiate.BasicAssemblyTemplateInstantiato import org.apache.brooklyn.core.util.config.ConfigBag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator; import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext; -import brooklyn.util.collections.MutableMap; /** simple illustrative instantiator which always makes a {@link TestApplication}, populated with {@link TestEntity} children, * all setting {@link TestEntity#CONF_NAME} for the name in the plan and in the service specs http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/config/BrooklynPropertiesBuilderTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/config/BrooklynPropertiesBuilderTest.java b/core/src/test/java/brooklyn/config/BrooklynPropertiesBuilderTest.java index 14c2c2c..3941942 100644 --- a/core/src/test/java/brooklyn/config/BrooklynPropertiesBuilderTest.java +++ b/core/src/test/java/brooklyn/config/BrooklynPropertiesBuilderTest.java @@ -22,12 +22,11 @@ import static org.testng.Assert.assertEquals; import java.io.File; +import org.apache.brooklyn.util.os.Os; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -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/brooklyn/config/BrooklynPropertiesFromGroovyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/config/BrooklynPropertiesFromGroovyTest.groovy b/core/src/test/java/brooklyn/config/BrooklynPropertiesFromGroovyTest.groovy index 05d4dfb..e68935c 100644 --- a/core/src/test/java/brooklyn/config/BrooklynPropertiesFromGroovyTest.groovy +++ b/core/src/test/java/brooklyn/config/BrooklynPropertiesFromGroovyTest.groovy @@ -23,7 +23,7 @@ import static org.testng.Assert.fail import org.testng.annotations.Test -import brooklyn.util.collections.MutableMap; +import org.apache.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/brooklyn/config/BrooklynPropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java b/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java index 31d53f2..01f3eba 100644 --- a/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java +++ b/core/src/test/java/brooklyn/config/BrooklynPropertiesTest.java @@ -23,11 +23,11 @@ import static org.testng.Assert.fail; import java.util.NoSuchElementException; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/config/ConfigUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/config/ConfigUtilsTest.java b/core/src/test/java/brooklyn/config/ConfigUtilsTest.java index 6b562f4..8365b37 100644 --- a/core/src/test/java/brooklyn/config/ConfigUtilsTest.java +++ b/core/src/test/java/brooklyn/config/ConfigUtilsTest.java @@ -20,10 +20,11 @@ package brooklyn.config; import java.util.Set; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey.HasConfigKey; import brooklyn.entity.basic.ConfigKeys; public class ConfigUtilsTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java index d761331..5ee4bf0 100644 --- a/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/CustomAggregatingEnricherTest.java @@ -26,6 +26,7 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -38,8 +39,6 @@ import brooklyn.event.basic.BasicAttributeSensor; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/EnrichersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/EnrichersTest.java b/core/src/test/java/brooklyn/enricher/EnrichersTest.java index 609fb88..dbfa01e 100644 --- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java +++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java @@ -36,17 +36,17 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.CollectionFunctionals; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.guava.Functionals; +import org.apache.brooklyn.util.text.StringFunctions; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.CollectionFunctionals; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.guava.Functionals; -import brooklyn.util.text.StringFunctions; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java index 51a298b..dfe0419 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherDeprecatedTest.java @@ -24,17 +24,17 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.javalang.AtomicReferences; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.enricher.basic.SensorPropagatingEnricher; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.javalang.AtomicReferences; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java index 401ee17..3629556 100644 --- a/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/SensorPropagatingEnricherTest.java @@ -25,8 +25,12 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.javalang.AtomicReferences; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,10 +38,6 @@ import brooklyn.enricher.basic.Propagator; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicNotificationSensor; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.AtomicReferences; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy index 7a0fa1c..4025592 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherDeprecatedTest.groovy @@ -36,7 +36,7 @@ import org.apache.brooklyn.location.basic.SimulatedLocation import org.apache.brooklyn.test.TestUtils import org.apache.brooklyn.test.entity.TestApplication import org.apache.brooklyn.test.entity.TestEntity -import brooklyn.util.collections.MutableMap +import org.apache.brooklyn.util.collections.MutableMap public class TransformingEnricherDeprecatedTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java b/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java index 06b6ac8..70b17ea 100644 --- a/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/TransformingEnricherTest.java @@ -22,6 +22,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.math.MathFunctions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -29,8 +30,8 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicAttributeSensor; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.math.MathFunctions; 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/brooklyn/enricher/basic/BasicEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java index 7ee1177..c82b6ab 100644 --- a/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/BasicEnricherTest.java @@ -25,20 +25,20 @@ import java.util.Map; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.util.flags.SetFromFlag; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationNoEnrichersImpl; +import org.apache.brooklyn.util.collections.MutableSet; import org.testng.Assert; import org.testng.annotations.Test; import com.google.common.collect.Iterables; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynConfigKeys; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableSet; /** * Test that enricher 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/brooklyn/enricher/basic/EnricherConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/EnricherConfigTest.java b/core/src/test/java/brooklyn/enricher/basic/EnricherConfigTest.java index 5fbe5ea..0a13b0f 100644 --- a/core/src/test/java/brooklyn/enricher/basic/EnricherConfigTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/EnricherConfigTest.java @@ -21,12 +21,12 @@ package brooklyn.enricher.basic; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; import brooklyn.enricher.basic.BasicEnricherTest.MyEnricher; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; -import brooklyn.util.collections.MutableMap; /** * Test that configuration properties are usable and inherited correctly. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java index c7e7640..415931f 100644 --- a/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java +++ b/core/src/test/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricherTest.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.management.SubscriptionContext; import org.apache.brooklyn.api.policy.EnricherSpec; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,7 +35,6 @@ import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.BasicAttributeSensor; import brooklyn.event.basic.BasicSensorEvent; -import brooklyn.util.time.Duration; public class YamlRollingTimeWindowMeanEnricherTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java index 80cfe2a..608819f 100644 --- a/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java +++ b/core/src/test/java/brooklyn/entity/EffectorSayHiTest.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.api.management.ExecutionContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -45,7 +46,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.MethodEffector; import brooklyn.entity.trait.Startable; -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/brooklyn/entity/SetFromFlagTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java index 08d0428..63a9fd5 100644 --- a/core/src/test/java/brooklyn/entity/SetFromFlagTest.java +++ b/core/src/test/java/brooklyn/entity/SetFromFlagTest.java @@ -30,8 +30,7 @@ import org.testng.annotations.Test; import brooklyn.entity.basic.AbstractEntity; import org.apache.brooklyn.location.basic.PortRanges; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class SetFromFlagTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java index 96c7589..4d3541c 100644 --- a/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AbstractEntityLegacyTest.java @@ -29,12 +29,11 @@ import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableMap; /** * Tests the deprecated use of AbstractAppliation, where its constructor is called directly. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java b/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java index bd195d9..2128243 100644 --- a/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/AttributeMapTest.java @@ -32,17 +32,17 @@ import java.util.concurrent.Future; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.guava.Maybe; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.basic.AttributeMap; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.guava.Maybe; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java index b5c1074..9491094 100644 --- a/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BasicStartableTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; 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.MutableSet; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -46,8 +47,6 @@ import com.google.common.collect.Lists; import org.apache.brooklyn.location.basic.Locations.LocationsFilter; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableSet; - public class BasicStartableTest { private ManagementContext managementContext; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java b/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java index a8acb8b..fb55f37 100644 --- a/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java +++ b/core/src/test/java/brooklyn/entity/basic/BrooklynShutdownHooksTest.java @@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.BlockingEntity; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.BrooklynShutdownHooks.BrooklynShutdownHookJob; -import brooklyn.util.time.Duration; public class BrooklynShutdownHooksTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java index 652a1fa..f09f224 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigEntityInheritanceTest.java @@ -20,14 +20,14 @@ package brooklyn.entity.basic; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.test.entity.TestApplication; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; import brooklyn.entity.basic.ConfigMapTest.MyOtherEntity; import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/ConfigKeysTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigKeysTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigKeysTest.java index bf91f65..1db61ad 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigKeysTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigKeysTest.java @@ -20,10 +20,10 @@ package brooklyn.entity.basic; import static org.testng.Assert.assertEquals; +import org.apache.brooklyn.config.ConfigInheritance; +import org.apache.brooklyn.config.ConfigKey; import org.testng.annotations.Test; -import brooklyn.config.ConfigInheritance; -import brooklyn.config.ConfigKey; import brooklyn.event.basic.BasicConfigKey; import com.google.common.base.CaseFormat; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java index f67a193..366e3aa 100644 --- a/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ConfigMapTest.java @@ -35,19 +35,19 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ExecutionManager; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.config.ConfigMap; import org.apache.brooklyn.core.util.task.BasicTask; import org.apache.brooklyn.core.util.task.DeferredSupplier; +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.config.ConfigKey; -import brooklyn.config.ConfigMap; import brooklyn.config.ConfigPredicates; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; -import brooklyn.util.collections.MutableMap; 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/brooklyn/entity/basic/DataEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java index 9fc43eb..8bcee08 100644 --- a/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DataEntityTest.java @@ -27,9 +27,11 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.test.entity.TestApplication; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -38,9 +40,6 @@ import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Predicates; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java index dd107aa..1cbf47f 100644 --- a/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DependentConfigurationTest.java @@ -32,8 +32,15 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.util.task.BasicTask; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +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.javalang.JavaClassNames; +import org.apache.brooklyn.util.text.StringPredicates; +import org.apache.brooklyn.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,13 +49,6 @@ import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.DependentConfiguration; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.javalang.JavaClassNames; -import brooklyn.util.text.StringPredicates; -import brooklyn.util.time.Duration; import com.google.common.base.Function; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java b/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java index 34782c1..b2b7ede 100644 --- a/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DynamicEntityTest.java @@ -25,11 +25,11 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntityInitializer; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.effector.EffectorTaskTest; -import brooklyn.util.collections.MutableMap; public class DynamicEntityTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java index a83042b..9629b1a 100644 --- a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java +++ b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.basic; -import static brooklyn.test.Asserts.assertEqualsIgnoringOrder; +import static org.apache.brooklyn.test.Asserts.assertEqualsIgnoringOrder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -39,8 +39,13 @@ import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.test.Asserts; 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.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.annotations.AfterMethod; @@ -48,11 +53,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Duration; -import brooklyn.util.time.Time; 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/brooklyn/entity/basic/EntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java index d7e2d1a..72031c7 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java @@ -26,7 +26,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableSet; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,9 +37,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableSet; - 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/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java index fec12e3..2af8d5b 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageLegacyTest.java @@ -27,14 +27,15 @@ import java.util.concurrent.CountDownLatch; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Time; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.DependentConfiguration; + +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Time; 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/brooklyn/entity/basic/EntityConfigMapUsageTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java index ff4d83e..8b9be8d 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigMapUsageTest.java @@ -28,16 +28,17 @@ import java.util.concurrent.CountDownLatch; import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; +import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; import brooklyn.event.basic.DependentConfiguration; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.exceptions.Exceptions; 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/brooklyn/entity/basic/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java index e41e3a3..9a87a0b 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityConfigTest.java @@ -22,14 +22,13 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.proxying.EntitySpec; 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.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; - import com.google.common.collect.ImmutableMap; public class EntityConfigTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java b/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java index fbc1010..becfd85 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityLocationsTest.java @@ -26,11 +26,11 @@ import java.util.List; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.testng.Assert; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.test.Asserts; 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/brooklyn/entity/basic/EntityPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java index bf637c1..0f9810e 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityPredicatesTest.java @@ -24,12 +24,12 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.text.StringPredicates; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.trait.Changeable; -import brooklyn.util.text.StringPredicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java b/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java index 9cc76e1..5cabd7c 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityRegistrationTest.java @@ -27,13 +27,13 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; 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/brooklyn/entity/basic/EntitySpecTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java index 35a2c74..c00429a 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySpecTest.java @@ -27,23 +27,22 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.api.policy.EnricherSpec; import org.apache.brooklyn.api.policy.Policy; 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.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import brooklyn.config.ConfigKey; import brooklyn.enricher.basic.AbstractEnricher; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicConfigKey; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; - 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/brooklyn/entity/basic/EntitySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java index 5525d1b..e643b5f 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntitySubscriptionTest.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.SubscriptionHandle; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.AfterMethod; @@ -31,8 +32,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.event.basic.BasicSensorEvent; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; 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/brooklyn/entity/basic/EntityTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java b/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java index e972466..f06e3c3 100644 --- a/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java +++ b/core/src/test/java/brooklyn/entity/basic/EntityTypeTest.java @@ -48,16 +48,16 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableSet; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.event.basic.BasicSensorEvent; import brooklyn.event.basic.Sensors; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableSet; 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/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java b/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java index 7eff747..8314477 100644 --- a/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java +++ b/core/src/test/java/brooklyn/entity/basic/MapConfigKeyAndFriendsMoreTest.java @@ -22,6 +22,9 @@ import java.util.List; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -37,9 +40,6 @@ import brooklyn.event.basic.SetConfigKey; import brooklyn.event.basic.SetConfigKey.SetModifications; import brooklyn.event.basic.StructuredConfigKey.StructuredModification; import brooklyn.event.basic.SubElementConfigKey; -import brooklyn.util.collections.MutableList; -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/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy index 86bdc18..c3ed0ba 100644 --- a/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy +++ b/core/src/test/java/brooklyn/entity/basic/MapListAndOtherStructuredConfigKeyTest.groovy @@ -37,8 +37,8 @@ import brooklyn.event.basic.SetConfigKey.SetModifications import org.apache.brooklyn.location.basic.SimulatedLocation import org.apache.brooklyn.test.entity.TestApplication import org.apache.brooklyn.test.entity.TestEntity -import brooklyn.util.collections.MutableMap -import brooklyn.util.exceptions.Exceptions +import org.apache.brooklyn.util.collections.MutableMap +import org.apache.brooklyn.util.exceptions.Exceptions import org.apache.brooklyn.core.util.task.DeferredSupplier import com.google.common.collect.ImmutableList http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/OwnedChildrenTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/OwnedChildrenTest.java b/core/src/test/java/brooklyn/entity/basic/OwnedChildrenTest.java index 27e629d..651d557 100644 --- a/core/src/test/java/brooklyn/entity/basic/OwnedChildrenTest.java +++ b/core/src/test/java/brooklyn/entity/basic/OwnedChildrenTest.java @@ -18,7 +18,7 @@ */ package brooklyn.entity.basic; -import static brooklyn.test.Asserts.assertEqualsIgnoringOrder; +import static org.apache.brooklyn.test.Asserts.assertEqualsIgnoringOrder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java index 2f21dd8..9c44586 100644 --- a/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java +++ b/core/src/test/java/brooklyn/entity/basic/PolicyRegistrationTest.java @@ -35,11 +35,11 @@ import org.apache.brooklyn.core.policy.basic.AbstractPolicy; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityNoEnrichersImpl; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; -import brooklyn.util.collections.MutableMap; 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/brooklyn/entity/basic/ServiceStateLogicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java index f77a23d..3caf7df 100644 --- a/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java +++ b/core/src/test/java/brooklyn/entity/basic/ServiceStateLogicTest.java @@ -26,6 +26,9 @@ import org.apache.brooklyn.api.policy.Enricher; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; +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.annotations.Test; @@ -36,9 +39,6 @@ import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic; import brooklyn.entity.basic.ServiceStateLogic.ServiceProblemsLogic; import brooklyn.entity.group.DynamicCluster; import brooklyn.event.basic.Sensors; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.util.exceptions.Exceptions; -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/brooklyn/entity/drivers/BasicEntityDriverManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/BasicEntityDriverManagerTest.java b/core/src/test/java/brooklyn/entity/drivers/BasicEntityDriverManagerTest.java index 71eaac9..2e7db8e 100644 --- a/core/src/test/java/brooklyn/entity/drivers/BasicEntityDriverManagerTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/BasicEntityDriverManagerTest.java @@ -29,9 +29,10 @@ import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriver; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDependentEntity; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MySshDriver; import brooklyn.entity.drivers.RegistryEntityDriverFactoryTest.MyOtherSshDriver; + import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class BasicEntityDriverManagerTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java index 7ebceda..c00a699 100644 --- a/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/EntityDriverRegistryTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.test.entity.LocalManagementContextForTests; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,8 +32,8 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriver; import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDependentEntity; import brooklyn.entity.drivers.RegistryEntityDriverFactoryTest.MyOtherSshDriver; + import org.apache.brooklyn.location.basic.SshMachineLocation; -import brooklyn.util.collections.MutableMap; public class EntityDriverRegistryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java b/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java index 7595bbd..c628012 100644 --- a/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/ReflectiveEntityDriverFactoryTest.java @@ -22,9 +22,9 @@ import brooklyn.entity.basic.AbstractEntity; import org.apache.brooklyn.location.basic.SshMachineLocation; import org.apache.brooklyn.location.paas.PaasLocation; +import org.apache.brooklyn.util.collections.MutableMap; import brooklyn.test.location.TestPaasLocation; -import brooklyn.util.collections.MutableMap; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.basic.EntityLocal; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java b/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java index 446617a..625d8b1 100644 --- a/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java +++ b/core/src/test/java/brooklyn/entity/drivers/RegistryEntityDriverFactoryTest.java @@ -34,8 +34,7 @@ import brooklyn.entity.drivers.ReflectiveEntityDriverFactoryTest.MyDriverDepende import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.basic.SshMachineLocation; - -import brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableMap; public class RegistryEntityDriverFactoryTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java index f8f4eb1..f5e831e 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java @@ -29,6 +29,8 @@ import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -42,9 +44,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.ImmutableList; public class EffectorBasicTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java index 63b10da..a5322eb 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorConcatenateTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.core.util.task.BasicExecutionContext; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestApplicationImpl; +import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; @@ -46,7 +47,6 @@ import brooklyn.entity.basic.AbstractEntity; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.MethodEffector; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java index 0f6f041..f940245 100644 --- a/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java +++ b/core/src/test/java/brooklyn/entity/effector/EffectorTaskTest.java @@ -32,6 +32,8 @@ import org.apache.brooklyn.core.util.task.DynamicTasks; import org.apache.brooklyn.core.util.task.TaskBuilder; import org.apache.brooklyn.core.util.task.Tasks; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.Assert; import org.testng.annotations.Test; @@ -42,8 +44,6 @@ import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory; import brooklyn.entity.trait.Startable; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.exceptions.Exceptions; 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/brooklyn/entity/group/DynamicClusterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java index cd300e4..4d0be0e 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterTest.java @@ -57,9 +57,15 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.apache.brooklyn.util.time.Time; import brooklyn.entity.basic.ServiceStateLogic; import brooklyn.entity.trait.Changeable; @@ -67,13 +73,6 @@ import brooklyn.entity.trait.FailingEntity; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.collections.QuorumCheck.QuorumChecks; -import brooklyn.util.exceptions.Exceptions; -import brooklyn.util.time.Time; - import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java index f0e3105..c3d4385 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicClusterWithAvailabilityZonesTest.java @@ -34,7 +34,9 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; 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.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -48,9 +50,6 @@ import org.apache.brooklyn.location.basic.SimulatedLocation; import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; -import brooklyn.test.Asserts; -import brooklyn.util.time.Duration; - import com.google.common.base.Predicate; import com.google.common.base.Ticker; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java index 593ac84..24446f9 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicFabricTest.java @@ -36,9 +36,13 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.management.Task; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.test.entity.BlockingEntity; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.repeat.Repeater; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; @@ -54,11 +58,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.PortRanges; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableList; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.repeat.Repeater; - import com.google.common.base.Joiner; 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/brooklyn/entity/group/DynamicMultiGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java index 55a8c97..41cd54f 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicMultiGroupTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; +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; @@ -45,8 +46,8 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.event.basic.Sensors; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; 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/brooklyn/entity/group/DynamicRegionsFabricTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java index f75267a..abad777 100644 --- a/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java +++ b/core/src/test/java/brooklyn/entity/group/DynamicRegionsFabricTest.java @@ -28,6 +28,8 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -35,9 +37,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.collections.MutableSet; -import brooklyn.util.exceptions.Exceptions; - import com.google.common.collect.ImmutableList; 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/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java index 8b9fa5a..d2d6841 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -26,8 +26,10 @@ import org.apache.brooklyn.api.event.SensorEvent; import org.apache.brooklyn.api.event.SensorEventListener; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.policy.basic.AbstractPolicy; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.javalang.Boxing; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,8 +39,6 @@ import brooklyn.entity.basic.BasicGroup; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.trait.Startable; -import brooklyn.test.Asserts; -import brooklyn.util.javalang.Boxing; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/group/GroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/GroupTest.java b/core/src/test/java/brooklyn/entity/group/GroupTest.java index 8d0f9a9..eacfa5f 100644 --- a/core/src/test/java/brooklyn/entity/group/GroupTest.java +++ b/core/src/test/java/brooklyn/entity/group/GroupTest.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.entity.basic.RecordingSensorEventListener; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; 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.test.Asserts; - public class GroupTest extends BrooklynAppUnitTestSupport { private BasicGroup group; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java index 3630e62..f09a8d9 100644 --- a/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java +++ b/core/src/test/java/brooklyn/entity/group/MembershipTrackingPolicyTest.java @@ -31,7 +31,9 @@ import org.apache.brooklyn.api.event.Sensor; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.api.policy.PolicySpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -42,9 +44,6 @@ import brooklyn.entity.trait.Startable; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; - import com.google.common.base.Objects; 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/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java index f2a08da..a16de7a 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/BalancingNodePlacementStrategyTest.java @@ -24,6 +24,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestEntity; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -32,8 +33,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; - import com.google.common.collect.ImmutableList; import com.google.common.collect.LinkedHashMultimap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java index 5c618c5..44d2f90 100644 --- a/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java +++ b/core/src/test/java/brooklyn/entity/group/zoneaware/ProportionalZoneFailureDetectorTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -34,8 +35,6 @@ import brooklyn.entity.BrooklynAppUnitTestSupport; import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.util.time.Duration; - import com.google.common.base.Ticker; public class ProportionalZoneFailureDetectorTest extends BrooklynAppUnitTestSupport { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/hello/HelloEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/hello/HelloEntity.java b/core/src/test/java/brooklyn/entity/hello/HelloEntity.java index c4d80ce..9c28a40 100644 --- a/core/src/test/java/brooklyn/entity/hello/HelloEntity.java +++ b/core/src/test/java/brooklyn/entity/hello/HelloEntity.java @@ -21,8 +21,8 @@ package brooklyn.entity.hello; import org.apache.brooklyn.api.entity.proxying.ImplementedBy; import org.apache.brooklyn.api.event.AttributeSensor; import org.apache.brooklyn.api.event.Sensor; +import org.apache.brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey; import brooklyn.entity.annotation.Effector; import brooklyn.entity.annotation.EffectorParam; import brooklyn.entity.basic.AbstractGroup; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java index 91fc9aa..a95c831 100644 --- a/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/brooklyn/entity/hello/LocalEntitiesTest.java @@ -48,10 +48,11 @@ import org.testng.collections.Lists; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; + import org.apache.brooklyn.location.basic.SimulatedLocation; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.time.Time; +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.time.Time; 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/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java index f8f6302..1f449c1 100644 --- a/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/ApplicationBuilderOverridingTest.java @@ -39,6 +39,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; @@ -49,7 +50,6 @@ import brooklyn.entity.basic.BasicApplication; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.EntityInternal; import brooklyn.entity.basic.StartableApplication; -import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java index 6ec8e9f..d502566 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityManagerTest.java @@ -24,16 +24,16 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.management.EntityManager; +import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.entity.TestApplication; import org.apache.brooklyn.test.entity.TestEntity; import org.apache.brooklyn.test.entity.TestEntityImpl; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import brooklyn.entity.BrooklynAppUnitTestSupport; import brooklyn.entity.basic.ApplicationBuilder; -import brooklyn.test.Asserts; -import brooklyn.util.collections.MutableMap; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java index 3ee866c..a384ade 100644 --- a/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java +++ b/core/src/test/java/brooklyn/entity/proxying/EntityProxyTest.java @@ -32,6 +32,7 @@ import org.apache.brooklyn.api.management.EntityManager; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.core.management.internal.ManagementContextInternal; import org.apache.brooklyn.test.entity.TestEntity; +import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -41,7 +42,6 @@ import brooklyn.entity.basic.ApplicationBuilder; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.StartableApplication; -import brooklyn.util.collections.MutableMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet;
