[testng] 119/160: Merge remote-tracking branch 'origin/master' into improve-SoftAssert

Eugene Zhukov eugene-guest at moszumanska.debian.org
Tue Aug 18 10:22:28 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 7ff97659859088549dddd8fb679364cf390fbd1d
Merge: af1371d 2fd2fca
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Thu Jun 25 00:43:02 2015 +0200

    Merge remote-tracking branch 'origin/master' into improve-SoftAssert
    
    Conflicts:
    	src/main/java/org/testng/asserts/SoftAssert.java

 .classpath                                         |  36 +-
 .gitignore                                         |  28 +-
 .project                                           |   7 +
 .travis.yml                                        |  10 +
 CHANGES.txt                                        |  64 +-
 README                                             |   2 +
 README.dev                                         |  16 +-
 README.md                                          |   8 +
 {3rdparty => ant/3rdparty}/DTDDoc.jar              | Bin
 {3rdparty => ant/3rdparty}/cobertura.jar           | Bin
 {3rdparty => ant/3rdparty}/doclava-1.0.3.jar       | Bin
 README.template => ant/README.template             |   2 +
 build-ant.xml => ant/build-ant.xml                 | 148 ++--
 build-tests.xml => ant/build-tests.xml             |   2 +-
 build.properties => ant/build.properties           |   2 +-
 build.xml => ant/build.xml                         | 933 +++++++++++----------
 ivy-2.1.0.jar => ant/ivy-2.1.0.jar                 | Bin
 ivy.xml => ant/ivy.xml                             |   4 +-
 {old => ant/old}/build-dogfood.xml                 |   0
 {old => ant/old}/build-sample.xml                  |   0
 appveyor.yml                                       |  25 +
 build-with-gradle                                  |   1 +
 build.gradle                                       | 138 +++
 doc/documentation-main.html                        |  19 +-
 doc/download.html                                  |  82 +-
 doc/index.html                                     |   6 +-
 examples/.cvsignore                                |   4 -
 examples/build.xml                                 | 146 ----
 examples/src/example1/Test1.java                   |  85 --
 examples/src/priority/Priority.java                |  13 -
 examples/src/priority/PriorityInterceptor.java     |  46 -
 examples/src/priority/PriorityTest.java            |  31 -
 examples/testng.xml                                |  32 -
 gigaspaces/.classpath                              |  12 -
 gigaspaces/.project                                |  17 -
 gigaspaces/3rdparty/JSpaces.jar                    | Bin 5446503 -> 0 bytes
 .../3rdparty/common/backport-util-concurrent.jar   | Bin 327810 -> 0 bytes
 gigaspaces/3rdparty/jini/jsk-lib.jar               | Bin 291877 -> 0 bytes
 gigaspaces/3rdparty/jini/jsk-platform.jar          | Bin 995179 -> 0 bytes
 gigaspaces/build.xml                               | 101 ---
 .../src/org/testng/gigaspaces/ResultEntry.java     |  44 -
 .../org/testng/gigaspaces/SpaceMasterAdapter.java  | 153 ----
 .../org/testng/gigaspaces/SpaceWorkerAdapter.java  | 113 ---
 .../src/org/testng/gigaspaces/SuiteEntry.java      |  59 --
 .../test/src/test/gigaspaces/DistributedTest.java  | 171 ----
 gigaspaces/test/src/test/gigaspaces/Test1.java     |  15 -
 gigaspaces/test/src/test/gigaspaces/Test2.java     |  14 -
 gradle/buildWithTravis.sh                          |   1 +
 gradle/publishing.gradle                           | 177 ++++
 gradle/uploadSnapshot.sh                           |  12 +
 gradle/wrapper/gradle-wrapper.jar                  | Bin 0 -> 52141 bytes
 gradle/wrapper/gradle-wrapper.properties           |   6 +
 gradlew                                            | 164 ++++
 gradlew.bat                                        |  90 ++
 maven/build-with-maven                             |  25 +
 maven/bundle-pom.xml                               |  59 ++
 maven/plugin-resources/junitRpt-failed.jsl         | 307 -------
 maven/plugin-resources/junitRpt.jsl                | 375 ---------
 maven/plugin.jelly                                 |  88 --
 maven/plugin.properties                            |   5 -
 pom-test.xml => maven/pom-test.xml                 |  30 +-
 maven/project.properties                           |   3 -
 maven/project.xml                                  |  97 ---
 pom.xml                                            | 282 +++++--
 spring/.classpath                                  |  15 -
 spring/.cvsignore                                  |   3 -
 spring/.project                                    |  17 -
 spring/3rdparty/commons-logging-1.0.4.jar          | Bin 38015 -> 0 bytes
 spring/3rdparty/spring-mock.jar                    | Bin 99358 -> 0 bytes
 spring/3rdparty/spring.jar                         | Bin 2593850 -> 0 bytes
 spring/LICENSE.txt                                 | 201 -----
 spring/README.TXT                                  |  23 -
 spring/build.xml                                   |  94 ---
 ...tractDependencyInjectionSpringContextTests.java | 259 ------
 .../spring/test/AbstractSpringContextTests.java    | 140 ----
 ...tTransactionalDataSourceSpringContextTests.java | 175 ----
 .../AbstractTransactionalSpringContextTests.java   | 328 --------
 .../src/common/org/testng/spring/test/package.html |  14 -
 .../test/AbstractSingleSpringContextTests.java     | 192 -----
 .../AbstractAnnotationAwareTransactionalTests.java |  67 --
 .../test/AbstractSingleSpringContextTests.java     | 194 -----
 .../java/org/testng/internal/VersionTemplateJava}  |   2 +-
 src/main/java/org/testng/Assert.java               |  86 +-
 src/main/java/org/testng/AssertJUnit.java          |   8 +-
 src/main/java/org/testng/CommandLineArgs.java      |   2 +-
 src/main/java/org/testng/DependencyMap.java        |   3 +-
 .../java/org/testng/IExpectedExceptionsHolder.java |  20 +
 src/main/java/org/testng/ISuite.java               |   2 +
 src/main/java/org/testng/ITestContext.java         |   3 +-
 src/main/java/org/testng/ITestMethodFinder.java    |  22 +-
 src/main/java/org/testng/ITestNGMethod.java        |   8 +
 src/main/java/org/testng/Reporter.java             |  52 +-
 src/main/java/org/testng/SuiteRunner.java          |  15 +-
 src/main/java/org/testng/TestClass.java            |   3 +
 src/main/java/org/testng/TestNG.java               | 105 +--
 src/main/java/org/testng/TestNGAntTask.java        |   2 +-
 src/main/java/org/testng/TestRunner.java           |  77 +-
 .../java/org/testng/TimeBombSkipException.java     |   8 +-
 .../java/org/testng/annotations/BeforeMethod.java  |   4 +-
 .../java/org/testng/annotations/BeforeSuite.java   |   2 +-
 .../java/org/testng/annotations/Configuration.java |   2 +-
 src/main/java/org/testng/asserts/Assertion.java    | 782 ++---------------
 src/main/java/org/testng/asserts/IAssert.java      |   6 +-
 .../java/org/testng/asserts/IAssertLifecycle.java  |  12 +-
 .../java/org/testng/asserts/LoggingAssert.java     |   2 +-
 src/main/java/org/testng/asserts/SoftAssert.java   |   7 +-
 .../org/testng/collections/CollectionUtils.java    |   4 +-
 .../java/org/testng/collections/ListMultiMap.java  |  77 +-
 src/main/java/org/testng/collections/Lists.java    |  17 +-
 src/main/java/org/testng/collections/Maps.java     |  12 +-
 src/main/java/org/testng/collections/MultiMap.java | 111 +++
 src/main/java/org/testng/collections/Objects.java  |   6 +-
 .../java/org/testng/collections/SetMultiMap.java   |  73 +-
 src/main/java/org/testng/collections/Sets.java     |  13 +-
 .../java/org/testng/internal/BaseClassFinder.java  |   2 +-
 .../java/org/testng/internal/BaseTestMethod.java   |  54 +-
 src/main/java/org/testng/internal/Bsh.java         |   2 +-
 src/main/java/org/testng/internal/ClassHelper.java |  62 +-
 src/main/java/org/testng/internal/ClassImpl.java   |  59 +-
 .../java/org/testng/internal/ClassInfoMap.java     |   2 +-
 .../java/org/testng/internal/ClonedMethod.java     |   5 +
 .../org/testng/internal/ConfigurationMethod.java   |  32 +-
 src/main/java/org/testng/internal/Constants.java   |  12 +-
 .../org/testng/internal/DataProviderHolder.java    |   4 +-
 .../java/org/testng/internal/DynamicGraph.java     |   6 +-
 .../testng/internal/ExpectedExceptionsHolder.java  | 109 ++-
 .../java/org/testng/internal/FactoryMethod.java    |  14 +-
 src/main/java/org/testng/internal/Graph.java       |  16 +-
 src/main/java/org/testng/internal/IInvoker.java    |   6 +-
 .../org/testng/internal/ITestResultNotifier.java   |   8 +-
 .../org/testng/internal/InvokeMethodRunnable.java  |  23 +-
 .../java/org/testng/internal/InvokedMethod.java    |  26 +-
 src/main/java/org/testng/internal/Invoker.java     | 702 ++++++----------
 .../org/testng/internal/MethodGroupsHelper.java    |  80 +-
 .../java/org/testng/internal/MethodHelper.java     |  61 +-
 .../org/testng/internal/MethodInheritance.java     |  14 +-
 .../testng/internal/MethodInvocationHelper.java    |  54 +-
 .../java/org/testng/internal/PackageUtils.java     |  24 +-
 src/main/java/org/testng/internal/Parameters.java  | 104 +--
 src/main/java/org/testng/internal/PoolService.java |   6 +-
 .../java/org/testng/internal/PropertiesFile.java   |   2 +-
 .../java/org/testng/internal/PropertyUtils.java    |   4 +-
 .../internal/RegexpExpectedExceptionsHolder.java   |  65 ++
 src/main/java/org/testng/internal/ResultMap.java   |   4 +-
 src/main/java/org/testng/internal/Tarjan.java      |   6 +-
 .../TestMethodWithDataProviderMethodWorker.java    |  45 +-
 .../java/org/testng/internal/TestMethodWorker.java |  19 +-
 .../org/testng/internal/TestNGClassFinder.java     |  26 +-
 .../java/org/testng/internal/TestNGMethod.java     |  13 +-
 .../org/testng/internal/TestNGMethodFinder.java    |  13 +-
 src/main/java/org/testng/internal/Utils.java       |  50 +-
 .../org/testng/internal/XmlMethodSelector.java     |   4 +-
 src/main/java/org/testng/internal/Yaml.java        |   9 +-
 src/main/java/org/testng/internal/YamlParser.java  |   9 +-
 .../internal/annotations/AnnotationHelper.java     |  38 +-
 .../org/testng/internal/annotations/Converter.java |   6 +-
 .../internal/annotations/IAnnotationFinder.java    |  10 +-
 .../internal/annotations/IBaseBeforeAfter.java     |   2 +-
 .../annotations/JDK15AnnotationFinder.java         |  80 +-
 .../internal/annotations/JDK15TagFactory.java      |  25 +-
 .../java/org/testng/internal/annotations/Sets.java |  17 -
 .../internal/annotations/TestAnnotation.java       |   5 +-
 .../java/org/testng/internal/collections/Pair.java |   2 +-
 .../internal/junit/ArrayComparisonFailure.java     |   4 +-
 .../testng/internal/thread/IPooledExecutor.java    |   3 -
 .../java/org/testng/junit/JUnit4TestMethod.java    |   7 +-
 .../java/org/testng/junit/JUnit4TestRunner.java    |   6 +-
 .../java/org/testng/junit/JUnitMethodFinder.java   |  24 +-
 .../java/org/testng/junit/JUnitTestMethod.java     |   6 +-
 .../java/org/testng/junit/JUnitTestRunner.java     |   4 +-
 src/main/java/org/testng/log4testng/Logger.java    |   6 +-
 src/main/java/org/testng/mustache/Model.java       |   8 +-
 src/main/java/org/testng/remote/RemoteTestNG.java  |   4 +-
 .../java/org/testng/remote/SuiteDispatcher.java    |  19 +-
 src/main/java/org/testng/remote/SuiteSlave.java    |  12 +-
 .../remote/adapter/DefaultMastertAdapter.java      |  22 +-
 .../remote/adapter/DefaultWorkerAdapter.java       |  12 +-
 .../org/testng/remote/adapter/IMasterAdapter.java  |   8 +-
 .../org/testng/remote/adapter/IWorkerAdapter.java  |   8 +-
 .../remote/adapter/RemoteResultListener.java       |   6 +-
 .../remote/strprotocol/BaseMessageSender.java      |   7 +-
 .../testng/remote/strprotocol/GenericMessage.java  |   5 +-
 .../remote/strprotocol/IRemoteSuiteListener.java   |   2 +-
 .../org/testng/remote/strprotocol/MessageHub.java  |   7 +-
 .../remote/strprotocol/StringMessageSender.java    |   6 +-
 .../testng/remote/strprotocol/SuiteMessage.java    |  11 +-
 .../org/testng/remote/strprotocol/TestMessage.java |   3 -
 .../remote/strprotocol/TestResultMessage.java      |  60 +-
 .../java/org/testng/reporters/FailedReporter.java  |   8 +-
 .../org/testng/reporters/FileStringBuffer.java     |   6 +
 src/main/java/org/testng/reporters/Files.java      |  18 +-
 .../org/testng/reporters/JUnitReportReporter.java  |   8 +-
 .../org/testng/reporters/JUnitXMLReporter.java     |   2 +-
 src/main/java/org/testng/reporters/JqReporter.java |   2 +-
 .../org/testng/reporters/SuiteHTMLReporter.java    |   3 +-
 .../java/org/testng/reporters/XMLConstants.java    |   3 -
 .../java/org/testng/reporters/XMLReporter.java     |   6 +-
 .../java/org/testng/reporters/XMLStringBuffer.java |  17 +-
 .../org/testng/reporters/XMLSuiteResultWriter.java |   2 +-
 .../testng/reporters/jq/IgnoredMethodsPanel.java   |   2 +-
 src/main/java/org/testng/reporters/jq/Main.java    |  17 +-
 .../org/testng/reporters/jq/ResultsByClass.java    |   1 +
 .../java/org/testng/util/RetryAnalyzerCount.java   |  15 +-
 src/main/java/org/testng/xml/ISuiteParser.java     |   6 +
 src/main/java/org/testng/xml/LaunchSuite.java      |   6 +-
 src/main/java/org/testng/xml/Parameters.java       |   5 +-
 src/main/java/org/testng/xml/Parser.java           |  28 +-
 src/main/java/org/testng/xml/ResultXMLParser.java  |   7 +-
 src/main/java/org/testng/xml/SuiteXmlParser.java   |  15 +-
 .../java/org/testng/xml/TestNGContentHandler.java  |  20 +-
 src/main/java/org/testng/xml/XMLParser.java        |  19 +-
 src/main/java/org/testng/xml/XmlClass.java         |  13 +-
 src/main/java/org/testng/xml/XmlSuite.java         |  36 +-
 src/main/java/org/testng/xml/XmlTest.java          |  31 +-
 src/main/java/org/testng/xml/dom/DomUtil.java      |   6 +-
 src/main/java/org/testng/xml/dom/DomXmlParser.java |   8 +-
 src/main/java/org/testng/xml/dom/XDom.java         |  21 +-
 src/main/java/testng-1.0.dtd.html                  |   2 +-
 .../META-INF/services/org.testng.xml.ISuiteParser  |   1 +
 .../org/testng/internal/VersionTemplateJava}       |   2 +-
 src/main/resources/testng-1.0.dtd                  |   6 +-
 src/test/java/org/testng/AssertTest.java           |  70 +-
 .../org/testng/internal/MethodInstanceTest.java    |   7 +-
 src/test/java/test/BaseDistributedTest.java        |  10 +-
 src/test/java/test/BaseTest.java                   |  81 +-
 src/test/java/test/DynamicGraphTest.java           |   4 +-
 src/test/java/test/EclipseTest.java                |   3 +-
 src/test/java/test/GraphTest.java                  |  10 +-
 .../test/InvocationAndSuccessPercentageTest.java   |   4 +-
 src/test/java/test/InvokedMethodNameListener.java  |  26 +
 src/test/java/test/JUnit4Test.java                 |  16 +
 src/test/java/test/MapTest.java                    |   4 +-
 src/test/java/test/Test1.java                      |   6 +-
 src/test/java/test/TestHelper.java                 |   2 +-
 .../AnnotationTransformerInvocationCountTest.java  |  32 +
 .../AnnotationTransformerSampleTest.java           |  19 -
 .../AnnotationTransformerTest.java                 |  92 +-
 .../annotationtransformer/MyParamTransformer.java  |  30 +
 .../test/annotationtransformer/MyTransformer.java  |  34 +-
 src/test/java/test/ant/TestCommandLineArgs.java    |   2 +-
 src/test/java/test/assertion/AssertionTest.java    |  29 +
 src/test/java/test/assertion/MyRawAssertion.java   |  72 ++
 src/test/java/test/asserttests/AssertTest.java     |  90 +-
 .../java/test/configuration/BaseSuiteTest.java     |   2 +-
 .../test/configuration/BeforeTestOrderingTest.java |   2 +-
 .../ConfigurationGroupDataProviderSampleTest.java  |   2 +-
 ...onfigurationGroupInvocationCountSampleTest.java |   2 +-
 .../ConfigurationGroups1SampleTest.java            |   2 +-
 .../ConfigurationGroups2SampleTest.java            |   2 +-
 .../ConfigurationGroups3SampleTest.java            |   2 +-
 .../ConfigurationGroups7SampleTest.java            |   2 +-
 .../ConfigurationGroups8SampleTest.java            |   2 +-
 ...tMethodParametrizedConfigurationMethodTest.java |   4 +-
 .../dataprovider/ConstructorInjectionProvider.java |  23 +
 .../test/dataprovider/DataProviderWithError.java   |  25 +
 .../ExplicitDataProviderNameSample.java            |  16 +
 .../dataprovider/ExplicitDataProviderNameTest.java |  22 +
 .../test/dataprovider/FailingDataProviderTest.java |  15 +-
 .../test/dataprovider/FieldInjectionProvider.java  |  19 +
 .../InstanceDataProviderSampleTest.java            |   2 +-
 src/test/java/test/dataprovider/IterableTest.java  |   4 +-
 .../java/test/dataprovider/NonStaticProvider.java  |  13 +
 .../dataprovider/ParallelDataProviderTest.java     |   8 +-
 src/test/java/test/dataprovider/Sample1Test.java   |   4 +-
 .../dataprovider/StaticDataProviderSampleTest.java |  28 +
 .../java/test/dataprovider/TestInstanceTest.java   |   4 +-
 src/test/java/test/dependent/DepBugSampleTest.java |   2 +-
 src/test/java/test/dependent/SD2.java              |   2 +-
 .../java/test/distributed/DistributedTest.java     |   4 +-
 src/test/java/test/enable/A.java                   |  73 ++
 src/test/java/test/enable/B.java                   |  74 ++
 src/test/java/test/enable/C.java                   |  74 ++
 src/test/java/test/enable/EnableTest.java          |  44 +
 .../InvokedMethodListener.java                     |  10 +-
 .../java/test/enable/Issue420BaseTestCase.java     |  19 +
 src/test/java/test/enable/Issue420FirstSample.java |  10 +
 .../java/test/enable/Issue420SecondSample.java     |  10 +
 .../expectedexceptions/ExpectedExceptionsTest.java |   2 +-
 .../test/expectedexceptions/SampleExceptions2.java |   5 +
 src/test/java/test/factory/FactoryTest2.java       |   4 +-
 .../java/test/factory/FactoryWithDataProvider.java |   2 +-
 .../test/factory/FactoryWithInstanceInfoTest2.java |   4 +-
 src/test/java/test/factory/Sample2.java            |   6 +-
 src/test/java/test/factory/VerifyFactoryTest.java  |   4 +-
 .../factory/VerifyFactoryWithInstanceInfoTest.java |   4 +-
 src/test/java/test/failures/FailuresTest.java      |   2 +-
 src/test/java/test/groupinvocation/DummyTest.java  |   2 +-
 src/test/java/test/guice/GuiceParentModule.java    |  10 +
 .../java/test/guice/GuiceParentModuleTest.java     |   6 +
 src/test/java/test/hook/HookSuccess599Test.java    |  43 +
 src/test/java/test/hook/HookableTest.java          |  14 +
 src/test/java/test/inheritance/ZBase_0.java        |   4 +-
 .../InterleavedInvocationTest.java                 |   4 +-
 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                 |  86 +-
 .../InvokedMethodNameListener.java                 |  45 +
 .../java/test/invokedmethodlistener/Sample.java    |   4 +
 .../java/test/junit4/JUnit4ParameterizedTest.java  |  57 ++
 .../SuiteAndConfigurationListenerTest.java         |  58 ++
 .../FastTestsFirstInterceptor.java                 |   4 +-
 .../java/test/methodinterceptors/Issue392.java     |  17 +
 .../java/test/methodinterceptors/Issue392Test.java |  43 +
 .../methodinterceptors/NullMethodInterceptor.java  |   2 +-
 .../RemoveAMethodInterceptor.java                  |   4 +-
 .../java/test/methodselectors/CommandLineTest.java |   2 +-
 src/test/java/test/mustache/MustacheTest.java      |   8 +-
 src/test/java/test/pholser/Captor.java             |   2 +-
 .../java/test/preserveorder/PreserveOrderTest.java |  53 --
 src/test/java/test/reports/ReporterTest.java       |  20 +
 .../java/test/retryAnalyzer/EventualSuccess.java   |  17 +
 src/test/java/test/retryAnalyzer/ExitCodeTest.java |  31 +
 .../java/test/retryAnalyzer/ImmediateSuccess.java  |   9 +
 .../java/test/retryAnalyzer/PersistentFailure.java |  11 +
 .../java/test/sample/BaseSampleInheritance.java    |   2 +-
 .../java/test/serviceloader/ServiceLoaderTest.java |  26 +-
 src/test/java/test/testng106/TestNG106.java        |   6 +-
 src/test/java/test/testng285/BugBase.java          |   2 +-
 src/test/java/test/testng317/VerifyTest.java       |   4 +-
 src/test/java/test/testng387/FailedDPTest.java     |  14 +-
 src/test/java/test/testng387/TestNG387.java        |  29 +-
 src/test/java/test/thread/B.java                   |   2 +-
 src/test/java/test/thread/BaseThreadTest.java      |   2 +-
 src/test/java/test/thread/Helper.java              |   4 +-
 src/test/java/test/thread/ParallelTestTest.java    |   2 +-
 src/test/java/test/thread/SequentialTest.java      |   8 +-
 .../test/timeout/InvocationTimeOutSampleTest.java  |  10 +-
 .../java/test/timeout/TestTimeOutSampleTest.java   |   5 +-
 src/test/java/test/timeout/TimeOutFromXmlTest.java |  80 +-
 src/test/java/test/timeout/TimeOutSample2Test.java |  10 +-
 src/test/java/test/timeout/TimeOutSampleTest.java  |  12 +-
 src/test/java/test/timeout/TimeOutTest.java        |  75 +-
 src/test/java/test/timeout/issue575.xml            |   9 +
 src/test/java/test/tmp/AssertEqualsTest.java       |  16 +-
 src/test/java/test/tmp/DataDrivenTest.java         |   2 +-
 .../java/test/tmp/Test_TestListenerAppender.java   |   2 +-
 .../java/test/tmp/verify/VerifyInterceptor.java    |   4 +-
 src/test/java/test/triangle/CheckCount.java        |   4 +-
 src/test/resources/testng-single.xml               |   9 +-
 src/test/resources/testng.xml                      |  13 +-
 update-beust.com                                   |   2 +-
 355 files changed, 5282 insertions(+), 7199 deletions(-)

