Upgrade testng to latest version Now that we don't support Java 6 there's no restriction on upgrading testng. The new version could improve the execution order by not interleaving tests from different classes. But seems that's not the case when using dependsOn*
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2d3caac5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2d3caac5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2d3caac5 Branch: refs/heads/master Commit: 2d3caac5722e9b982f8c8349fd50e35e1b6d05c2 Parents: 69c91c3 Author: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Authored: Thu Nov 10 10:54:47 2016 +0200 Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com> Committed: Thu Nov 10 18:06:52 2016 +0200 ---------------------------------------------------------------------- .../apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java | 2 +- pom.xml | 4 +++- .../test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2d3caac5/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java ---------------------------------------------------------------------- diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java index a594f2a..8c5608e 100644 --- a/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java +++ b/launcher/src/test/java/org/apache/brooklyn/launcher/AbstractCleanOrphanedStateTest.java @@ -36,10 +36,10 @@ import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.commons.lang.builder.EqualsBuilder; -import com.beust.jcommander.internal.Sets; import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; public abstract class AbstractCleanOrphanedStateTest extends RebindTestFixtureWithApp { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2d3caac5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6469ae..01861bf 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,9 @@ <cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version> <!-- Testing Dependency Versions --> - <testng.version>6.8.8</testng.version> + <!-- testng 6.9.13 has this problem https://github.com/cbeust/testng/issues/1168, to be fixed in the release following 6.9.13.8. --> + <!-- Recent versions of testng are not pushed to maven central, they are publishing to jcentral. --> + <testng.version>6.9.10</testng.version> <mockito.version>1.10.8</mockito.version> <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies--> <cobertura.plugin.version>2.7</cobertura.plugin.version> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2d3caac5/utils/common/src/test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java index 16d3877..5b0007a 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/pool/BasicPoolTest.java @@ -37,13 +37,13 @@ import org.apache.brooklyn.util.pool.Pool; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.testng.internal.annotations.Sets; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService;