[testng] 345/355: Merge remote-tracking branch 'origin/master' into issue-420

[Eugene Zhukov]

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 f706670840e9775b429543510566e1db65f5473b
Merge: 9f00677 334318e
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Thu May 21 18:06:32 2015 +0200

    Merge remote-tracking branch 'origin/master' into issue-420

 .gitignore                                         |   1 +
 doc/download.html                                  |  51 +-
 doc/index.html                                     |   4 +-
 pom.xml                                            | 199 ++++--
 src/main/java/org/testng/ISuite.java               |   2 +
 src/main/java/org/testng/SuiteRunner.java          |   5 +
 .../java/org/testng/annotations/BeforeMethod.java  |   4 +-
 .../java/org/testng/annotations/BeforeSuite.java   |   2 +-
 .../java/org/testng/annotations/Configuration.java |   2 +-
 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   |   6 +-
 src/main/java/org/testng/internal/ClassImpl.java   |  12 +-
 .../java/org/testng/remote/SuiteDispatcher.java    |   1 +
 .../java/org/testng/xml/TestNGContentHandler.java  |   4 +
 src/main/java/org/testng/xml/XmlSuite.java         |  13 +
 src/main/resources/testng-1.0.dtd                  |   1 +
 src/test/java/test/assertion/AssertionTest.java    |  29 +
 src/test/java/test/assertion/MyRawAssertion.java   |  72 ++
 21 files changed, 430 insertions(+), 780 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git