[testng] 23/355: Merge branch 'master' of github.com:cbeust/testng

[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 47e5b52b8a83bf77f7807c890f0ffc2fb4f8de64
Merge: 75ab0f7 f9f69bc
Author: Cedric Beust <cedric at beust.com>
Date:   Wed Aug 14 20:56:26 2013 -0700

    Merge branch 'master' of github.com:cbeust/testng

 .classpath                                         |  3 +-
 .gitignore                                         |  2 ++
 CHANGES.txt                                        |  1 +
 doc/documentation-main.html                        |  7 ++--
 pom-test.xml                                       |  2 +-
 pom.xml                                            |  2 +-
 src/main/java/org/testng/Assert.java               |  2 +-
 src/main/java/org/testng/TestNG.java               | 42 +++++++++++-----------
 .../org/testng/internal/XmlMethodSelector.java     | 20 ++++-------
 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 +-
 src/main/java/org/testng/xml/XMLParser.java        | 15 ++++++--
 .../java/test/CheckSuitesInitializationTest.java   | 42 ++++++++++++++++++++++
 .../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 ++++
 20 files changed, 151 insertions(+), 61 deletions(-)


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