[testng] 133/160: Merge branch 'my-testng' of https://github.com/tremes/testng into tremes-my-testng
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Tue Aug 18 10:22:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.
commit 7225a0d7406547e3af94268abb630c430977d68f
Merge: 3d55470 f09e2f9
Author: Cedric Beust <cedric at beust.com>
Date: Sat Jun 27 07:39:36 2015 -0700
Merge branch 'my-testng' of https://github.com/tremes/testng into tremes-my-testng
Conflicts:
src/test/resources/testng.xml
src/main/java/org/testng/SuiteRunner.java | 18 ++++----
src/main/java/org/testng/TestNG.java | 14 +++---
src/main/java/org/testng/TestRunner.java | 50 ++++++++++++++--------
.../java/test/factory/FactoryInterleavingTest.java | 1 -
.../multipleinterceptors/FirstInterceptor.java | 23 ++++++++++
.../multipleinterceptors/FooTest.java | 22 ++++++++++
.../MultipleInterceptorsTest.java | 46 ++++++++++++++++++++
.../multipleinterceptors/SecondInterceptor.java | 22 ++++++++++
.../multipleinterceptors/ThirdInterceptor.java | 22 ++++++++++
.../multipleinterceptors/multiple-interceptors.xml | 15 +++++++
src/test/resources/testng.xml | 1 +
11 files changed, 197 insertions(+), 37 deletions(-)
diff --cc src/test/resources/testng.xml
index be56502,60e9301..d8c3eb6
--- a/src/test/resources/testng.xml
+++ b/src/test/resources/testng.xml
@@@ -631,7 -630,7 +631,8 @@@
<test name="MethodInterceptor">
<classes>
<class name="test.methodinterceptors.MethodInterceptorTest" />
+ <class name="test.methodinterceptors.Issue392Test" />
+ <class name="test.methodinterceptors.multipleinterceptors.MultipleInterceptorsTest" />
</classes>
</test>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git
More information about the pkg-java-commits
mailing list