This is an automated email from the git hooks/post-receive script. eugene-guest pushed a commit to branch master in repository testng.
commit 63544b44c65475b27098d2d035a73e4f57f0929e Merge: 2c81241 8e96012 Author: Eugene Zhukov <[email protected]> Date: Tue Aug 18 09:54:33 2015 +0000 Merge tag 'upstream/6.9.5' Upstream version 6.9.5 .classpath | 1 + .gitignore | 30 +- .travis.yml | 8 +- CHANGES.txt | 26 + README-publish | 6 + README.md | 2 + README.template => ant/README.template | 0 build-ant.xml => ant/build-ant.xml | 148 ++-- build-tests.xml => ant/build-tests.xml | 0 build.properties => ant/build.properties | 0 build.xml => ant/build.xml | 934 ++++++++++----------- ivy.xml => ant/ivy.xml | 2 +- {old => ant/old}/build-dogfood.xml | 0 {old => ant/old}/build-sample.xml | 0 appveyor.yml | 25 + build-with-gradle | 1 + build.gradle | 140 +++ doc/ant.html | 2 +- doc/documentation-main.html | 7 +- doc/download.html | 82 +- doc/index.html | 4 +- examples/.cvsignore | 4 - examples/build.xml | 146 ---- examples/src/example1/Test1.java | 85 -- examples/src/priority/Priority.java | 13 - examples/src/priority/PriorityInterceptor.java | 46 - examples/src/priority/PriorityTest.java | 31 - examples/testng.xml | 32 - gigaspaces/.classpath | 12 - gigaspaces/.project | 17 - gigaspaces/build.xml | 101 --- .../src/org/testng/gigaspaces/ResultEntry.java | 44 - .../org/testng/gigaspaces/SpaceMasterAdapter.java | 153 ---- .../org/testng/gigaspaces/SpaceWorkerAdapter.java | 113 --- .../src/org/testng/gigaspaces/SuiteEntry.java | 59 -- .../test/src/test/gigaspaces/DistributedTest.java | 171 ---- gigaspaces/test/src/test/gigaspaces/Test1.java | 15 - gigaspaces/test/src/test/gigaspaces/Test2.java | 14 - gradle/buildWithTravis.sh | 1 + gradle/publishing-jcenter.gradle | 70 ++ gradle/publishing-maven.gradle | 56 ++ gradle/publishing.gradle | 57 ++ gradle/uploadSnapshot.sh | 12 + gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 ++++ gradlew.bat | 90 ++ maven/build-with-maven | 25 + maven/bundle-pom.xml | 59 ++ maven/plugin-resources/junitRpt-failed.jsl | 307 ------- maven/plugin-resources/junitRpt.jsl | 375 --------- maven/plugin.jelly | 88 -- maven/plugin.properties | 5 - pom-test.xml => maven/pom-test.xml | 0 maven/project.properties | 3 - maven/project.xml | 97 --- pom.xml | 27 +- spring/.classpath | 15 - spring/.cvsignore | 3 - spring/.project | 17 - spring/LICENSE.txt | 201 ----- spring/README.TXT | 23 - spring/build.xml | 94 --- ...tractDependencyInjectionSpringContextTests.java | 259 ------ .../spring/test/AbstractSpringContextTests.java | 140 --- ...tTransactionalDataSourceSpringContextTests.java | 175 ---- .../AbstractTransactionalSpringContextTests.java | 328 -------- .../src/common/org/testng/spring/test/package.html | 14 - .../test/AbstractSingleSpringContextTests.java | 192 ----- .../AbstractAnnotationAwareTransactionalTests.java | 67 -- .../test/AbstractSingleSpringContextTests.java | 194 ----- .../java/org/testng/internal/VersionTemplateJava} | 2 +- src/main/java/org/testng/Assert.java | 85 +- src/main/java/org/testng/AssertJUnit.java | 8 +- src/main/java/org/testng/CommandLineArgs.java | 2 +- .../java/org/testng/IExpectedExceptionsHolder.java | 20 + src/main/java/org/testng/ITestNGMethod.java | 1 + src/main/java/org/testng/Reporter.java | 6 +- src/main/java/org/testng/SuiteRunner.java | 22 +- src/main/java/org/testng/TestNG.java | 78 +- src/main/java/org/testng/TestNGAntTask.java | 2 +- src/main/java/org/testng/TestRunner.java | 61 +- src/main/java/org/testng/asserts/Assertion.java | 782 ++--------------- src/main/java/org/testng/asserts/IAssert.java | 6 +- .../java/org/testng/asserts/IAssertLifecycle.java | 12 +- .../java/org/testng/asserts/LoggingAssert.java | 2 +- src/main/java/org/testng/asserts/SoftAssert.java | 20 +- .../java/org/testng/internal/BaseClassFinder.java | 2 +- .../java/org/testng/internal/BaseTestMethod.java | 34 +- src/main/java/org/testng/internal/Bsh.java | 2 +- src/main/java/org/testng/internal/ClassHelper.java | 31 +- .../java/org/testng/internal/ClassInfoMap.java | 2 +- .../java/org/testng/internal/ClonedMethod.java | 5 + .../org/testng/internal/ConfigurationMethod.java | 30 +- src/main/java/org/testng/internal/Constants.java | 12 +- .../testng/internal/ExpectedExceptionsHolder.java | 109 ++- .../java/org/testng/internal/FactoryMethod.java | 12 +- src/main/java/org/testng/internal/Graph.java | 16 +- .../org/testng/internal/ITestResultNotifier.java | 8 +- .../org/testng/internal/InvokeMethodRunnable.java | 23 +- .../java/org/testng/internal/InvokedMethod.java | 9 +- src/main/java/org/testng/internal/Invoker.java | 228 ++--- .../org/testng/internal/MethodGroupsHelper.java | 23 +- .../java/org/testng/internal/MethodHelper.java | 59 +- .../org/testng/internal/MethodInheritance.java | 14 +- .../testng/internal/MethodInvocationHelper.java | 28 +- .../java/org/testng/internal/PackageUtils.java | 14 +- src/main/java/org/testng/internal/Parameters.java | 11 - src/main/java/org/testng/internal/PoolService.java | 6 +- .../java/org/testng/internal/PropertiesFile.java | 2 +- .../java/org/testng/internal/PropertyUtils.java | 4 +- .../internal/RegexpExpectedExceptionsHolder.java | 65 ++ src/main/java/org/testng/internal/ResultMap.java | 4 +- src/main/java/org/testng/internal/Tarjan.java | 6 +- .../java/org/testng/internal/TestMethodWorker.java | 4 +- .../org/testng/internal/TestNGClassFinder.java | 16 +- src/main/java/org/testng/internal/Utils.java | 52 +- .../org/testng/internal/XmlMethodSelector.java | 4 +- src/main/java/org/testng/internal/Yaml.java | 9 +- src/main/java/org/testng/internal/YamlParser.java | 9 +- .../org/testng/internal/annotations/Converter.java | 6 +- .../internal/annotations/IBaseBeforeAfter.java | 2 +- .../annotations/JDK15AnnotationFinder.java | 26 +- .../internal/annotations/JDK15TagFactory.java | 2 +- .../internal/annotations/TestAnnotation.java | 5 +- .../java/org/testng/internal/collections/Pair.java | 2 +- .../internal/junit/ArrayComparisonFailure.java | 4 +- .../testng/internal/thread/IPooledExecutor.java | 3 - .../java/org/testng/junit/JUnit4TestRunner.java | 4 +- .../java/org/testng/junit/JUnitMethodFinder.java | 24 +- .../java/org/testng/junit/JUnitTestRunner.java | 2 +- src/main/java/org/testng/log4testng/Logger.java | 6 +- src/main/java/org/testng/mustache/Model.java | 8 +- src/main/java/org/testng/remote/RemoteTestNG.java | 4 +- .../java/org/testng/remote/SuiteDispatcher.java | 18 +- src/main/java/org/testng/remote/SuiteSlave.java | 12 +- .../remote/adapter/DefaultMastertAdapter.java | 22 +- .../remote/adapter/DefaultWorkerAdapter.java | 12 +- .../org/testng/remote/adapter/IMasterAdapter.java | 8 +- .../org/testng/remote/adapter/IWorkerAdapter.java | 8 +- .../remote/adapter/RemoteResultListener.java | 6 +- .../remote/strprotocol/BaseMessageSender.java | 7 +- .../testng/remote/strprotocol/GenericMessage.java | 5 +- .../remote/strprotocol/IRemoteSuiteListener.java | 2 +- .../org/testng/remote/strprotocol/MessageHub.java | 7 +- .../remote/strprotocol/StringMessageSender.java | 6 +- .../testng/remote/strprotocol/SuiteMessage.java | 11 +- .../org/testng/remote/strprotocol/TestMessage.java | 3 - .../remote/strprotocol/TestResultMessage.java | 60 +- .../java/org/testng/reporters/FailedReporter.java | 6 +- .../org/testng/reporters/SuiteHTMLReporter.java | 3 +- .../java/org/testng/reporters/XMLConstants.java | 3 - .../java/org/testng/reporters/XMLReporter.java | 6 +- .../java/org/testng/reporters/XMLStringBuffer.java | 13 +- .../org/testng/reporters/XMLSuiteResultWriter.java | 2 +- .../java/org/testng/util/RetryAnalyzerCount.java | 15 +- src/main/java/org/testng/xml/ISuiteParser.java | 6 + src/main/java/org/testng/xml/Parser.java | 28 +- src/main/java/org/testng/xml/ResultXMLParser.java | 7 +- src/main/java/org/testng/xml/SuiteXmlParser.java | 15 +- .../java/org/testng/xml/TestNGContentHandler.java | 16 +- src/main/java/org/testng/xml/XMLParser.java | 19 +- src/main/java/org/testng/xml/XmlSuite.java | 2 +- src/main/java/org/testng/xml/XmlTest.java | 8 +- src/main/java/org/testng/xml/dom/DomUtil.java | 6 +- src/main/java/org/testng/xml/dom/DomXmlParser.java | 8 +- src/main/java/org/testng/xml/dom/XDom.java | 18 +- .../META-INF/services/org.testng.xml.ISuiteParser | 1 + .../internal/{Version.java => VersionTemplateJava} | 2 +- src/main/resources/testng-1.0.dtd | 5 +- src/test/java/org/testng/AssertTest.java | 4 +- .../org/testng/internal/MethodInstanceTest.java | 6 +- src/test/java/test/BaseDistributedTest.java | 10 +- src/test/java/test/BaseTest.java | 81 +- src/test/java/test/DynamicGraphTest.java | 4 +- src/test/java/test/GraphTest.java | 10 +- src/test/java/test/InvokedMethodNameListener.java | 30 +- src/test/java/test/MapTest.java | 4 +- src/test/java/test/Test1.java | 6 +- src/test/java/test/TestHelper.java | 2 +- .../AnnotationTransformerTest.java | 20 + .../annotationtransformer/MyParamTransformer.java | 30 + src/test/java/test/ant/TestCommandLineArgs.java | 2 +- src/test/java/test/assertion/AssertionTest.java | 29 + src/test/java/test/assertion/MyRawAssertion.java | 72 ++ src/test/java/test/assertion/SoftAssertTest.java | 47 ++ src/test/java/test/asserttests/AssertTest.java | 88 +- .../java/test/configuration/BaseSuiteTest.java | 2 +- .../test/configuration/BeforeTestOrderingTest.java | 2 +- .../ConfigurationGroupDataProviderSampleTest.java | 2 +- ...onfigurationGroupInvocationCountSampleTest.java | 2 +- .../ConfigurationGroups1SampleTest.java | 2 +- .../ConfigurationGroups2SampleTest.java | 2 +- .../ConfigurationGroups3SampleTest.java | 2 +- .../ConfigurationGroups7SampleTest.java | 2 +- .../ConfigurationGroups8SampleTest.java | 2 +- ...tMethodParametrizedConfigurationMethodTest.java | 4 +- .../InstanceDataProviderSampleTest.java | 2 +- src/test/java/test/dataprovider/IterableTest.java | 4 +- .../dataprovider/ParallelDataProviderTest.java | 8 +- src/test/java/test/dataprovider/Sample1Test.java | 4 +- .../java/test/dataprovider/TestInstanceTest.java | 4 +- src/test/java/test/dependent/DepBugSampleTest.java | 2 +- src/test/java/test/dependent/SD2.java | 2 +- .../java/test/distributed/DistributedTest.java | 4 +- src/test/java/test/enable/A.java | 28 + src/test/java/test/enable/B.java | 28 + src/test/java/test/enable/C.java | 28 + src/test/java/test/enable/EnableTest.java | 49 +- .../java/test/enable/Issue420BaseTestCase.java | 19 + src/test/java/test/enable/Issue420FirstSample.java | 10 + .../java/test/enable/Issue420SecondSample.java | 10 + .../java/test/factory/FactoryInterleavingTest.java | 1 - src/test/java/test/factory/FactoryTest2.java | 4 +- .../java/test/factory/FactoryWithDataProvider.java | 2 +- .../test/factory/FactoryWithInstanceInfoTest2.java | 4 +- src/test/java/test/factory/Sample2.java | 6 +- src/test/java/test/factory/VerifyFactoryTest.java | 4 +- .../factory/VerifyFactoryWithInstanceInfoTest.java | 4 +- src/test/java/test/failures/FailuresTest.java | 2 +- src/test/java/test/groupinvocation/DummyTest.java | 2 +- src/test/java/test/hook/HookSuccess599Test.java | 43 + src/test/java/test/hook/HookableTest.java | 14 + src/test/java/test/inheritance/ZBase_0.java | 4 +- .../{ => inheritance}/testng234/ChildTest.java | 2 +- .../{ => inheritance}/testng234/ParentTest.java | 2 +- .../testng234/PolymorphicFailureTest.java | 2 +- .../java/test/inheritance/testng471/Class1.java | 32 + .../java/test/inheritance/testng471/Class2.java | 30 + .../java/test/inheritance/testng471/Class3.java | 34 + .../test/inheritance/testng471/SuperClass1.java | 10 + .../test/inheritance/testng471/SuperClass2.java | 10 + .../java/test/inheritance/testng471/TestNG471.java | 42 + src/test/java/test/inheritance/testng739/A.java | 17 + src/test/java/test/inheritance/testng739/B.java | 10 + .../java/test/inheritance/testng739/BaseClass.java | 9 + .../java/test/inheritance/testng739/TestNG739.java | 26 + .../InterleavedInvocationTest.java | 4 +- .../FastTestsFirstInterceptor.java | 4 +- .../java/test/methodinterceptors/Issue521.java | 17 + .../java/test/methodinterceptors/Issue521Test.java | 43 + .../methodinterceptors/NullMethodInterceptor.java | 2 +- .../RemoveAMethodInterceptor.java | 4 +- .../multipleinterceptors/FirstInterceptor.java | 8 + .../multipleinterceptors/FooTest.java | 22 + .../MethodNameFilterInterceptor.java | 37 + .../MultipleInterceptorsTest.java | 38 + .../multipleinterceptors/SecondInterceptor.java | 8 + .../multipleinterceptors/ThirdInterceptor.java | 8 + .../java/test/methodselectors/CommandLineTest.java | 2 +- src/test/java/test/mustache/MustacheTest.java | 8 +- src/test/java/test/pholser/Captor.java | 2 +- .../java/test/retryAnalyzer/EventualSuccess.java | 17 + src/test/java/test/retryAnalyzer/ExitCodeTest.java | 31 + .../java/test/retryAnalyzer/ImmediateSuccess.java | 9 + .../java/test/retryAnalyzer/PersistentFailure.java | 11 + .../java/test/sample/BaseSampleInheritance.java | 2 +- .../java/test/serviceloader/ServiceLoaderTest.java | 26 +- src/test/java/test/testng285/BugBase.java | 2 +- src/test/java/test/testng317/VerifyTest.java | 4 +- src/test/java/test/testng387/FailedDPTest.java | 14 +- src/test/java/test/testng387/TestNG387.java | 29 +- src/test/java/test/thread/B.java | 2 +- src/test/java/test/thread/Helper.java | 4 +- src/test/java/test/thread/ParallelTestTest.java | 2 +- src/test/java/test/thread/SequentialTest.java | 8 +- .../test/timeout/InvocationTimeOutSampleTest.java | 10 +- .../java/test/timeout/TestTimeOutSampleTest.java | 5 +- src/test/java/test/timeout/TimeOutFromXmlTest.java | 80 +- src/test/java/test/timeout/TimeOutSample2Test.java | 10 +- src/test/java/test/timeout/TimeOutSampleTest.java | 12 +- src/test/java/test/timeout/TimeOutTest.java | 75 +- src/test/java/test/timeout/issue575.xml | 9 + src/test/java/test/tmp/AssertEqualsTest.java | 16 +- src/test/java/test/tmp/DataDrivenTest.java | 2 +- .../java/test/tmp/Test_TestListenerAppender.java | 2 +- .../java/test/tmp/verify/VerifyInterceptor.java | 4 +- src/test/java/test/triangle/CheckCount.java | 4 +- .../multipleinterceptors/multiple-interceptors.xml | 15 + src/test/resources/testng.xml | 11 +- update-beust.com | 2 +- 280 files changed, 3595 insertions(+), 6089 deletions(-) -- 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
