This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to annotated tag OpenBSD in repository testng.
commit e9a829e47a3f321807f9f3b6a15ec98ab6e22b98 Author: Julien Herr <[email protected]> Date: Mon Apr 13 10:57:29 2015 +0200 Remove duplicated Sets util class --- src/main/java/org/testng/TestNG.java | 2 +- src/main/java/org/testng/TestRunner.java | 2 +- src/main/java/org/testng/collections/Sets.java | 5 +++++ src/main/java/org/testng/internal/ClassHelper.java | 2 +- src/main/java/org/testng/internal/DynamicGraph.java | 2 +- src/main/java/org/testng/internal/Invoker.java | 2 +- src/main/java/org/testng/internal/MethodHelper.java | 2 +- src/main/java/org/testng/internal/annotations/Sets.java | 17 ----------------- src/main/java/org/testng/reporters/FailedReporter.java | 2 +- .../java/org/testng/reporters/JUnitReportReporter.java | 2 +- .../java/org/testng/reporters/JUnitXMLReporter.java | 2 +- src/test/java/org/testng/AssertTest.java | 2 +- src/test/java/test/asserttests/AssertTest.java | 2 +- src/test/java/test/thread/BaseThreadTest.java | 2 +- 14 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java index 442590a..b1f991f 100644 --- a/src/main/java/org/testng/TestNG.java +++ b/src/main/java/org/testng/TestNG.java @@ -28,6 +28,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.annotations.ITestAnnotation; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.ClassHelper; import org.testng.internal.Configuration; import org.testng.internal.DynamicGraph; @@ -40,7 +41,6 @@ import org.testng.internal.Version; import org.testng.internal.annotations.DefaultAnnotationTransformer; import org.testng.internal.annotations.IAnnotationFinder; import org.testng.internal.annotations.JDK15AnnotationFinder; -import org.testng.internal.annotations.Sets; import org.testng.internal.thread.graph.GraphThreadPoolExecutor; import org.testng.internal.thread.graph.IThreadWorkerFactory; import org.testng.internal.thread.graph.SuiteWorkerFactory; diff --git a/src/main/java/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java index e44dc29..0a5bd36 100644 --- a/src/main/java/org/testng/TestRunner.java +++ b/src/main/java/org/testng/TestRunner.java @@ -17,6 +17,7 @@ import org.testng.annotations.Guice; import org.testng.collections.ListMultiMap; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.Attributes; import org.testng.internal.ClassHelper; import org.testng.internal.ClassImpl; @@ -43,7 +44,6 @@ import org.testng.internal.XmlMethodSelector; import org.testng.internal.annotations.AnnotationHelper; import org.testng.internal.annotations.IAnnotationFinder; import org.testng.internal.annotations.IListeners; -import org.testng.internal.annotations.Sets; import org.testng.internal.thread.ThreadUtil; import org.testng.internal.thread.graph.GraphThreadPoolExecutor; import org.testng.internal.thread.graph.IThreadWorkerFactory; diff --git a/src/main/java/org/testng/collections/Sets.java b/src/main/java/org/testng/collections/Sets.java index 1019326..d6c3f07 100644 --- a/src/main/java/org/testng/collections/Sets.java +++ b/src/main/java/org/testng/collections/Sets.java @@ -2,6 +2,7 @@ package org.testng.collections; import java.util.Collection; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; public class Sets { @@ -13,4 +14,8 @@ public class Sets { public static <V> Set<V> newHashSet(Collection<V> c) { return new HashSet<V>(c); } + + public static <V> Set<V> newLinkedHashSet() { + return new LinkedHashSet<V>(); + } } diff --git a/src/main/java/org/testng/internal/ClassHelper.java b/src/main/java/org/testng/internal/ClassHelper.java index 80489fb..405ca31 100644 --- a/src/main/java/org/testng/internal/ClassHelper.java +++ b/src/main/java/org/testng/internal/ClassHelper.java @@ -10,8 +10,8 @@ import org.testng.TestRunner; import org.testng.annotations.IAnnotation; import org.testng.annotations.IFactoryAnnotation; import org.testng.annotations.IParametersAnnotation; +import org.testng.collections.Sets; import org.testng.internal.annotations.IAnnotationFinder; -import org.testng.internal.annotations.Sets; import org.testng.junit.IJUnitTestRunner; import org.testng.xml.XmlTest; diff --git a/src/main/java/org/testng/internal/DynamicGraph.java b/src/main/java/org/testng/internal/DynamicGraph.java index 1234c3d..3cfaad6 100644 --- a/src/main/java/org/testng/internal/DynamicGraph.java +++ b/src/main/java/org/testng/internal/DynamicGraph.java @@ -3,7 +3,7 @@ package org.testng.internal; import org.testng.collections.ListMultiMap; import org.testng.collections.Lists; import org.testng.collections.Maps; -import org.testng.internal.annotations.Sets; +import org.testng.collections.Sets; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java index 4efc670..3133eb5 100644 --- a/src/main/java/org/testng/internal/Invoker.java +++ b/src/main/java/org/testng/internal/Invoker.java @@ -25,11 +25,11 @@ import org.testng.annotations.IConfigurationAnnotation; import org.testng.annotations.NoInjection; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.InvokeMethodRunnable.TestNGRuntimeException; import org.testng.internal.ParameterHolder.ParameterOrigin; import org.testng.internal.annotations.AnnotationHelper; import org.testng.internal.annotations.IAnnotationFinder; -import org.testng.internal.annotations.Sets; import org.testng.internal.invokers.InvokedMethodListenerInvoker; import org.testng.internal.invokers.InvokedMethodListenerMethod; import org.testng.internal.thread.ThreadExecutionException; diff --git a/src/main/java/org/testng/internal/MethodHelper.java b/src/main/java/org/testng/internal/MethodHelper.java index c53b0bc..ca5554c 100644 --- a/src/main/java/org/testng/internal/MethodHelper.java +++ b/src/main/java/org/testng/internal/MethodHelper.java @@ -6,9 +6,9 @@ import org.testng.annotations.IExpectedExceptionsAnnotation; import org.testng.annotations.ITestAnnotation; import org.testng.annotations.ITestOrConfiguration; import org.testng.collections.Lists; +import org.testng.collections.Sets; import org.testng.internal.annotations.AnnotationHelper; import org.testng.internal.annotations.IAnnotationFinder; -import org.testng.internal.annotations.Sets; import org.testng.internal.collections.Pair; import java.lang.reflect.Method; diff --git a/src/main/java/org/testng/internal/annotations/Sets.java b/src/main/java/org/testng/internal/annotations/Sets.java deleted file mode 100755 index 2b3e4e6..0000000 --- a/src/main/java/org/testng/internal/annotations/Sets.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.testng.internal.annotations; - -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Set; - -public class Sets { - - public static <T> Set<T> newHashSet() { - return new HashSet<T>(); - } - - public static <T> Set<T> newLinkedHashSet() { - return new LinkedHashSet<T>(); - } - -} diff --git a/src/main/java/org/testng/reporters/FailedReporter.java b/src/main/java/org/testng/reporters/FailedReporter.java index 5a89a10..3765290 100755 --- a/src/main/java/org/testng/reporters/FailedReporter.java +++ b/src/main/java/org/testng/reporters/FailedReporter.java @@ -9,9 +9,9 @@ import org.testng.ITestResult; import org.testng.TestListenerAdapter; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.MethodHelper; import org.testng.internal.Utils; -import org.testng.internal.annotations.Sets; import org.testng.xml.XmlClass; import org.testng.xml.XmlInclude; import org.testng.xml.XmlSuite; diff --git a/src/main/java/org/testng/reporters/JUnitReportReporter.java b/src/main/java/org/testng/reporters/JUnitReportReporter.java index 2d3fefb..95c3b19 100644 --- a/src/main/java/org/testng/reporters/JUnitReportReporter.java +++ b/src/main/java/org/testng/reporters/JUnitReportReporter.java @@ -9,8 +9,8 @@ import org.testng.ITestResult; import org.testng.collections.ListMultiMap; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.Utils; -import org.testng.internal.annotations.Sets; import org.testng.xml.XmlSuite; import java.io.File; diff --git a/src/main/java/org/testng/reporters/JUnitXMLReporter.java b/src/main/java/org/testng/reporters/JUnitXMLReporter.java index cecadd4..73648fd 100755 --- a/src/main/java/org/testng/reporters/JUnitXMLReporter.java +++ b/src/main/java/org/testng/reporters/JUnitXMLReporter.java @@ -6,9 +6,9 @@ import org.testng.ITestNGMethod; import org.testng.ITestResult; import org.testng.collections.Lists; import org.testng.collections.Maps; +import org.testng.collections.Sets; import org.testng.internal.IResultListener2; import org.testng.internal.Utils; -import org.testng.internal.annotations.Sets; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/src/test/java/org/testng/AssertTest.java b/src/test/java/org/testng/AssertTest.java index 10e3af8..6f95579 100644 --- a/src/test/java/org/testng/AssertTest.java +++ b/src/test/java/org/testng/AssertTest.java @@ -2,7 +2,7 @@ package org.testng; import org.testng.annotations.Test; import org.testng.collections.Maps; -import org.testng.internal.annotations.Sets; +import org.testng.collections.Sets; import java.util.Collection; import java.util.HashMap; diff --git a/src/test/java/test/asserttests/AssertTest.java b/src/test/java/test/asserttests/AssertTest.java index fc5f0b6..c1ba49d 100644 --- a/src/test/java/test/asserttests/AssertTest.java +++ b/src/test/java/test/asserttests/AssertTest.java @@ -2,7 +2,7 @@ package test.asserttests; import org.testng.Assert; import org.testng.annotations.Test; -import org.testng.internal.annotations.Sets; +import org.testng.collections.Sets; import java.util.Set; diff --git a/src/test/java/test/thread/BaseThreadTest.java b/src/test/java/test/thread/BaseThreadTest.java index 849dcb7..0924088 100644 --- a/src/test/java/test/thread/BaseThreadTest.java +++ b/src/test/java/test/thread/BaseThreadTest.java @@ -3,7 +3,7 @@ package test.thread; import org.testng.Assert; import org.testng.collections.Lists; import org.testng.collections.Maps; -import org.testng.internal.annotations.Sets; +import org.testng.collections.Sets; import test.SimpleBaseTest; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
