[testng] 309/355: Merge remote-tracking branch 'upstream/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 b690c8f3e070ca1bacf729416dced970d4fce73b
Merge: d489054 7de8b23
Author: cguillaume <cguillaume at hotpads.com>
Date:   Sat May 9 15:32:56 2015 -0700

    Merge remote-tracking branch 'upstream/master'
    
    Conflicts:
    	CHANGES.txt

 .classpath                                         |  21 +--
 .gitignore                                         |   1 +
 CHANGES.txt                                        |   4 +
 doc/download.html                                  |  51 ++++-
 doc/index.html                                     |   4 +-
 pom-test.xml                                       |   8 +-
 pom.xml                                            | 208 +++++++++++++++------
 src/main/java/org/testng/Assert.java               |  16 +-
 src/main/java/org/testng/ITestMethodFinder.java    |  22 +--
 src/main/java/org/testng/ITestNGMethod.java        |   8 +
 src/main/java/org/testng/TestNG.java               |  37 +---
 .../java/org/testng/annotations/BeforeMethod.java  |   4 +-
 .../java/org/testng/annotations/BeforeSuite.java   |   2 +-
 .../java/org/testng/annotations/Configuration.java |   2 +-
 .../java/org/testng/internal/BaseTestMethod.java   |  13 +-
 src/main/java/org/testng/internal/ClassImpl.java   |   1 -
 .../java/org/testng/internal/ClonedMethod.java     |   5 +
 src/main/java/org/testng/internal/Invoker.java     |   8 +-
 .../org/testng/internal/MethodGroupsHelper.java    |   2 +-
 .../java/org/testng/internal/TestNGMethod.java     |  11 ++
 .../org/testng/internal/TestNGMethodFinder.java    |  13 +-
 .../internal/annotations/AnnotationHelper.java     |  38 ++--
 .../internal/annotations/IAnnotationFinder.java    |  10 +-
 .../annotations/JDK15AnnotationFinder.java         |  84 ++++++---
 src/main/java/org/testng/xml/XmlClass.java         |  13 +-
 src/test/java/org/testng/AssertTest.java           |  68 +++++++
 .../org/testng/internal/MethodInstanceTest.java    |   5 +
 src/test/java/test/EclipseTest.java                |   3 +-
 src/test/java/test/InvokedMethodNameListener.java  |  26 +++
 .../AnnotationTransformerSampleTest.java           |  19 --
 .../AnnotationTransformerTest.java                 |  50 +++--
 .../test/annotationtransformer/MyTransformer.java  |  34 ++--
 src/test/java/test/enable/A.java                   |  45 +++++
 src/test/java/test/enable/B.java                   |  46 +++++
 src/test/java/test/enable/C.java                   |  46 +++++
 src/test/java/test/enable/EnableTest.java          |  43 +++++
 .../InvokedMethodListener.java                     |  10 +-
 .../expectedexceptions/ExpectedExceptionsTest.java |   2 +-
 .../test/expectedexceptions/SampleExceptions2.java |   5 +
 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 +-
 src/test/java/test/invokedmethodlistener/A.java    |   9 +
 src/test/java/test/invokedmethodlistener/B.java    |  13 ++
 src/test/java/test/invokedmethodlistener/C.java    |  13 ++
 .../InvokedMethodListener.java                     |   5 +-
 .../InvokedMethodListenerTest.java                 |  43 ++++-
 .../java/test/invokedmethodlistener/Sample.java    |   4 +
 .../java/test/methodinterceptors/Issue392.java     |  17 ++
 .../java/test/methodinterceptors/Issue392Test.java |  43 +++++
 src/test/resources/testng.xml                      |   6 +
 60 files changed, 949 insertions(+), 397 deletions(-)

diff --cc CHANGES.txt
index 06903fe,5ff203d..4fe0d17
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -27,7 -27,10 +27,11 @@@ Fixed: GITHUB-353: Typo in documentatio
  Fixed: GITHUB-656: Upgrade to JCommander 1.48 (Ryan Schmitt)
  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)
+ Fixed: GITHUB-417: Expected Exceptions Message fails to match multi-line messages (Michael Diamond)
 +New: GITHUB-663: Add Guice Stage configuration for a suite (Clément Guillaume)
  
  6.8.21:
  2015/02/02

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