Rename o.a.b.test to o.a.b.test.support
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/116637b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/116637b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/116637b8 Branch: refs/heads/master Commit: 116637b83a356b2140c374676dbc5353cbd501e8 Parents: 33bb19f Author: Aled Sage <[email protected]> Authored: Wed Aug 19 17:31:07 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 18:22:10 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/core/BrooklynVersionTest.java | 2 +- .../core/mgmt/osgi/OsgiStandaloneTest.java | 2 +- .../mgmt/osgi/OsgiVersionMoreEntityTest.java | 2 +- .../mgmt/persist/XmlMementoSerializerTest.java | 2 +- .../mgmt/rebind/RebindCatalogEntityTest.java | 2 +- .../apache/brooklyn/core/test/HttpService.java | 2 +- parent/pom.xml | 2 +- .../entity/osgi/karaf/KarafContainerTest.java | 2 +- .../nginx/NginxClusterIntegrationTest.java | 2 +- .../nginx/NginxHttpsSslIntegrationTest.java | 2 +- .../proxy/nginx/NginxIntegrationTest.java | 2 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 2 +- .../nginx/NginxRebindWithHaIntegrationTest.java | 2 +- .../nginx/NginxUrlMappingIntegrationTest.java | 2 +- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 2 +- .../AbstractWebAppFixtureIntegrationTest.java | 2 +- ...lledDynamicWebAppClusterIntegrationTest.java | 2 +- .../ControlledDynamicWebAppClusterTest.java | 2 +- ...ElasticJavaWebAppServiceIntegrationTest.java | 2 +- .../webapp/WebAppConcurrentDeployTest.java | 2 +- ...namicWebAppClusterRebindIntegrationTest.java | 2 +- ...namicWebAppClusterRebindIntegrationTest.java | 2 +- .../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +- ...Boss6ServerNonInheritingIntegrationTest.java | 2 +- .../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +- .../jboss/JBoss7ServerDockerLiveTest.java | 2 +- ...Boss7ServerNonInheritingIntegrationTest.java | 2 +- .../JBoss7ServerRebindingIntegrationTest.java | 2 +- .../Jboss7ServerGoogleComputeLiveTest.java | 2 +- .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 2 +- .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 2 +- ...mcat8ServerWebAppFixtureIntegrationTest.java | 2 +- .../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +- .../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +- ...omcatServerWebAppFixtureIntegrationTest.java | 2 +- .../camp/brooklyn/ReferencedYamlTest.java | 2 +- .../catalog/AbstractCatalogXmlTest.java | 2 +- .../CatalogOsgiVersionMoreEntityTest.java | 2 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 2 +- .../catalog/CatalogYamlLocationTest.java | 2 +- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 2 +- .../catalog/CatalogYamlTemplateTest.java | 2 +- .../brooklyn/test/lite/CampYamlLiteTest.java | 2 +- usage/downstream-parent/pom.xml | 4 +- .../brooklyn/launcher/WebAppRunnerTest.java | 2 +- .../rest/resources/CatalogResourceTest.java | 2 +- .../brooklyn/test/BrooklynLeakListener.java | 89 ----- .../brooklyn/test/LoggingVerboseReporter.java | 36 -- .../test/PlatformTestSelectorListener.java | 57 --- .../apache/brooklyn/test/StatusListener.java | 100 ------ .../test/TestResourceUnavailableException.java | 140 -------- .../apache/brooklyn/test/VerboseReporter.java | 343 ------------------- .../test/support/BrooklynLeakListener.java | 89 +++++ .../test/support/LoggingVerboseReporter.java | 36 ++ .../support/PlatformTestSelectorListener.java | 57 +++ .../brooklyn/test/support/StatusListener.java | 100 ++++++ .../TestResourceUnavailableException.java | 140 ++++++++ .../brooklyn/test/support/VerboseReporter.java | 343 +++++++++++++++++++ 58 files changed, 812 insertions(+), 812 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java index 5d48427..424e176 100644 --- a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java @@ -31,7 +31,7 @@ import org.apache.brooklyn.core.catalog.internal.CatalogItemDtoAbstract; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.osgi.OsgiTestResources; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java index 3cfd228..853b2e8 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.jar.JarInputStream; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.osgi.Osgis; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java index c03fba9..f648419 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiVersionMoreEntityTest.java @@ -51,7 +51,7 @@ import org.apache.brooklyn.core.objs.proxy.InternalPolicyFactory; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.effector.core.Effectors; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.osgi.Osgis; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java index 4132750..5bd1e5c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java @@ -32,7 +32,6 @@ import java.util.Set; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; @@ -62,6 +61,7 @@ import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.entity.group.DynamicCluster; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java index 26e087c..d437e92 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java @@ -43,7 +43,7 @@ import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.javalang.UrlClassLoader; import com.google.common.base.Function; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java index fe959f4..d054dbe 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java @@ -18,7 +18,6 @@ */ package org.apache.brooklyn.core.test; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.crypto.SecureKeys; import org.apache.brooklyn.util.javalang.Threads; @@ -45,6 +44,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.location.PortRange; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.base.Optional; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d8afa57..89aebb1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1410,7 +1410,7 @@ <properties> <property> <name>listener</name> - <value>org.apache.brooklyn.test.LoggingVerboseReporter,org.apache.brooklyn.test.BrooklynLeakListener,org.apache.brooklyn.test.PlatformTestSelectorListener</value> + <value>org.apache.brooklyn.test.support.LoggingVerboseReporter,org.apache.brooklyn.test.support.BrooklynLeakListener,org.apache.brooklyn.test.support.PlatformTestSelectorListener</value> </property> </properties> <enableAssertions>true</enableAssertions> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java ---------------------------------------------------------------------- diff --git a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java index a7fd16d..2d2058a 100644 --- a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java +++ b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java @@ -31,7 +31,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.task.ssh.SshEffectorTasks; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java index 28774ad..f7ee033 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxClusterIntegrationTest.java @@ -40,7 +40,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java index 531039a..b8e5516 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxHttpsSslIntegrationTest.java @@ -39,7 +39,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java index f531c90..187701a 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxIntegrationTest.java @@ -39,8 +39,8 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.time.Duration; import org.apache.brooklyn.util.time.Time; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java index 0b96226..4eb0a9a 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java @@ -47,8 +47,8 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java index 39ebfe3..51c04c4 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java @@ -43,8 +43,8 @@ import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.internal.ssh.SshTool; import org.apache.brooklyn.util.core.task.BasicExecutionManager; import org.apache.brooklyn.util.net.Networking; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java index 62e2769..11672cf 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxUrlMappingIntegrationTest.java @@ -48,7 +48,7 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.tomcat.Tomcat8Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java index 025611d..1405fda 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxWebClusterEc2LiveTest.java @@ -38,7 +38,7 @@ import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java index 67ed445..7a66c87 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java @@ -71,7 +71,7 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceMethods; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.crypto.FluentKeySigner; import org.apache.brooklyn.util.core.crypto.SecureKeys; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java index 9bf49ee..8b340ec 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java @@ -27,8 +27,8 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestJavaWebAppEntity; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.CollectionFunctionals; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.api.entity.Entity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java index 88d3155..c33c862 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java @@ -36,8 +36,8 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.entity.TestJavaWebAppEntity; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java index 47659c7..ee76cb8 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ElasticJavaWebAppServiceIntegrationTest.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.entity.webapp; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableMap; import org.testng.Assert; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java index 3f2b2eb..fae555b 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/WebAppConcurrentDeployTest.java @@ -40,7 +40,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.http.HttpTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java index f478ab2..d13f8ee 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/ControlledDynamicWebAppClusterRebindIntegrationTest.java @@ -39,8 +39,8 @@ import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.proxy.nginx.NginxController; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.internal.TimeExtras; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java index 3f45ebe..3334480 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/DynamicWebAppClusterRebindIntegrationTest.java @@ -37,8 +37,8 @@ import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java index 084d2af..8d77679 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerAwsEc2LiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java index 1bb29e9..6201653 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.entity.java.UsesJmx; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerAwsEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerAwsEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerAwsEc2LiveTest.java index 5a63eca..9f7b4e7 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerAwsEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerAwsEc2LiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerDockerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerDockerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerDockerLiveTest.java index 760c1dd..65bcc7f 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerDockerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerDockerLiveTest.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.software.base.AbstractDockerLiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java index c26fab2..0e134b3 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerNonInheritingIntegrationTest.java @@ -35,7 +35,7 @@ import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java index 830c7b9..2ff7545 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss7ServerRebindingIntegrationTest.java @@ -32,8 +32,8 @@ import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; import org.apache.brooklyn.test.WebAppMonitor; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/Jboss7ServerGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/Jboss7ServerGoogleComputeLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/Jboss7ServerGoogleComputeLiveTest.java index bb33c57..1485e92 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/Jboss7ServerGoogleComputeLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/Jboss7ServerGoogleComputeLiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractGoogleComputeLiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java index 2b89ad4..afb0017 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerEc2LiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java index bbeb457..4c9c8ec 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerSoftlayerLiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java index c94011e..7ef8d19 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java @@ -40,7 +40,7 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.repeat.Repeater; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java index d1eab41..3d59610 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerEc2LiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractEc2LiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java index a8da230..4bb167b 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerSoftlayerLiveTest.java @@ -26,7 +26,7 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java index f638a69..0d21d03 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java @@ -34,7 +34,7 @@ import org.apache.brooklyn.entity.software.base.SoftwareProcess; import org.apache.brooklyn.entity.webapp.AbstractWebAppFixtureIntegrationTest; import org.apache.brooklyn.entity.webapp.HttpsSslConfig; import org.apache.brooklyn.entity.webapp.JavaWebAppSoftwareProcess; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.repeat.Repeater; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java index 32f9a5f..50d4f54 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java @@ -24,7 +24,7 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest; import org.apache.brooklyn.entity.stock.BasicApplication; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.testng.Assert; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java index 286a0c5..8575202 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/AbstractCatalogXmlTest.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.osgi.OsgiTestResources; import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.os.Os; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java index 8b959be..86b3028 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityTest.java @@ -37,7 +37,7 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityMatcher; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.mgmt.osgi.OsgiVersionMoreEntityTest; import org.apache.brooklyn.core.objs.BrooklynTypes; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java index 898f399..e71c142 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java @@ -38,7 +38,7 @@ import org.apache.brooklyn.core.mgmt.osgi.OsgiTestResources; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java index a03041a..c579aaf 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java @@ -37,7 +37,7 @@ import org.apache.brooklyn.core.catalog.CatalogPredicates; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.text.StringFunctions; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java index 886a31a..1774f7c 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlPolicyTest.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.catalog.CatalogPredicates; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java index 4d9cd7b..3bf299a 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem.CatalogItemType; import org.apache.brooklyn.camp.brooklyn.AbstractYamlTest; import org.apache.brooklyn.core.mgmt.osgi.OsgiStandaloneTest; import org.apache.brooklyn.core.mgmt.osgi.OsgiTestResources; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; public class CatalogYamlTemplateTest extends AbstractYamlTest { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java index e86672e..905c9db 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/test/lite/CampYamlLiteTest.java @@ -51,7 +51,7 @@ import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.effector.core.AddChildrenEffector; import org.apache.brooklyn.effector.core.Effectors; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/downstream-parent/pom.xml ---------------------------------------------------------------------- diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml index bfadc6d..67fdb16 100644 --- a/usage/downstream-parent/pom.xml +++ b/usage/downstream-parent/pom.xml @@ -99,7 +99,7 @@ <scope>test</scope> </dependency> <dependency> - <!-- includes org.apache.brooklyn.test.LoggingVerboseReporter --> + <!-- includes org.apache.brooklyn.test.support.LoggingVerboseReporter --> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-utils-test-support</artifactId> <version>${brooklyn.version}</version> @@ -327,7 +327,7 @@ <properties> <property> <name>listener</name> - <value>org.apache.brooklyn.test.LoggingVerboseReporter</value> + <value>org.apache.brooklyn.test.support.LoggingVerboseReporter</value> </property> </properties> <enableAssertions>true</enableAssertions> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java index 14d274f..36dbfac 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/launcher/WebAppRunnerTest.java @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import org.apache.brooklyn.test.HttpTestUtils; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.net.Networking; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java index b38c87d..b2991b2 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java @@ -50,7 +50,7 @@ import org.apache.brooklyn.rest.domain.CatalogItemSummary; import org.apache.brooklyn.rest.domain.CatalogLocationSummary; import org.apache.brooklyn.rest.domain.CatalogPolicySummary; import org.apache.brooklyn.rest.testing.BrooklynRestResourceTest; -import org.apache.brooklyn.test.TestResourceUnavailableException; +import org.apache.brooklyn.test.support.TestResourceUnavailableException; import com.google.common.base.Joiner; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java deleted file mode 100644 index 4f95feb..0000000 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/BrooklynLeakListener.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test; - -import java.util.Arrays; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.ITestContext; -import org.testng.TestListenerAdapter; - -public class BrooklynLeakListener extends TestListenerAdapter { - - private static final Logger TEST_RESOURCE_LOG = LoggerFactory.getLogger("test.resource.usage"); - - @Override - public void onStart(ITestContext testContext) { - super.onStart(testContext); - tryTerminateAll("BrooklynLeakListener.onStart", testContext); - } - - @Override - public void onFinish(ITestContext testContext) { - super.onFinish(testContext); - tryTerminateAll("BrooklynLeakListener.onFinish", testContext); - } - - /** - * Tries to reflectively invoke {@code LocalManagementContext.logAll(TEST_RESOURCE_LOG); LocalManagementContext.terminateAll()}. - * - * It does this reflectively because the listener is executed for all projects, included those that don't - * depend on brooklyn-core, so LocalManagementContext may not be on the classpath. - */ - private void tryTerminateAll(String context, ITestContext testContext) { - String clazzName = "org.apache.brooklyn.core.management.internal.LocalManagementContext"; - String message; - int level; - try { - Class<?> clazz = BrooklynLeakListener.class.getClassLoader().loadClass(clazzName); - clazz.getMethod("logAll", new Class[] {Logger.class}).invoke(null, TEST_RESOURCE_LOG); - Integer count = (Integer)clazz.getMethod("terminateAll").invoke(null); - if (count>0) { - level = 0; - message = ""+count+" ManagementContexts terminated"; - } else if (count<0) { - level = 1; - message = ""+(-count)+" ManagementContexts left dangling"; - } else { - level = -1; - message = ""+count+" ManagementContexts terminated"; - } - } catch (ClassNotFoundException e) { - TEST_RESOURCE_LOG.debug("Class {} not found in testng listener, so not attempting to terminate all extant ManagementContexts; continuing", clazzName); - level = 0; - message = "no "+clazzName+" available, so skipped"; - } catch (Throwable e) { - TEST_RESOURCE_LOG.error("ERROR in testng listener, attempting to terminate all extant ManagementContexts", e); - level = 1; - message = "ERROR: "+e; - } - - String logMessage = context+" attempting to terminate all extant ManagementContexts: " - + "name=" + testContext.getName() - + "; includedGroups="+Arrays.toString(testContext.getIncludedGroups()) - + "; excludedGroups="+Arrays.toString(testContext.getExcludedGroups()) - + "; suiteName="+testContext.getSuite().getName() - + "; outDir="+testContext.getOutputDirectory() - + ": "+message; - if (level<0) TEST_RESOURCE_LOG.debug(logMessage); - else if (level>0) TEST_RESOURCE_LOG.warn(logMessage); - else TEST_RESOURCE_LOG.info(logMessage); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/utils/test-support/src/main/java/org/apache/brooklyn/test/LoggingVerboseReporter.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/LoggingVerboseReporter.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/LoggingVerboseReporter.java deleted file mode 100644 index a5a5a5c..0000000 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/LoggingVerboseReporter.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class LoggingVerboseReporter extends VerboseReporter { - - private static final Logger log = LoggerFactory.getLogger(LoggingVerboseReporter.class); - - public LoggingVerboseReporter() { super(); } - public LoggingVerboseReporter(String prefix) { super(prefix); } - - @Override - protected void log(String message) { - log.info("TESTNG "+message); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/utils/test-support/src/main/java/org/apache/brooklyn/test/PlatformTestSelectorListener.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/PlatformTestSelectorListener.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/PlatformTestSelectorListener.java deleted file mode 100644 index 0282eee..0000000 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/PlatformTestSelectorListener.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test; - -import org.testng.IInvokedMethod; -import org.testng.IInvokedMethodListener; -import org.testng.ITestResult; -import org.testng.SkipException; - -public class PlatformTestSelectorListener implements IInvokedMethodListener { - private static final String GROUP_UNIX = "UNIX"; - private static final String GROUP_WINDOWS = "Windows"; - - public static boolean isWindows() { - return System.getProperty("os.name").startsWith("Windows"); - } - - @Override - public void beforeInvocation(IInvokedMethod method, ITestResult testResult) { - boolean isUnixTest = false; - boolean isWinTest = false; - - String[] groups = method.getTestMethod().getGroups(); - for (String group : groups) { - isUnixTest = isUnixTest || group.equalsIgnoreCase(GROUP_UNIX); - isWinTest = isWinTest || group.equalsIgnoreCase(GROUP_WINDOWS); - } - - boolean isWinPlatform = isWindows(); - if (isUnixTest || isWinTest) { - if (isWinPlatform && isUnixTest && !isWinTest) { - throw new SkipException("Skipping unix-specific test."); - } else if (!isWinPlatform && isWinTest && !isUnixTest) { - throw new SkipException("Skipping windows-specific test."); - } - } - } - - @Override - public void afterInvocation(IInvokedMethod method, ITestResult testResult) {} -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/utils/test-support/src/main/java/org/apache/brooklyn/test/StatusListener.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/StatusListener.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/StatusListener.java deleted file mode 100644 index 1803967..0000000 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/StatusListener.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test; - -import java.util.concurrent.atomic.AtomicInteger; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.IClass; -import org.testng.ITestContext; -import org.testng.ITestListener; -import org.testng.ITestResult; - -/** - * adapted from the following class: - * - * @see org.jclouds.test.testng.UnitTestStatusListener - * - * normally not used, preferring instead LoggingVerboseReporter which prints out config info - */ -public class StatusListener implements ITestListener { - - public static final Logger log = LoggerFactory.getLogger(StatusListener.class); - - /** - * Holds test classes actually running in all threads. - */ - private ThreadLocal<IClass> threadTestClass = new ThreadLocal<IClass>(); - private ThreadLocal<Long> threadTestStart = new ThreadLocal<Long>(); - - private AtomicInteger failed = new AtomicInteger(0); - private AtomicInteger succeded = new AtomicInteger(0); - private AtomicInteger skipped = new AtomicInteger(0); - - //TODO instead of system.out.println we should log -- *and* perhaps write to sysout if logger doesn't? - protected static void log(String msg) { - log.info(msg); - } - - public void onTestStart(ITestResult res) { - log("Starting test " + getTestDesc(res)); - threadTestClass.set(res.getTestClass()); - threadTestStart.set(System.currentTimeMillis()); - } - - synchronized public void onTestSuccess(ITestResult arg0) { - log(getThreadId() + " Test " + getTestDesc(arg0) + " succeeded: " + (System.currentTimeMillis() - threadTestStart.get()) + "ms"); - succeded.incrementAndGet(); - printStatus(); - } - - synchronized public void onTestFailure(ITestResult arg0) { - log(getThreadId() + " Test " + getTestDesc(arg0) + " failed: "+arg0.getThrowable()); - failed.incrementAndGet(); - printStatus(); - } - - synchronized public void onTestSkipped(ITestResult arg0) { - System.out.println(getThreadId() + " Test " + getTestDesc(arg0) + " skipped."); - skipped.incrementAndGet(); - printStatus(); - } - - public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) { - } - - public void onStart(ITestContext arg0) { - } - - public void onFinish(ITestContext arg0) { - } - - private String getThreadId() { - return "[" + Thread.currentThread().getName() + "]"; - } - - private String getTestDesc(ITestResult res) { - return res.getMethod().getMethodName() + "(" + res.getTestClass().getName() + ")"; - } - - private void printStatus() { - log("Test suite progress: tests succeeded: " + succeded.get() + ", failed: " + failed.get() + ", skipped: " + skipped.get() + "."); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/116637b8/utils/test-support/src/main/java/org/apache/brooklyn/test/TestResourceUnavailableException.java ---------------------------------------------------------------------- diff --git a/utils/test-support/src/main/java/org/apache/brooklyn/test/TestResourceUnavailableException.java b/utils/test-support/src/main/java/org/apache/brooklyn/test/TestResourceUnavailableException.java deleted file mode 100644 index c49a248..0000000 --- a/utils/test-support/src/main/java/org/apache/brooklyn/test/TestResourceUnavailableException.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.brooklyn.test; - -import com.google.common.base.Throwables; -import org.testng.SkipException; - -import java.io.IOException; -import java.io.InputStream; - -import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.base.Preconditions.checkNotNull; - -/** - * Indicates that a test cannot be run as a necessary resource is not available. - * - * <p>This exception should be used by tests that need a particular test resource (i.e., a file that is conventionally - * in the <code>src/test/resources</code> folder, and that available as a classpath resource at runtime) is not - * available. It will cause TestNG to mark the test as "skipped" with a suitable message.</p> - * - * <p>Some tests require binary files (such as OSGi bundles) which under Apache conventions are not able to be - * distributed in our source code release. This exception allows such tests to become "optional" so that they do not - * cause test failures when running the tests on a source distribution.</p> - * - * <p>Note that the single-string constructors expect the string to be the simple name of the classpath resource that - * is not available. The exception message is then derived from this. The two-string constructors take both the - * resource name and an explicit exception message.</p> - */ -@SuppressWarnings("UnusedDeclaration") -public class TestResourceUnavailableException extends SkipException { - - private final String resourceName; - - /** - * Asserts that a resource is available on the classpath; otherwise, throws {@link TestResourceUnavailableException} - * - * Note that this will use the same classloader that was used to load this class. - * - * @param resourceName the classpath resource name, e.g. - * <code>/brooklyn/osgi/brooklyn-test-osgi-entities.jar</code> - */ - public static void throwIfResourceUnavailable(Class<?> relativeToClass, String resourceName) { - checkNotNull(relativeToClass, relativeToClass); - checkNotNull(resourceName, "resourceName"); - checkArgument(!resourceName.isEmpty(), "resourceName must not be empty"); - InputStream resource = relativeToClass.getResourceAsStream(resourceName); - if (resource == null) - throw new TestResourceUnavailableException(resourceName); - - // just make sure we clean up the resource - try { - resource.close(); - } catch (IOException e) { - Throwables.propagate(e); - } - } - - /** - * Instantiate an exception, giving the name of the unavailable resource. - * - * @param resourceName the name of the resource on the classpath, e.g. - * <code>/brooklyn/osgi/brooklyn-test-osgi-entities.jar</code> - */ - public TestResourceUnavailableException(String resourceName) { - super(messageFromResourceName(resourceName)); - this.resourceName = resourceName; - } - - /** - * Instantiate an exception, giving the name of the unavailable resource. - * - * @param resourceName the name of the resource on the classpath, e.g. - * <code>/brooklyn/osgi/brooklyn-test-osgi-entities.jar</code> - * @param cause the underlying exception that caused this one - */ - public TestResourceUnavailableException(String resourceName, Throwable cause) { - super(messageFromResourceName(resourceName), cause); - this.resourceName = resourceName; - } - - /** - * Instantiate an exception, giving the name of the unavailable resource. - * - * @param resourceName the name of the resource on the classpath, e.g. - * <code>/brooklyn/osgi/brooklyn-test-osgi-entities.jar</code> - * @param skipMessage the message associated with the exception - */ - public TestResourceUnavailableException(String resourceName, String skipMessage) { - super(skipMessage); - this.resourceName = resourceName; - } - - /** - * Instantiate an exception, giving the name of the unavailable resource. - * - * @param resourceName the name of the resource on the classpath, e.g. - * <code>/brooklyn/osgi/brooklyn-test-osgi-entities.jar</code> - * @param skipMessage the message associated with the exception - * @param cause the underlying exception that caused this one - */ - public TestResourceUnavailableException(String resourceName, String skipMessage, Throwable cause) { - super(skipMessage, cause); - this.resourceName = resourceName; - } - - private static String messageFromResourceName(String resourceName) { - return String.format("Test resource '%s' not found; test skipped.", resourceName); - } - - /** - * Get the name of the classpath resource that could not be loaded. - * - * @return the name of the classpath resource whose absence caused this exception. - */ - public String getResourceName() { - return resourceName; - } - - @Override - public boolean isSkip() { - return true; - } - -}