diff --cc src/main/java/org/testng/asserts/SoftAssert.java
index 8c33421,73dff19..95dad5f
--- a/src/main/java/org/testng/asserts/SoftAssert.java
+++ b/src/main/java/org/testng/asserts/SoftAssert.java
@@@ -11,28 -11,23 +11,27 @@@ import org.testng.collections.Maps
   */
  public class SoftAssert extends Assertion {
    // LinkedHashMap to preserve the order
-   private Map<AssertionError, IAssert> m_errors = Maps.newLinkedHashMap();
+   private Map<AssertionError, IAssert<?>> m_errors = Maps.newLinkedHashMap();
  
    @Override
-   protected void doAssert(IAssert a) {
 -  public void executeAssert(IAssert<?> a) {
++  protected void doAssert(IAssert<?> a) {
 +    onBeforeAssert(a);
      try {
        a.doAssert();
 -    } catch(AssertionError ex) {
 +      onAssertSuccess(a);
 +    } catch (AssertionError ex) {
        onAssertFailure(a, ex);
        m_errors.put(ex, a);
 +    } finally {
 +      onAfterAssert(a);
      }
    }
  
- 
    public void assertAll() {
      if (! m_errors.isEmpty()) {
 -      StringBuilder sb = new StringBuilder("The following asserts failed:\n");
 +      StringBuilder sb = new StringBuilder("The following asserts failed:");
        boolean first = true;
-       for (Map.Entry<AssertionError, IAssert> ae : m_errors.entrySet()) {
+       for (Map.Entry<AssertionError, IAssert<?>> ae : m_errors.entrySet()) {
          if (first) {
            first = false;
          } else {

-- 
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