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 749ef1bdbc6e6384565634b95fbd01b75a90f27f Merge: cd74d4e 4dd8f47 Author: Cedric Beust <[email protected]> Date: Tue Jan 13 15:10:35 2015 -0800 Merge branch 'testng-566' of https://github.com/VladRassokhin/testng into VladRassokhin-testng-566 Conflicts: src/main/java/org/testng/internal/Parameters.java src/main/java/org/testng/TestRunner.java | 2 - src/main/java/org/testng/collections/Lists.java | 5 +- src/main/java/org/testng/internal/ClassHelper.java | 22 +- src/main/java/org/testng/internal/IInvoker.java | 6 +- src/main/java/org/testng/internal/Invoker.java | 507 +++++++++------------ .../org/testng/internal/MethodGroupsHelper.java | 55 ++- .../testng/internal/MethodInvocationHelper.java | 28 +- src/main/java/org/testng/internal/Parameters.java | 54 +-- .../TestMethodWithDataProviderMethodWorker.java | 45 +- .../java/org/testng/internal/TestMethodWorker.java | 15 +- .../test/InvocationAndSuccessPercentageTest.java | 4 +- .../test/dataprovider/DataProviderWithError.java | 25 + .../test/dataprovider/FailingDataProviderTest.java | 15 +- 13 files changed, 374 insertions(+), 409 deletions(-) diff --cc src/main/java/org/testng/internal/Parameters.java index 3708011,a7f09f1..8d95e63 --- a/src/main/java/org/testng/internal/Parameters.java +++ b/src/main/java/org/testng/internal/Parameters.java @@@ -1,5 -1,5 +1,15 @@@ package org.testng.internal; ++import java.lang.reflect.Constructor; ++import java.lang.reflect.Method; ++import java.lang.reflect.Modifier; ++import java.util.Collections; ++import java.util.HashSet; ++import java.util.Iterator; ++import java.util.List; ++import java.util.Map; ++import java.util.Set; ++ import org.testng.ITestContext; import org.testng.ITestNGMethod; import org.testng.ITestResult; @@@ -19,16 -18,16 +29,6 @@@ import org.testng.util.Strings import org.testng.xml.XmlSuite; import org.testng.xml.XmlTest; --import java.lang.reflect.Constructor; --import java.lang.reflect.Method; --import java.lang.reflect.Modifier; --import java.util.Collections; --import java.util.HashSet; --import java.util.Iterator; --import java.util.List; --import java.util.Map; --import java.util.Set; -- /** * Methods that bind parameters declared in testng.xml to actual values * used to invoke methods. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
