This is an automated email from the git hooks/post-receive script. eugene pushed a commit to branch master in repository testng.
commit ad254462cd4bb3b3d273b9c4a7ca1744a3574173 Merge: a897bc2 4a85ca2 Author: Eugene Zhukov <[email protected]> Date: Sat Apr 2 22:19:19 2016 +0300 Merge branch 'upstream' .gitignore | 6 +- .mailmap | 13 ++ .travis.yml | 4 +- CHANGES.txt | 46 +++- README-publish | 7 +- README.md | 4 +- build.gradle | 49 +++- deploy-to-maven | 14 ++ doc/banner.js | 1 + doc/documentation-main.html | 45 +++- doc/eclipse.html | 71 +++++- doc/misc.html | 1 + gradle/publishing-jcenter.gradle | 2 +- gradle/publishing-maven.gradle | 41 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- kobalt/src/Build.kt | 64 ++++++ kobalt/wrapper/kobalt-wrapper.properties | 1 + kobaltw | 2 + maven/build-with-maven | 12 - maven/pom-test.xml | 137 ----------- pictures/launch.png | Bin 153409 -> 288332 bytes pictures/preferences.png | Bin 0 -> 168432 bytes pictures/project_properties.png | Bin 0 -> 180489 bytes pictures/suites.png | Bin 79127 -> 164875 bytes pom.xml | 19 +- settings.gradle | 1 + src/main/java/main.iml | 16 ++ src/main/java/org/testng/Assert.java | 104 ++++----- src/main/java/org/testng/CommandLineArgs.java | 3 +- src/main/java/org/testng/Converter.java | 6 +- src/main/java/org/testng/DependencyMap.java | 18 +- src/main/java/org/testng/FileAssert.java | 2 +- src/main/java/org/testng/IAlterSuiteListener.java | 25 ++ .../java/org/testng/IAnnotationTransformer3.java | 9 + src/main/java/org/testng/IClassListener.java | 7 + src/main/java/org/testng/ISuite.java | 2 +- src/main/java/org/testng/ITestResult.java | 2 +- src/main/java/org/testng/ITestRunnerFactory.java | 3 +- src/main/java/org/testng/SuiteRunner.java | 50 ++-- src/main/java/org/testng/TestClass.java | 3 + src/main/java/org/testng/TestNG.java | 148 ++++++++---- src/main/java/org/testng/TestRunner.java | 96 ++++---- .../IListenersAnnotation.java} | 6 +- src/main/java/org/testng/asserts/Assertion.java | 2 +- src/main/java/org/testng/asserts/SoftAssert.java | 11 +- .../java/org/testng/internal/BaseTestMethod.java | 11 +- src/main/java/org/testng/internal/ClassHelper.java | 16 +- src/main/java/org/testng/internal/ClassImpl.java | 7 + .../java/org/testng/internal/Configuration.java | 15 +- .../java/org/testng/internal/DynamicGraph.java | 11 +- .../java/org/testng/internal/FactoryMethod.java | 15 +- src/main/java/org/testng/internal/Graph.java | 23 +- .../java/org/testng/internal/IConfiguration.java | 8 +- src/main/java/org/testng/internal/Invoker.java | 44 ++-- .../java/org/testng/internal/MethodHelper.java | 4 + .../testng/internal/MethodInvocationHelper.java | 3 +- src/main/java/org/testng/internal/ResultMap.java | 6 +- src/main/java/org/testng/internal/Tarjan.java | 5 +- .../java/org/testng/internal/TestMethodWorker.java | 20 +- .../org/testng/internal/TestNGClassFinder.java | 16 +- src/main/java/org/testng/internal/TestResult.java | 8 +- src/main/java/org/testng/internal/Utils.java | 117 ++++++---- src/main/java/org/testng/internal/Yaml.java | 36 +-- .../internal/annotations/AnnotationHelper.java | 4 +- .../org/testng/internal/annotations/Converter.java | 4 +- .../testng/internal/annotations/IListeners.java | 7 +- .../annotations/JDK15AnnotationFinder.java | 18 +- .../internal/annotations/JDK15TagFactory.java | 3 +- .../internal/thread/AtomicIntegerAdapter.java | 36 --- .../testng/internal/thread/CountDownAdapter.java | 39 ---- .../org/testng/internal/thread/IAtomicInteger.java | 22 -- .../org/testng/internal/thread/ICountDown.java | 14 -- .../testng/internal/thread/IPooledExecutor.java | 18 -- .../org/testng/internal/thread/ThreadUtil.java | 51 ----- .../java/org/testng/junit/IJUnitTestRunner.java | 4 +- .../java/org/testng/junit/JUnit4TestRunner.java | 4 +- src/main/java/org/testng/junit/JUnitTestClass.java | 8 +- .../java/org/testng/junit/JUnitTestRunner.java | 5 +- src/main/java/org/testng/remote/RemoteTestNG.java | 10 +- .../remote/strprotocol/BaseMessageSender.java | 100 ++++---- .../testng/remote/strprotocol/GenericMessage.java | 31 +-- .../testng/remote/strprotocol/IMessageSender.java | 8 + .../testng/remote/strprotocol/SuiteMessage.java | 1 + .../org/testng/remote/strprotocol/TestMessage.java | 1 + .../remote/strprotocol/TestResultMessage.java | 2 +- .../org/testng/reporters/EmailableReporter.java | 2 +- .../org/testng/reporters/FileStringBuffer.java | 13 +- .../org/testng/reporters/JUnitReportReporter.java | 2 +- .../org/testng/reporters/JUnitXMLReporter.java | 16 +- .../org/testng/reporters/SuiteHTMLReporter.java | 180 ++++++++------- .../java/org/testng/reporters/XMLReporter.java | 2 +- .../org/testng/reporters/XMLReporterConfig.java | 14 +- .../org/testng/reporters/jq/ResultsByClass.java | 2 +- src/main/java/org/testng/xml/LaunchSuite.java | 2 +- .../java/org/testng/xml/TestNGContentHandler.java | 34 ++- src/main/java/org/testng/xml/XMLParser.java | 10 +- src/main/java/org/testng/xml/XmlClass.java | 8 +- src/main/java/org/testng/xml/XmlSuite.java | 101 ++++++--- src/main/java/org/testng/xml/XmlTest.java | 51 ++--- src/main/resources/header | 1 + src/main/resources/testng-1.0.dtd | 6 +- .../java/org/testng/xml/SuiteXmlParserTest.java | 41 ++++ src/test/java/test/BaseTest.java | 8 +- src/test/java/test/DynamicGraphTest.java | 8 + src/test/java/test/MapTest.java | 18 -- src/test/java/test/SimpleBaseTest.java | 43 +++- src/test/java/test/TestHelper.java | 10 +- .../AnnotationTransformerClassSampleTest.java | 2 + .../AnnotationTransformerTest.java | 17 ++ .../MyListenerTransformer.java | 33 +++ .../annotationtransformer/MySuiteListener.java | 17 ++ .../annotationtransformer/MySuiteListener2.java | 17 ++ src/test/java/test/assertion/SoftAssertTest.java | 11 +- .../test/asserttests/ArrayEqualityAssertTest.java | 252 +++++++++++++++++++++ src/test/java/test/asserttests/AssertTest.java | 13 +- .../test/configuration/BeforeClassThreadTest.java | 3 +- .../factory/BadFactoryMethodReturnTypeSample.java | 14 ++ .../java/test/factory/FactoryIntegrationTest.java | 47 ++++ src/test/java/test/factory/GitHub876Sample.java | 47 ++++ .../test/factory/NonPublicFactoryMethodSample.java | 14 ++ src/test/java/test/hook/HookSuccess862Test.java | 40 ++++ src/test/java/test/hook/HookableTest.java | 8 + .../InvokedMethodListenerTest.java | 3 +- .../test/listeners/AlterSuiteListenerTest.java | 81 +++++++ src/test/java/test/listeners/BaseWithListener.java | 2 +- .../java/test/listeners/ClassListenerSample.java | 11 + src/test/java/test/listeners/ListenerAssert.java | 20 ++ src/test/java/test/listeners/ListenerTest.java | 94 +++++++- src/test/java/test/listeners/MyClassListener.java | 24 ++ .../test/listeners/MyInvokedMethodListener.java | 34 +++ .../java/test/listeners/MyMethodInterceptor.java | 22 ++ src/test/java/test/listeners/SuiteListener.java | 8 +- src/test/java/test/listeners/SuiteListener2.java | 88 +++++++ .../java/test/listeners/SuiteListenerSample2.java | 11 + .../methodinterceptors/MethodInterceptorTest.java | 2 +- .../MultipleInterceptorsTest.java | 3 +- .../test/multiplelisteners/SimpleReporter.java | 6 +- src/test/java/test/name/ITestSample.java | 43 ++++ src/test/java/test/name/NameSample.java | 13 ++ src/test/java/test/name/NameTest.java | 146 ++++++++++++ src/test/java/test/name/NoNameSample.java | 12 + src/test/java/test/name/SimpleITestSample.java | 18 ++ src/test/java/test/priority/PriorityTest.java | 3 +- src/test/java/test/reports/ReportTest.java | 82 ++++--- src/test/java/test/retryAnalyzer/FactoryTest.java | 57 ++--- .../test/retryAnalyzer/InvocationCountTest.java | 129 +++++++++++ src/test/java/test/retryAnalyzer/MyFactory.java | 24 +- .../java/test/retryAnalyzer/RetryAnalyzerTest.java | 133 +++-------- .../java/test/sanitycheck/CheckSuiteNamesTest.java | 29 ++- .../serviceloader/MyConfigurationListener.java | 22 ++ .../java/test/serviceloader/ServiceLoaderTest.java | 15 +- .../java/test/skipex/SkippedExceptionTest.java | 4 +- .../java/test/skipex/TestSkippedExceptionTest.java | 5 + src/test/java/test/testnames/TestNamesFeature.java | 12 + src/test/java/test/testnames/TestNamesTest.java | 25 ++ src/test/java/test/testng285/TestNG285Test.java | 2 +- src/test/java/test/testng387/TestNG387.java | 4 +- src/test/java/test/thread/FactoryTest.java | 11 +- src/test/java/test/thread/Helper.java | 5 +- .../test/thread/MultiThreadedDependentTest.java | 3 +- src/test/java/test/thread/ParallelTestTest.java | 16 +- src/test/java/test/thread/SequentialTest.java | 2 +- src/test/java/test/thread/TrueParallelTest.java | 2 +- .../java/test/timeout/TimeOutIntegrationTest.java | 26 +++ src/test/java/test/timeout/TimeOutTest.java | 7 +- .../test/timeout/TimeOutWithParallelSample.java | 11 + .../META-INF/services/org.testng.ITestNGListener | 1 + src/test/resources/testnames/main-suite.xml | 22 ++ src/test/resources/testnames/upstream-suite.xml | 7 + src/test/resources/testng.xml | 21 +- src/test/resources/xml/badWithDoctype.xml | 5 + src/test/resources/xml/badWithoutDoctype.xml | 4 + src/test/resources/xml/goodWithDoctype.xml | 5 + src/test/resources/xml/goodWithoutDoctype.xml | 4 + src/test/resources/yaml/a1.xml | 5 +- travis.sh | 11 + 176 files changed, 2976 insertions(+), 1296 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
