[testng] 47/160: Merge pull request #700 from rschmitt/refactor

Eugene Zhukov eugene-guest at moszumanska.debian.org
Tue Aug 18 10:22:20 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 63a90571ba4f7e6dcd177d7333091eae7cdfc215
Merge: bb20cee d461424
Author: Cedric Beust <cedric at beust.com>
Date:   Sun May 31 13:29:53 2015 -0700

    Merge pull request #700 from rschmitt/refactor
    
    JDK7 migration

 src/main/java/org/testng/Assert.java               | 18 ++++----
 src/main/java/org/testng/AssertJUnit.java          |  8 ++--
 src/main/java/org/testng/CommandLineArgs.java      |  2 +-
 src/main/java/org/testng/Reporter.java             |  6 +--
 src/main/java/org/testng/SuiteRunner.java          |  4 +-
 src/main/java/org/testng/TestNG.java               | 42 ++++---------------
 src/main/java/org/testng/TestNGAntTask.java        |  2 +-
 src/main/java/org/testng/TestRunner.java           | 10 ++---
 src/main/java/org/testng/internal/Bsh.java         |  2 +-
 src/main/java/org/testng/internal/ClassHelper.java |  4 +-
 .../org/testng/internal/ConfigurationMethod.java   | 30 +++++++-------
 src/main/java/org/testng/internal/Constants.java   |  2 +-
 src/main/java/org/testng/internal/Graph.java       | 16 ++++----
 .../org/testng/internal/InvokeMethodRunnable.java  |  5 +--
 src/main/java/org/testng/internal/Invoker.java     | 23 ++---------
 .../org/testng/internal/MethodGroupsHelper.java    |  4 +-
 .../java/org/testng/internal/MethodHelper.java     |  8 ++--
 .../testng/internal/MethodInvocationHelper.java    |  8 +---
 src/main/java/org/testng/internal/PoolService.java |  6 +--
 .../java/org/testng/internal/PropertyUtils.java    |  4 +-
 src/main/java/org/testng/internal/ResultMap.java   |  4 +-
 src/main/java/org/testng/internal/Tarjan.java      |  6 +--
 .../java/org/testng/internal/TestMethodWorker.java |  4 +-
 src/main/java/org/testng/internal/Utils.java       | 11 +----
 .../org/testng/internal/XmlMethodSelector.java     |  4 +-
 .../org/testng/internal/annotations/Converter.java |  6 +--
 .../internal/annotations/JDK15TagFactory.java      |  2 +-
 .../internal/annotations/TestAnnotation.java       |  5 +--
 .../java/org/testng/internal/collections/Pair.java |  2 +-
 .../internal/junit/ArrayComparisonFailure.java     |  2 +-
 .../java/org/testng/junit/JUnit4TestRunner.java    |  4 +-
 .../java/org/testng/junit/JUnitMethodFinder.java   | 24 ++---------
 .../java/org/testng/junit/JUnitTestRunner.java     |  2 +-
 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 +-
 .../remote/adapter/DefaultMastertAdapter.java      |  8 +---
 .../testng/remote/strprotocol/GenericMessage.java  |  2 +-
 .../remote/strprotocol/StringMessageSender.java    |  6 +--
 .../remote/strprotocol/TestResultMessage.java      | 48 +++++++++++-----------
 .../java/org/testng/reporters/FailedReporter.java  |  6 +--
 .../org/testng/reporters/SuiteHTMLReporter.java    |  3 +-
 .../java/org/testng/reporters/XMLReporter.java     |  6 +--
 .../java/org/testng/reporters/XMLStringBuffer.java |  2 +-
 .../org/testng/reporters/XMLSuiteResultWriter.java |  2 +-
 src/main/java/org/testng/xml/ResultXMLParser.java  |  7 +---
 src/main/java/org/testng/xml/SuiteXmlParser.java   |  7 +---
 .../java/org/testng/xml/TestNGContentHandler.java  | 16 ++++----
 src/main/java/org/testng/xml/XMLParser.java        |  4 +-
 src/main/java/org/testng/xml/XmlSuite.java         |  2 +-
 src/main/java/org/testng/xml/XmlTest.java          |  8 ++--
 src/main/java/org/testng/xml/dom/DomUtil.java      |  6 +--
 src/main/java/org/testng/xml/dom/XDom.java         | 18 ++------
 src/test/java/org/testng/AssertTest.java           |  4 +-
 .../org/testng/internal/MethodInstanceTest.java    |  2 +-
 src/test/java/test/BaseDistributedTest.java        | 10 ++---
 src/test/java/test/BaseTest.java                   | 36 ++++++++--------
 src/test/java/test/DynamicGraphTest.java           |  4 +-
 src/test/java/test/GraphTest.java                  | 10 ++---
 src/test/java/test/MapTest.java                    |  4 +-
 src/test/java/test/Test1.java                      |  6 +--
 src/test/java/test/TestHelper.java                 |  2 +-
 src/test/java/test/asserttests/AssertTest.java     |  6 +--
 .../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 +-
 .../InstanceDataProviderSampleTest.java            |  2 +-
 src/test/java/test/dataprovider/IterableTest.java  |  4 +-
 .../dataprovider/ParallelDataProviderTest.java     |  8 ++--
 src/test/java/test/dataprovider/Sample1Test.java   |  4 +-
 .../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/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/inheritance/ZBase_0.java        |  4 +-
 .../InterleavedInvocationTest.java                 |  4 +-
 .../FastTestsFirstInterceptor.java                 |  4 +-
 .../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/sample/BaseSampleInheritance.java    |  2 +-
 src/test/java/test/testng285/BugBase.java          |  2 +-
 src/test/java/test/testng317/VerifyTest.java       |  4 +-
 src/test/java/test/testng387/FailedDPTest.java     |  2 +-
 src/test/java/test/thread/B.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 ++--
 src/test/java/test/timeout/TimeOutFromXmlTest.java |  2 +-
 src/test/java/test/timeout/TimeOutTest.java        |  2 +-
 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 +-
 112 files changed, 290 insertions(+), 411 deletions(-)


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