[testng] 267/355: Merge branch 'issue-425' of https://github.com/juherr/testng into juherr-issue-425

[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 50a914038312d1159199f6d0a4dd1c0b56ded4ff
Merge: cebfdec d1612d3
Author: Cedric Beust <cedric at beust.com>
Date:   Wed May 6 19:08:36 2015 -0700

    Merge branch 'issue-425' of https://github.com/juherr/testng into juherr-issue-425
    
    Conflicts:
    	CHANGES.txt

 CHANGES.txt                                        |   1 +
 src/main/java/org/testng/ITestNGMethod.java        |   8 ++
 .../java/org/testng/internal/BaseTestMethod.java   |  13 ++-
 .../java/org/testng/internal/ClonedMethod.java     |   5 +
 src/main/java/org/testng/internal/Invoker.java     |   6 +-
 .../java/org/testng/internal/TestNGMethod.java     |  11 +++
 .../org/testng/internal/MethodInstanceTest.java    |   5 +
 src/test/java/test/InvokedMethodNameListener.java  |  26 ++++++
 src/test/java/test/invocationcount/Base.java       |  33 -------
 .../test/invocationcount/DataProviderBase.java     |   2 +-
 .../DataProviderFalseFalseTest.java                |   8 +-
 .../invocationcount/DataProviderFalseTrueTest.java |   8 +-
 .../invocationcount/DataProviderTrueFalseTest.java |   8 +-
 .../invocationcount/DataProviderTrueTrueTest.java  |   8 +-
 .../test/invocationcount/FirstAndLastTimeTest.java | 104 ++++++++++++++-------
 .../java/test/invocationcount/InvocationBase.java  |   2 +-
 .../InvocationCountFalseFalseTest.java             |   8 +-
 .../InvocationCountFalseTrueTest.java              |   8 +-
 .../InvocationCountTrueFalseTest.java              |   8 +-
 .../InvocationCountTrueTrueTest.java               |   8 +-
 20 files changed, 157 insertions(+), 123 deletions(-)

diff --cc CHANGES.txt
index c1f71a4,f54a176..a170e8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -28,7 -28,7 +28,8 @@@ Fixed: GITHUB-656: Upgrade to JCommande
  Fixed: GITHUB-582: TestNG tests don't pass reliably on JDK8 (Ryan Schmitt)
  New: GITHUB-645: TestNG project on Google Code redirect to GitHub
  Fixed: GITHUB-310: Upgrade Guice (kronar & Julien Herr)
 +Fixed: GITHUB-87: @BeforeSuite/@BeforeTest methods happens to be disabled by mistake (romlom & Julien Herr)
+ Fixed: GITHUB-425: Wrong invocation order with lastTimeOnly (Rafael Winterhalter & Julien Herr)
  
  6.8.21:
  2015/02/02

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