[testng] 02/355: Merge branch 'master' of git://github.com/cbeust/testng

Eugene Zhukov eugene-guest at moszumanska.debian.org
Tue Aug 18 10:19:40 UTC 2015


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 909b7bd91244934f5d67aa36287e4edf9fac6ec5
Merge: 4096f05 592a5b6
Author: Nalin Makar <nullin at nullin.com>
Date:   Sat Dec 1 15:48:36 2012 -0800

    Merge branch 'master' of git://github.com/cbeust/testng

 .classpath                                         |    9 +-
 .gitignore                                         |   15 +-
 CHANGES.txt                                        |   79 +-
 CHECKLIST                                          |   10 +
 README                                             |   21 +-
 README.template                                    |   21 +-
 build-tests.xml                                    |    7 +-
 build.properties                                   |   11 +-
 build.xml                                          |   37 +-
 bundle-pom.xml                                     |    6 +-
 doc/ant.html                                       |   65 +-
 doc/documentation-main.html                        |  264 ++--
 doc/download.html                                  |    2 +-
 doc/eclipse.html                                   |    5 +-
 doc/faq                                            |    3 +
 doc/idea.html                                      |   12 +-
 doc/index.html                                     |    6 +-
 doc/maven.html                                     |    7 +-
 doc/migrating.html                                 |   61 +-
 doc/misc.html                                      |    6 +-
 ivy.xml                                            |    8 +-
 pom-test.xml                                       |   10 +-
 pom.xml                                            |   20 +-
 sandbox/src/org/testng/DefaultTestContext.java     |  131 --
 sandbox/src/org/testng/ITestResult.java            |   82 --
 sandbox/src/org/testng/TestClass.java              |  240 ----
 .../src/org/testng/internal/BaseTestMethod.java    |  612 ---------
 .../org/testng/internal/TestNGMethodFinder.java    |  257 ----
 .../testng/internal/mix/RequiresConfiguration.java |   14 -
 .../org/testng/internal/mix/TestConfiguration.java |   13 -
 .../testng/internal/DefaultInstanceFactory.java    |  178 ---
 .../test/org/testng/internal/IInstanceFactory.java |   19 -
 .../testng/internal/mix/ConfigurationMixin.java    |   32 -
 .../internal/mix/InjectConfigurationMixinTest.java |   22 -
 src/main/java/org/testng/Assert.java               |  159 ++-
 src/main/java/org/testng/CommandLineArgs.java      |    9 +-
 src/main/java/org/testng/DependencyMap.java        |   24 +-
 src/main/java/org/testng/IInvokedMethod.java       |    4 +
 src/main/java/org/testng/ITestNGMethod.java        |    7 +
 src/main/java/org/testng/ITestResult.java          |    5 +
 src/main/java/org/testng/Reporter.java             |   15 +
 src/main/java/org/testng/SuiteResult.java          |    5 +-
 src/main/java/org/testng/SuiteRunner.java          |   11 +-
 src/main/java/org/testng/SuiteRunnerWorker.java    |    7 +-
 src/main/java/org/testng/TestClass.java            |    5 +-
 src/main/java/org/testng/TestListenerAdapter.java  |   10 +-
 src/main/java/org/testng/TestNG.java               |  208 +++-
 src/main/java/org/testng/TestNGAntTask.java        |  132 +-
 src/main/java/org/testng/TestRunner.java           |   58 +-
 .../java/org/testng/annotations/DataProvider.java  |    5 +
 src/main/java/org/testng/annotations/Test.java     |    2 +-
 src/main/java/org/testng/asserts/Assertion.java    | 1304 ++++++++++++++++++++
 src/main/java/org/testng/asserts/IAssert.java      |    8 +
 .../java/org/testng/asserts/IAssertLifecycle.java  |   39 +
 .../java/org/testng/asserts/LoggingAssert.java     |   22 +
 src/main/java/org/testng/asserts/SoftAssert.java   |   40 +
 .../org/testng/collections/CollectionUtils.java    |   16 +
 .../java/org/testng/collections/ListMultiMap.java  |   10 +
 src/main/java/org/testng/collections/Lists.java    |    8 +
 src/main/java/org/testng/collections/Maps.java     |   13 +
 src/main/java/org/testng/collections/Objects.java  |   92 ++
 .../{ListMultiMap.java => SetMultiMap.java}        |   36 +-
 src/main/java/org/testng/collections/Sets.java     |    5 +
 .../java/org/testng/internal/BaseTestMethod.java   |  107 +-
 src/main/java/org/testng/internal/ClassHelper.java |   33 +-
 src/main/java/org/testng/internal/ClassImpl.java   |   17 +-
 .../java/org/testng/internal/ClassInfoMap.java     |    7 +-
 .../java/org/testng/internal/ClonedMethod.java     |    7 +
 .../org/testng/internal/ConfigurationMethod.java   |    3 +-
 .../org/testng/internal/DataProviderHolder.java    |    1 -
 .../java/org/testng/internal/EclipseInterface.java |   18 +
 .../java/org/testng/internal/FactoryMethod.java    |    5 +-
 src/main/java/org/testng/internal/Graph.java       |   14 +-
 .../java/org/testng/internal/InvokedMethod.java    |   10 +-
 src/main/java/org/testng/internal/Invoker.java     |  152 ++-
 .../org/testng/internal/MethodGroupsHelper.java    |   26 +-
 .../java/org/testng/internal/MethodHelper.java     |   65 +-
 .../java/org/testng/internal/MethodInstance.java   |    6 +-
 .../testng/internal/MethodInvocationHelper.java    |   17 +-
 .../testng/internal/MethodSelectorDescriptor.java  |    5 +-
 src/main/java/org/testng/internal/Nullable.java    |    3 +-
 .../java/org/testng/internal/PackageUtils.java     |    3 +-
 src/main/java/org/testng/internal/Parameters.java  |   46 +-
 src/main/java/org/testng/internal/PoolService.java |  177 +--
 src/main/java/org/testng/internal/ResultMap.java   |    5 +-
 .../TestMethodWithDataProviderMethodWorker.java    |    3 +-
 .../org/testng/internal/TestNGClassFinder.java     |    4 +-
 .../java/org/testng/internal/TestNGMethod.java     |    3 +-
 src/main/java/org/testng/internal/TestResult.java  |   38 +-
 src/main/java/org/testng/internal/Utils.java       |  132 +-
 src/main/java/org/testng/internal/Version.java     |    9 +
 .../org/testng/internal/XmlMethodSelector.java     |   59 +-
 src/main/java/org/testng/internal/YamlParser.java  |    2 +-
 .../internal/annotations/AnnotationHelper.java     |    7 +-
 .../annotations/JDK15AnnotationFinder.java         |   52 +-
 .../java/org/testng/internal/collections/Pair.java |   81 ++
 .../java/org/testng/internal/remote/SlavePool.java |    5 +-
 .../testng/internal/thread/ExecutorAdapter.java    |    2 +-
 .../org/testng/internal/thread/ThreadUtil.java     |   43 +-
 .../thread/graph/GraphThreadPoolExecutor.java      |   16 +-
 .../java/org/testng/junit/IJUnitTestRunner.java    |    9 +-
 .../java/org/testng/junit/JUnit3TestClass.java     |   14 +
 .../java/org/testng/junit/JUnit3TestMethod.java    |   29 +
 .../org/testng/junit/JUnit3TestRecognizer.java     |   41 +
 .../java/org/testng/junit/JUnit4TestClass.java     |   14 +
 .../java/org/testng/junit/JUnit4TestMethod.java    |   33 +
 .../org/testng/junit/JUnit4TestRecognizer.java     |   33 +
 .../java/org/testng/junit/JUnit4TestRunner.java    |  209 ++++
 src/main/java/org/testng/junit/JUnitTestClass.java |  193 +++
 .../java/org/testng/junit/JUnitTestFinder.java     |   56 +
 .../java/org/testng/junit/JUnitTestMethod.java     |   30 +
 .../java/org/testng/junit/JUnitTestRecognizer.java |   10 +
 .../java/org/testng/junit/JUnitTestRunner.java     |   55 +-
 src/main/java/org/testng/junit/JUnitUtils.java     |  714 -----------
 src/main/java/org/testng/log4testng/Logger.java    |   14 +-
 src/main/java/org/testng/mustache/BaseChunk.java   |   18 +
 src/main/java/org/testng/mustache/Model.java       |   87 ++
 src/main/java/org/testng/mustache/Mustache.java    |  112 ++
 src/main/java/org/testng/mustache/StringChunk.java |   21 +
 src/main/java/org/testng/mustache/Value.java       |   14 +
 .../java/org/testng/mustache/VariableChunk.java    |   23 +
 src/main/java/org/testng/remote/RemoteTestNG.java  |    4 +-
 .../java/org/testng/remote/SuiteDispatcher.java    |    2 +-
 .../remote/strprotocol/BaseMessageSender.java      |   46 +-
 src/main/java/org/testng/reporters/Buffer.java     |    7 +
 .../org/testng/reporters/EmailableReporter.java    |  175 ++-
 .../org/testng/reporters/EmailableReporter2.java   |  834 +++++++++++++
 .../java/org/testng/reporters/FailedReporter.java  |   15 +-
 .../org/testng/reporters/FileStringBuffer.java     |  181 +++
 src/main/java/org/testng/reporters/Files.java      |   76 ++
 src/main/java/org/testng/reporters/IBuffer.java    |    8 +
 .../org/testng/reporters/JUnitReportReporter.java  |    7 +-
 src/main/java/org/testng/reporters/JqReporter.java |  235 ++++
 .../org/testng/reporters/SuiteHTMLReporter.java    |    4 +-
 .../java/org/testng/reporters/VerboseReporter.java |   18 +-
 .../java/org/testng/reporters/XMLReporter.java     |    5 +-
 .../org/testng/reporters/XMLReporterConfig.java    |    1 +
 .../java/org/testng/reporters/XMLStringBuffer.java |   81 +-
 .../org/testng/reporters/XMLSuiteResultWriter.java |   31 +
 src/main/java/org/testng/reporters/XMLUtils.java   |   69 +-
 .../java/org/testng/reporters/jq/BannerPanel.java  |   24 +
 .../testng/reporters/jq/BaseMultiSuitePanel.java   |   41 +
 .../java/org/testng/reporters/jq/BasePanel.java    |   36 +
 .../testng/reporters/jq/ChronologicalPanel.java    |  101 ++
 .../java/org/testng/reporters/jq/GroupPanel.java   |   49 +
 .../org/testng/reporters/jq/INavigatorPanel.java   |   13 +
 src/main/java/org/testng/reporters/jq/IPanel.java  |    7 +
 .../testng/reporters/jq/IgnoredMethodsPanel.java   |   54 +
 src/main/java/org/testng/reporters/jq/Main.java    |   94 ++
 src/main/java/org/testng/reporters/jq/Model.java   |  212 ++++
 .../org/testng/reporters/jq/NavigatorPanel.java    |  253 ++++
 .../org/testng/reporters/jq/ReporterPanel.java     |   54 +
 .../org/testng/reporters/jq/ResultsByClass.java    |   38 +
 .../java/org/testng/reporters/jq/SuitePanel.java   |  104 ++
 .../org/testng/reporters/jq/TestNgXmlPanel.java    |   40 +
 .../java/org/testng/reporters/jq/TestPanel.java    |   53 +
 .../java/org/testng/reporters/jq/TimesPanel.java   |  122 ++
 .../java/org/testng/util/RetryAnalyzerCount.java   |    8 +
 src/main/java/org/testng/util/Strings.java         |   39 +
 src/main/java/org/testng/xml/Parameters.java       |   36 +
 src/main/java/org/testng/xml/Parser.java           |    8 +-
 .../java/org/testng/xml/TestNGContentHandler.java  |  176 ++-
 src/main/java/org/testng/xml/XmlClass.java         |   79 +-
 src/main/java/org/testng/xml/XmlDefine.java        |   49 +
 src/main/java/org/testng/xml/XmlDependencies.java  |   41 +
 src/main/java/org/testng/xml/XmlGroups.java        |   79 ++
 src/main/java/org/testng/xml/XmlInclude.java       |   62 +-
 .../java/org/testng/xml/XmlMethodSelector.java     |   43 +-
 .../java/org/testng/xml/XmlMethodSelectors.java    |   37 +
 src/main/java/org/testng/xml/XmlPackage.java       |   12 +-
 src/main/java/org/testng/xml/XmlRun.java           |   53 +
 src/main/java/org/testng/xml/XmlScript.java        |   27 +
 src/main/java/org/testng/xml/XmlSuite.java         |  182 ++-
 src/main/java/org/testng/xml/XmlTest.java          |  133 +-
 src/main/java/org/testng/xml/XmlUtils.java         |   16 +
 src/main/java/org/testng/xml/dom/DomUtil.java      |  281 +++++
 src/main/java/org/testng/xml/dom/DomXmlParser.java |   63 +
 src/main/java/org/testng/xml/dom/ITagFactory.java  |    6 +
 src/main/java/org/testng/xml/dom/ITagSetter.java   |    7 +
 src/main/java/org/testng/xml/dom/OnElement.java    |   16 +
 .../java/org/testng/xml/dom/OnElementList.java     |   16 +
 .../Nullable.java => xml/dom/ParentSetter.java}    |    8 +-
 src/main/java/org/testng/xml/dom/Reflect.java      |   71 ++
 src/main/java/org/testng/xml/dom/Tag.java          |   14 +
 src/main/java/org/testng/xml/dom/TagContent.java   |   14 +
 .../java/org/testng/xml/dom/TestNGTagFactory.java  |   32 +
 src/main/java/org/testng/xml/dom/Wrapper.java      |   61 +
 src/main/java/org/testng/xml/dom/XDom.java         |  382 ++++++
 src/main/resources/bullet_point.png                |  Bin 0 -> 356 bytes
 src/main/resources/collapseall.gif                 |  Bin 0 -> 157 bytes
 src/main/resources/failed.png                      |  Bin 0 -> 977 bytes
 src/main/resources/header                          |   22 +
 src/main/resources/jquery-1.7.1.min.js             |    4 +
 src/main/resources/navigator-bullet.png            |  Bin 0 -> 352 bytes
 src/main/resources/passed.png                      |  Bin 0 -> 1019 bytes
 src/main/resources/skipped.png                     |  Bin 0 -> 967 bytes
 src/main/resources/testng-1.0.dtd                  |   17 +-
 src/main/resources/testng-reports.css              |  309 +++++
 src/main/resources/testng-reports.js               |  122 ++
 src/test/java/org/testng/internal/UtilsTest.java   |   18 +-
 src/test/java/test/JUnit4Test.java                 |   80 ++
 src/test/java/test/JUnitTest1.java                 |   12 +
 src/test/java/test/ReturnValueSampleTest.java      |   11 +
 src/test/java/test/ReturnValueTest.java            |   59 +
 src/test/java/test/SimpleBaseTest.java             |    2 +-
 .../AnnotationTransformerClassSampleTest.java      |    3 +-
 ...thFailedBeforeMethodAndMultipleInvocations.java |   31 +
 ...thFailedBeforeMethodAndMultipleInvocations.java |   13 +
 .../FailurePolicyTest.java                         |    2 +
 src/test/java/test/dataprovider/IndicesTest.java   |   21 +
 .../dependent/xml/GroupDependencySampleTest.java   |   15 +
 .../test/dependent/xml/GroupDependencyTest.java    |   67 +
 src/test/java/test/factory/FactoryTest.java        |   11 +-
 src/test/java/test/groupbug/GroupBugTest.java      |   28 +
 src/test/java/test/groupbug/ITCaseOne.java         |   34 +
 src/test/java/test/groupbug/ITCaseTwo.java         |   31 +
 src/test/java/test/guice/GuiceNoModuleTest.java    |   12 +
 src/test/java/test/guice/GuiceTest.java            |    9 +-
 .../java/test/invokedmethodlistener/Sample.java    |   10 +-
 src/test/java/test/jar/A.java                      |    9 -
 src/test/java/test/jar/B.java                      |    9 -
 src/test/java/test/jar/JarTest.java                |   58 -
 src/test/java/test/jar/build                       |    9 -
 src/test/java/test/jar/test/jar/A.class            |  Bin 300 -> 0 bytes
 src/test/java/test/jar/test/jar/B.class            |  Bin 300 -> 0 bytes
 src/test/java/test/junit/Suite2.java               |    2 +-
 src/test/java/test/junit4/InheritedTest.java       |    9 +
 src/test/java/test/junit4/JUnit4Child.java         |   12 +
 src/test/java/test/junit4/JUnit4Sample1.java       |   15 +
 src/test/java/test/junit4/JUnit4Sample2.java       |   34 +
 src/test/java/test/junit4/JUnit4SampleSuite.java   |   20 +
 .../listeners/EndMillisShouldNotBeZeroTest.java    |    5 +-
 .../java/test/listeners/ResultContextListener.java |   36 +
 .../listeners/ResultContextListenerSample.java     |   13 +
 .../java/test/listeners/ResultContextTest.java     |   19 +
 .../methodselectors/MethodSelectorInSuiteTest.java |    8 +-
 src/test/java/test/mixed/JUnit3Test1.java          |   22 +
 src/test/java/test/mixed/JUnit4Test1.java          |   20 +
 src/test/java/test/mixed/MixedTest.java            |   62 +
 src/test/java/test/mixed/TestNGGroups.java         |   17 +
 src/test/java/test/mixed/TestNGTest1.java          |   21 +
 src/test/java/test/mustache/MustacheTest.java      |  103 ++
 src/test/java/test/parameters/Override1Sample.java |   25 +
 .../test/parameters/ParameterOverrideTest.java     |   92 ++
 .../java/test/parameters/Shadow1SampleTest.java    |   14 +
 .../java/test/parameters/Shadow2SampleTest.java    |   14 +
 src/test/java/test/parameters/ShadowTest.java      |   49 +
 src/test/java/test/preserveorder/EdnTest.java      |    8 -
 src/test/java/test/preserveorder/PrgTest.java      |    9 +-
 src/test/java/test/preserveorder/SibTest.java      |    7 -
 src/test/java/test/reports/FailedReporterTest.java |   61 +
 src/test/java/test/reports/FailedSampleTest.java   |   11 +
 .../java/test/reports/ReporterLogSampleTest.java   |   25 +
 src/test/java/test/reports/ReporterLogTest.java    |   32 +
 src/test/java/test/sample/JUnitSample4.java        |   38 +
 .../test/skipex/SkipAndExpectedSampleTest.java     |   12 +
 src/test/java/test/skipex/SkipAndExpectedTest.java |   23 +
 src/test/java/test/testng173/ClassA.java           |   15 +
 src/test/java/test/testng173/ClassB.java           |   18 +
 src/test/java/test/testng173/TestNG173Test.java    |   65 +
 .../java/test/testng173/anotherpackage/ClassC.java |   22 +
 src/test/java/test/testng234/ChildTest.java        |   20 +
 src/test/java/test/testng234/ParentTest.java       |   13 +
 .../test/testng234/PolymorphicFailureTest.java     |   28 +
 src/test/java/test/thread/BaseThreadTest.java      |   19 +
 .../thread/MultiThreadedDependentSampleTest.java   |   13 -
 .../java/test/thread/ThreadPoolSampleBugTest.java  |   27 +
 .../java/test/thread/ThreadPoolSizeSampleTest.java |    2 +-
 src/test/java/test/thread/ThreadPoolSizeTest.java  |    2 -
 src/test/java/test/thread/ThreadTest.java          |   23 +
 .../java/test/thread/TrueParallelSampleTest.java   |   33 +
 src/test/java/test/thread/TrueParallelTest.java    |   51 +
 .../test/timeout/InvocationTimeOutSampleTest.java  |    6 +-
 .../java/test/timeout/TestTimeOutSampleTest.java   |    4 +-
 src/test/java/test/timeout/TimeOutTest.java        |   23 +-
 src/test/java/test/tmp/A.java                      |   82 +-
 src/test/java/test/tmp/Tmp.java                    |    5 +-
 .../java/test/verify/VerifyMethodInterceptor.java  |    2 +-
 .../{java/test/jar/testng.xml => resources/a.xml}  |    8 +-
 .../{java/test/jar/testng.xml => resources/b.xml}  |    8 +-
 src/test/resources/testng-all.xml                  |   99 ++
 src/test/resources/testng-single.xml               |   60 +-
 src/test/resources/testng-single.yaml              |    7 +-
 src/test/resources/testng.xml                      |   41 +
 src/test/resources/yaml/a2.xml                     |   16 +-
 testng.iml                                         |   32 -
 testng.ipr                                         |  330 -----
 update-beust.com                                   |   18 +-
 verify-release                                     |    6 +-
 289 files changed, 11302 insertions(+), 4263 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