[testng] 01/02: Merge branch 'upstream'
Eugene Zhukov
eugene at moszumanska.debian.org
Fri Jul 8 13:10:48 UTC 2016
This is an automated email from the git hooks/post-receive script.
eugene pushed a commit to branch master
in repository testng.
commit f408ec2a4f1e22bdce4c707649c4e4f28de8f1e0
Merge: a5b6de8 de3b7e9
Author: Eugene Zhukov <eugene at debian.org>
Date: Sat Jul 2 22:04:45 2016 +0200
Merge branch 'upstream'
.gitignore | 3 +
.travis.yml | 8 +-
CHANGES.txt | 27 ++
build.gradle | 34 +-
doc/download.html | 4 +-
doc/index.html | 4 +-
gradle/publishing-jcenter.gradle | 15 +-
gradle/publishing-maven.gradle | 12 +-
gradle/wrapper/gradle-wrapper.properties | 4 +-
kobalt/Build.kt.iml | 13 +
kobalt/_Build.kt.iml | 11 +
kobalt/src/Build.kt | 17 +-
kobalt/wrapper/kobalt-wrapper.properties | 2 +-
pom.xml | 4 +-
src/main/java/org/testng/CommandLineArgs.java | 8 -
src/main/java/org/testng/IClass.java | 21 +-
src/main/java/org/testng/IClassListener.java | 4 +-
src/main/java/org/testng/IInstanceInfo.java | 6 +-
src/main/java/org/testng/ITestClass.java | 30 --
src/main/java/org/testng/ITestContext.java | 1 -
src/main/java/org/testng/ITestNGMethod.java | 3 +
src/main/java/org/testng/SuiteRunner.java | 2 +-
src/main/java/org/testng/TestClass.java | 4 +-
src/main/java/org/testng/TestNG.java | 273 ++++++-------
src/main/java/org/testng/TestNGAntTask.java | 2 +-
src/main/java/org/testng/TestRunner.java | 102 +++--
.../annotations/IDataProviderAnnotation.java | 9 +-
src/main/java/org/testng/asserts/Assertion.java | 28 +-
.../java/org/testng/internal/BaseTestMethod.java | 28 +-
src/main/java/org/testng/internal/ClassImpl.java | 8 +-
.../java/org/testng/internal/ClonedMethod.java | 9 +
.../testng/internal/ConfigurationGroupMethods.java | 3 +-
.../java/org/testng/internal/DynamicGraph.java | 31 +-
.../java/org/testng/internal/InstanceInfo.java | 12 +-
src/main/java/org/testng/internal/Invoker.java | 110 ++---
.../testng/internal/MethodInvocationHelper.java | 130 +++---
.../java/org/testng/internal/NoOpTestClass.java | 26 +-
.../java/org/testng/internal/PackageUtils.java | 2 +-
.../java/org/testng/internal/ParameterHolder.java | 2 +-
src/main/java/org/testng/internal/Parameters.java | 92 +++--
.../java/org/testng/internal/TestMethodWorker.java | 33 +-
.../org/testng/internal/TestNGClassFinder.java | 71 ++--
.../org/testng/internal/TestNGMethodFinder.java | 2 +
.../org/testng/internal/ThreeStateBoolean.java | 10 +
src/main/java/org/testng/internal/Utils.java | 24 +-
.../org/testng/internal/XmlMethodSelector.java | 5 +-
src/main/java/org/testng/internal/Yaml.java | 2 +-
.../internal/annotations/AnnotationHelper.java | 7 +-
.../annotations/DataProviderAnnotation.java | 13 +
.../annotations/JDK15AnnotationFinder.java | 2 +-
.../internal/annotations/JDK15TagFactory.java | 14 +-
.../internal/reflect/AbstractMethodMatcher.java | 50 +++
.../reflect/AbstractNodeMethodMatcher.java | 93 +++++
.../internal/reflect/ArrayEndingMethodMatcher.java | 60 +++
.../reflect/DataProviderMethodMatcher.java | 54 +++
.../internal/reflect/DirectMethodMatcher.java | 47 +++
.../internal/reflect/InjectableParameter.java | 22 +
.../org/testng/internal/reflect/MethodMatcher.java | 24 ++
.../internal/reflect/MethodMatcherContext.java | 58 +++
.../internal/reflect/MethodMatcherException.java | 60 +++
.../org/testng/internal/reflect/Parameter.java | 98 +++++
.../testng/internal/reflect/ReflectionHelper.java | 48 +++
.../testng/internal/reflect/ReflectionRecipes.java | 410 +++++++++++++++++++
.../java/org/testng/internal/remote/SlavePool.java | 64 ---
.../internal/remote/SocketLinkedBlockingQueue.java | 21 -
.../java/org/testng/junit/JUnit3TestMethod.java | 5 +-
.../testng/junit/JUnit4ConfigurationMethod.java | 30 ++
.../java/org/testng/junit/JUnit4SpockMethod.java | 47 +++
.../java/org/testng/junit/JUnit4TestMethod.java | 22 +-
.../java/org/testng/junit/JUnit4TestRunner.java | 96 +++--
src/main/java/org/testng/junit/JUnitTestClass.java | 4 +-
.../java/org/testng/junit/JUnitTestMethod.java | 6 +-
.../java/org/testng/remote/ConnectionInfo.java | 35 --
src/main/java/org/testng/remote/RemoteArgs.java | 17 -
.../java/org/testng/remote/RemoteSuiteWorker.java | 34 --
src/main/java/org/testng/remote/RemoteTestNG.java | 278 -------------
src/main/java/org/testng/remote/RemoteWorker.java | 42 --
.../java/org/testng/remote/SuiteDispatcher.java | 168 --------
src/main/java/org/testng/remote/SuiteSlave.java | 101 -----
.../remote/adapter/DefaultMastertAdapter.java | 84 ----
.../remote/adapter/DefaultWorkerAdapter.java | 88 ----
.../org/testng/remote/adapter/IMasterAdapter.java | 40 --
.../org/testng/remote/adapter/IWorkerAdapter.java | 41 --
.../remote/adapter/RemoteResultListener.java | 64 ---
.../AbstractRemoteTestRunnerClient.java | 242 -----------
.../remote/strprotocol/BaseMessageSender.java | 279 -------------
.../testng/remote/strprotocol/GenericMessage.java | 56 ---
.../org/testng/remote/strprotocol/IMessage.java | 12 -
.../testng/remote/strprotocol/IMessageSender.java | 42 --
.../remote/strprotocol/IRemoteSuiteListener.java | 33 --
.../remote/strprotocol/IRemoteTestListener.java | 25 --
.../testng/remote/strprotocol/IStringMessage.java | 11 -
.../testng/remote/strprotocol/MessageHelper.java | 255 ------------
.../org/testng/remote/strprotocol/MessageHub.java | 79 ----
.../remote/strprotocol/RemoteTestListener.java | 119 ------
.../strprotocol/SerializedMessageSender.java | 57 ---
.../remote/strprotocol/StringMessageSender.java | 149 -------
.../testng/remote/strprotocol/SuiteMessage.java | 103 -----
.../org/testng/remote/strprotocol/TestMessage.java | 113 ------
.../remote/strprotocol/TestResultMessage.java | 442 ---------------------
.../java/org/testng/reporters/FailedReporter.java | 49 ++-
.../org/testng/reporters/FileStringBuffer.java | 36 +-
src/main/java/org/testng/reporters/Files.java | 16 +-
.../org/testng/reporters/SuiteHTMLReporter.java | 193 ++++-----
.../org/testng/reporters/TestHTMLReporter.java | 196 ++++-----
.../java/org/testng/reporters/XMLReporter.java | 40 +-
.../org/testng/reporters/XMLSuiteResultWriter.java | 3 +-
.../testng/reporters/jq/ChronologicalPanel.java | 88 ++--
src/main/java/org/testng/reporters/jq/Model.java | 31 +-
.../org/testng/reporters/util/StackTraceTools.java | 5 +-
src/main/java/org/testng/xml/LaunchSuite.java | 10 +-
src/main/java/org/testng/xml/Parser.java | 4 +-
.../java/org/testng/xml/ResultContentHandler.java | 152 -------
src/main/java/org/testng/xml/ResultXMLParser.java | 103 -----
.../java/org/testng/xml/TestNGContentHandler.java | 19 +-
src/main/java/org/testng/xml/XmlClass.java | 4 +-
src/main/java/org/testng/xml/XmlInclude.java | 21 +-
src/main/java/org/testng/xml/XmlSuite.java | 93 ++++-
src/main/java/org/testng/xml/XmlTest.java | 10 +-
src/main/resources/testng-1.0.dtd | 6 +-
.../test/groovy/EasyJUnitGroovySample.groovy | 17 +
src/test/groovy/test/groovy/GroovyTest.groovy | 48 +++
.../groovy/SpecialNameJUnitGroovySample.groovy | 17 +
src/test/groovy/test/groovy/SpockSample.groovy | 17 +
.../org/testng/internal/MethodInstanceTest.java | 35 +-
.../remote/strprotocol/TestResultMessageTest.java | 54 ---
src/test/java/test/BaseTest.java | 14 +-
src/test/java/test/DynamicGraphTest.java | 151 +++++--
src/test/java/test/InvokedMethodNameListener.java | 2 +
src/test/java/test/JUnit4Test.java | 116 ++----
.../test/annotationtransformer/MyTransformer.java | 2 +
...urationGroupIteratorDataProviderSampleTest.java | 50 +++
src/test/java/test/configuration/GroupsTest.java | 9 +
.../FailurePolicyTest.java | 4 +-
.../test/dataprovider/EmptyDataProviderSample.java | 31 ++
.../test/dataprovider/EmptyDataProviderTest.java | 26 ++
.../FailingIterableDataProviderTest.java | 34 ++
src/test/java/test/dataprovider/IndicesSample.java | 42 ++
src/test/java/test/dataprovider/IndicesTest.java | 79 +++-
.../java/test/distributed/DistributedTest.java | 174 --------
src/test/java/test/distributed/Test1.java | 15 -
src/test/java/test/distributed/Test2.java | 14 -
.../java/test/factory/ArrayEmptyFactorySample.java | 23 ++
.../test/factory/EmptyFactoryDataProviderTest.java | 26 ++
.../test/factory/FactoryAndTestMethodTest.java | 2 +-
.../test/factory/IteratorEmptyFactorySample.java | 26 ++
src/test/java/test/factory/NestedFactoryTest.java | 2 +-
.../java/test/factory/NestedStaticFactoryTest.java | 2 +-
.../FailedReporterLocalTestClass.java | 27 ++
.../FailedReporterParametersTest.java | 86 ++++
.../FailedReporterScenariosTest.java | 108 +++++
.../test/failedreporter/FailedReporterTest.java | 6 +-
.../test/invocationcount/DataProviderBase.java | 18 +-
.../test/invocationcount/FirstAndLastTimeTest.java | 20 +-
.../InvokedMethodListenerTest.java | 2 +-
.../java/test/junit4/BeforeClassJUnit4Sample.java | 23 ++
.../java/test/junit4/ClassRuleJUnit4Sample.java | 26 ++
.../java/test/listeners/ClassListenerSample.java | 3 +
src/test/java/test/listeners/Derived3.java | 13 +
.../java/test/listeners/GitHub911Listener.java | 51 +++
src/test/java/test/listeners/GitHub911Sample.java | 20 +
src/test/java/test/listeners/ListenerTest.java | 102 ++++-
src/test/java/test/listeners/MyClassListener.java | 30 +-
.../java/test/listeners/SetStatusListener.java | 42 ++
src/test/java/test/listeners/SetStatusSample.java | 12 +
.../java/test/listeners/TestAndClassListener.java | 66 +++
src/test/java/test/morten/SampleTest.java | 2 +-
src/test/java/test/morten/SampleTestFactory.java | 2 +-
src/test/java/test/name/BlankNameSample.java | 19 +
src/test/java/test/name/NameTest.java | 60 ++-
src/test/java/test/name/TestOnClassListener.java | 33 ++
src/test/java/test/name/TestOnClassSample.java | 10 +
.../test/parameters/ParameterOverrideTest.java | 2 +-
src/test/java/test/priority/BaseSample.java | 50 ---
.../java/test/priority/Priority2SampleTest.java | 17 -
src/test/java/test/priority/PriorityTest.java | 25 +-
.../WithPriorityAndDependsMethodsSample.java | 15 +
.../test/priority/WithPrioritySample2Test.java | 10 +-
.../java/test/priority/WithPrioritySampleTest.java | 10 +-
.../test/priority/WithoutPrioritySampleTest.java | 10 +-
.../java/test/reflect/ReflectionRecipesTest.java | 352 ++++++++++++++++
.../test/reflect/TestContextJustForTesting.java | 153 +++++++
src/test/java/test/reflect/TestMethodMatcher.java | 241 +++++++++++
.../test/reflect/TestResultJustForTesting.java | 130 ++++++
.../java/test/reflect/XmlTestJustForTesting.java | 11 +
src/test/java/test/remote/RemoteSampleTest.java | 18 -
src/test/java/test/remote/RemoteTest.java | 89 -----
.../test/reports/ReporterLogFailureSampleTest.java | 16 +
.../java/test/reports/ReporterLogListener.java | 26 ++
.../java/test/reports/ReporterLogSampleTest.java | 25 --
.../test/reports/ReporterLogSkippedSampleTest.java | 21 +
.../test/reports/ReporterLogSuccessSampleTest.java | 15 +
src/test/java/test/reports/ReporterLogTest.java | 38 +-
.../java/test/skipex/SkippedExceptionTest.java | 3 +-
src/test/java/test/testng387/TestNG387.java | 2 +-
src/test/java/test/thread/ParallelTestTest.java | 93 +++--
.../test/thread/PriorityInSingleThreadTest.java | 23 ++
.../thread/SingleThreadForParallelMethodsTest.java | 25 ++
src/test/resources/testng-remote.xml | 12 -
src/test/resources/testng.xml | 21 +-
travis.sh | 51 ++-
201 files changed, 4873 insertions(+), 5138 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git
More information about the pkg-java-commits
mailing list