[testng] 39/355: Merge pull request #418 from dluksza/master

[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 4d489ba145162d6a4b3207965d0d967d448a9a4e
Merge: 1066df9 de42960
Author: Cedric Beust <cedric at beust.com>
Date:   Sun Jan 12 23:08:09 2014 -0800

    Merge pull request #418 from dluksza/master
    
    Extend Guice support

 doc/documentation-main.html                        | 66 ++++++++++++++++++++++
 doc/download.html                                  |  3 +-
 src/main/java/org/testng/ISuite.java               | 14 ++++-
 src/main/java/org/testng/SuiteRunner.java          | 14 +++++
 src/main/java/org/testng/internal/ClassImpl.java   | 66 +++++++++++++---------
 .../java/org/testng/remote/SuiteDispatcher.java    |  1 +
 .../java/org/testng/xml/TestNGContentHandler.java  |  4 ++
 src/main/java/org/testng/xml/XmlSuite.java         | 15 +++++
 src/main/resources/testng-1.0.dtd                  |  1 +
 src/test/java/test/guice/GuiceParentModule.java    | 13 +++++
 .../java/test/guice/GuiceParentModuleTest.java     | 22 ++++++++
 src/test/java/test/guice/GuiceTestModule.java      | 18 ++++++
 src/test/java/test/guice/MyContext.java            |  6 ++
 src/test/java/test/guice/MyContextImpl.java        | 11 ++++
 src/test/java/test/guice/MyService.java            |  6 ++
 src/test/java/test/guice/MyServiceProvider.java    | 15 +++++
 src/test/java/test/guice/MySession.java            |  5 ++
 src/test/resources/parent-module-suite.xml         |  9 +++
 src/test/resources/testng.xml                      |  2 +
 19 files changed, 260 insertions(+), 31 deletions(-)

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