[testng] 215/355: Merge pull request #611 from jdillet/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 d3228b45d0dba27899480c99b23ed7822bbdd2f1
Merge: c17840b 06b5ed0
Author: Cedric Beust <cedric at beust.com>
Date:   Thu Apr 23 19:17:20 2015 -0700

    Merge pull request #611 from jdillet/master
    
    Fix for #545 - TestNG running JUnit tests but not reporting all results for parameterized tests

 .../java/org/testng/internal/BaseTestMethod.java   |  8 +--
 .../org/testng/internal/ConfigurationMethod.java   |  2 +-
 .../java/org/testng/internal/FactoryMethod.java    |  2 +-
 .../java/org/testng/internal/TestNGMethod.java     |  2 +-
 .../java/org/testng/junit/JUnit4TestMethod.java    |  7 ++-
 .../java/org/testng/junit/JUnitTestMethod.java     |  6 ++-
 src/test/java/test/JUnit4Test.java                 | 16 ++++++
 .../java/test/junit4/JUnit4ParameterizedTest.java  | 57 ++++++++++++++++++++++
 8 files changed, 91 insertions(+), 9 deletions(-)

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