[testng] 12/355: Merge branch 'master' of git://github.com/cbeust/testng
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Tue Aug 18 10:19:42 UTC 2015
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 f8b81a541bc3ac90ba387bfe2fd7256fab808f74
Merge: 909b7bd aee6705
Author: Nalin Makar <nullin at nullin.com>
Date: Fri May 31 23:57:14 2013 -0700
Merge branch 'master' of git://github.com/cbeust/testng
.gitignore | 3 +-
CHANGES.txt | 19 +++-
README.dev | 5 +
build.properties | 2 +-
doc/documentation-main.html | 9 ++
doc/index.html | 4 +-
doc/misc.html | 63 +++++++------
pom-test.xml | 6 +-
pom.xml | 7 +-
src/main/java/org/testng/Assert.java | 10 +-
src/main/java/org/testng/DependencyMap.java | 6 +-
src/main/java/org/testng/SkipException.java | 2 +-
src/main/java/org/testng/SuiteRunner.java | 2 +-
src/main/java/org/testng/TestNG.java | 23 ++++-
src/main/java/org/testng/TestNGAntTask.java | 2 +-
src/main/java/org/testng/TestRunner.java | 51 +++++-----
.../java/org/testng/annotations/AfterGroups.java | 2 +-
src/main/java/org/testng/asserts/Assertion.java | 4 +-
src/main/java/org/testng/asserts/SoftAssert.java | 5 +-
.../java/org/testng/internal/BaseTestMethod.java | 50 ++++------
src/main/java/org/testng/internal/ClassHelper.java | 5 +
.../org/testng/internal/ConfigurationMethod.java | 82 +++++++++-------
.../org/testng/internal/MethodInheritance.java | 3 +-
.../testng/internal/MethodInvocationHelper.java | 30 ++++--
src/main/java/org/testng/internal/Parameters.java | 3 +
.../java/org/testng/internal/SuiteRunnerMap.java | 7 +-
.../java/org/testng/internal/TestNGMethod.java | 2 +-
.../org/testng/internal/TestNGMethodFinder.java | 5 +-
src/main/java/org/testng/internal/Version.java | 4 +-
.../org/testng/internal/XmlMethodSelector.java | 2 +-
.../internal/annotations/AnnotationHelper.java | 15 +--
.../annotations/ConfigurationAnnotation.java | 7 +-
.../internal/annotations/IAnnotationFinder.java | 14 +--
.../internal/annotations/IBaseBeforeAfter.java | 4 +-
.../testng/internal/annotations/IListeners.java | 3 +-
.../annotations/JDK15AnnotationFinder.java | 105 +++++++++------------
.../internal/annotations/JDK15TagFactory.java | 19 ++--
.../java/org/testng/junit/JUnit4TestRunner.java | 4 +-
src/main/java/org/testng/remote/SuiteSlave.java | 1 -
.../remote/strprotocol/TestResultMessage.java | 73 +++++++++++++-
.../org/testng/reporters/FileStringBuffer.java | 3 +-
.../org/testng/reporters/JUnitReportReporter.java | 2 +-
.../java/org/testng/reporters/XMLStringBuffer.java | 3 +
src/main/java/org/testng/xml/ResultXMLParser.java | 2 +-
src/main/java/org/testng/xml/SuiteXmlParser.java | 2 +-
.../java/org/testng/xml/TestNGContentHandler.java | 42 ++++++++-
src/main/java/org/testng/xml/XMLParser.java | 15 ++-
src/main/java/org/testng/xml/XmlTest.java | 4 +-
.../remote/strprotocol/TestResultMessageTest.java | 54 +++++++++++
src/test/java/test/FileStringBufferTest.java | 30 ++++++
src/test/java/test/assertion/AssertionTest.java | 19 ++++
.../java/test/dependent/DependencyFixTest.java | 24 +++++
src/test/java/test/issue107/Issue107Test.java | 50 ++++++++++
src/test/java/test/issue107/MySuiteListener.java | 33 ++-----
src/test/java/test/issue107/TestTestngCounter.java | 16 +++-
.../java/test/sanitycheck/CheckSuiteNamesTest.java | 65 +++++++++++++
.../java/test/sanitycheck/CheckTestNamesTest.java | 8 +-
.../java/test/thread/TrueParallelSampleTest.java | 12 ++-
src/test/java/test/thread/TrueParallelTest.java | 2 +-
src/test/resources/sanitycheck/test-s-1.xml | 13 +++
src/test/resources/sanitycheck/test-s-2.xml | 13 +++
src/test/resources/sanitycheck/test-s-3.xml | 13 +++
src/test/resources/sanitycheck/test-s-a.xml | 7 ++
src/test/resources/sanitycheck/test-s-b.xml | 7 ++
src/test/resources/testng.xml | 13 +++
65 files changed, 815 insertions(+), 300 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