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 fbf3529e4a91e33b155ba1ffbceb24c113dbcf09 Merge: 4d237fd bd1e7d4 Author: Cedric Beust <[email protected]> Date: Fri Aug 9 09:43:28 2013 -0700 Merge branch 'master' of github.com:cbeust/testng .gitignore | 2 + CHANGES.txt | 16 ++++- build.properties | 2 +- doc/documentation-main.html | 7 ++- doc/index.html | 4 +- doc/misc.html | 4 +- pom-test.xml | 6 +- pom.xml | 7 ++- src/main/java/org/testng/Assert.java | 2 +- src/main/java/org/testng/SkipException.java | 2 +- src/main/java/org/testng/SuiteRunner.java | 2 +- src/main/java/org/testng/TestNG.java | 42 ++++++------- src/main/java/org/testng/asserts/Assertion.java | 2 + src/main/java/org/testng/internal/ClassHelper.java | 5 ++ src/main/java/org/testng/internal/Version.java | 4 +- .../org/testng/internal/XmlMethodSelector.java | 2 +- .../remote/strprotocol/TestResultMessage.java | 73 ++++++++++++++++++++-- .../org/testng/reporters/FileStringBuffer.java | 33 +++++----- .../org/testng/reporters/JUnitReportReporter.java | 2 +- .../java/org/testng/reporters/XMLStringBuffer.java | 3 + src/main/java/org/testng/xml/Parser.java | 27 ++++---- 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 ++++- .../remote/strprotocol/TestResultMessageTest.java | 54 ++++++++++++++++ .../java/test/CheckSuitesInitializationTest.java | 42 +++++++++++++ src/test/java/test/FileStringBufferTest.java | 30 +++++++++ src/test/java/test/assertion/AssertionTest.java | 19 ++++++ .../java/test/thread/TrueParallelSampleTest.java | 12 +++- src/test/java/test/thread/TrueParallelTest.java | 2 +- .../checksuitesinitialization/child-suite1.xml | 7 +++ .../checksuitesinitialization/child-suite2.xml | 7 +++ .../children/child-suite-3.xml | 8 +++ .../children/child-suite-4.xml | 7 +++ .../children/morechildren/child-suite-5.xml | 7 +++ .../checksuitesinitialization/parent-suite.xml | 7 +++ src/test/resources/testng.xml | 6 ++ 38 files changed, 428 insertions(+), 88 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
