You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2016/10/13 19:31:26 UTC
[25/25] maven-surefire git commit: Merge branch 'master' into
merge-with-master
Merge branch 'master' into merge-with-master
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/da928141
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/da928141
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/da928141
Branch: refs/heads/junit5
Commit: da928141270c2e8bcad9999f7dcdf24ec80ec357
Parents: 8eae287 b1d11c6
Author: Benedikt Ritter <br...@apache.org>
Authored: Thu Oct 13 21:12:42 2016 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Thu Oct 13 21:12:42 2016 +0200
----------------------------------------------------------------------
maven-failsafe-plugin/pom.xml | 5 +
.../plugin/failsafe/IntegrationTestMojo.java | 63 +++++++++--
.../failsafe/IntegrationTestMojoTest.java | 1 +
.../plugin/surefire/AbstractSurefireMojo.java | 34 ++++--
.../maven/plugin/surefire/CommonReflector.java | 4 +-
.../surefire/StartupReportConfiguration.java | 19 ++--
.../surefire/SurefireExecutionParameters.java | 4 +
.../plugin/surefire/SurefireProperties.java | 2 +-
.../surefire/booterclient/BooterSerializer.java | 4 +-
.../surefire/booterclient/ForkStarter.java | 45 ++++++--
.../AbstractForkInputStream.java | 2 +-
.../booterclient/output/ForkClient.java | 9 ++
.../report/ConsoleOutputFileReporter.java | 5 +-
.../surefire/report/DefaultReporterFactory.java | 50 +++++++--
.../report/NullConsoleOutputReceiver.java | 55 ++++++++++
.../surefire/report/NullConsoleReporter.java | 58 ++++++++++
.../surefire/report/NullFileReporter.java | 45 ++++++++
.../report/NullStatelessXmlReporter.java | 48 +++++++++
.../surefire/report/NullStatisticsReporter.java | 66 ++++++++++++
.../surefire/report/StatelessXmlReporter.java | 21 ++--
.../surefire/report/TestSetRunListener.java | 87 ++++-----------
.../surefire/report/WrappedReportEntry.java | 4 +-
.../surefire/runorder/StatisticsReporter.java | 11 +-
...erDeserializerProviderConfigurationTest.java | 2 +-
...terDeserializerStartupConfigurationTest.java | 2 +-
.../booterclient/ForkingRunListenerTest.java | 7 +-
.../report/DefaultReporterFactoryTest.java | 6 +-
.../maven/plugin/surefire/SurefirePlugin.java | 23 ++++
.../apt/examples/configuring-classpath.apt.vm | 1 +
.../fork-options-and-parallel-execution.apt.vm | 2 +-
.../src/site/apt/examples/shutdown.apt.vm | 3 +-
maven-surefire-plugin/src/site/fml/faq.fml | 11 ++
.../src/site/markdown/multilineexceptions.md | 2 +-
pom.xml | 7 +-
.../surefire/booter/BaseProviderFactory.java | 12 +++
.../apache/maven/surefire/booter/Command.java | 2 +-
.../maven/surefire/booter/CommandReader.java | 2 +-
.../surefire/booter/ForkingRunListener.java | 6 +-
.../surefire/booter/MasterProcessCommand.java | 2 +-
.../surefire/booter/SurefireReflector.java | 18 ++--
.../providerapi/ProviderParameters.java | 2 +
.../surefire/report/ConsoleOutputCapture.java | 3 +-
.../surefire/testset/RunOrderParameters.java | 4 +-
.../surefire/util/internal/ObjectUtils.java | 1 +
.../surefire/util/internal/StringUtils.java | 31 ++----
.../maven/surefire/booter/BooterConstants.java | 1 +
.../surefire/booter/BooterDeserializer.java | 10 +-
.../maven/surefire/booter/ForkedBooter.java | 22 ++--
.../surefire/booter/ProviderConfiguration.java | 19 +++-
.../maven/surefire/booter/ProviderFactory.java | 5 +-
.../booter/SurefireBooterForkException.java | 51 +++++++++
surefire-integration-tests/pom.xml | 3 +-
.../surefire/its/JUnit47ConcurrencyIT.java | 58 ++++++++++
.../its/JUnit47StaticInnerClassTestsIT.java | 34 ++++++
.../surefire/its/JUnit47WithCucumberIT.java | 71 ++++++++++++
.../maven/surefire/its/JUnit4IgnoreIT.java | 52 +++++++++
.../maven/surefire/its/JUnit4VersionsIT.java | 87 +++++++++++++++
.../its/Junit47StaticInnerClassTestsIT.java | 32 ------
.../surefire/its/Junit47WithCucumberIT.java | 71 ------------
.../surefire/its/Junit47concurrencyIT.java | 58 ----------
.../maven/surefire/its/Junit4IgnoreIT.java | 52 ---------
.../maven/surefire/its/Junit4VersionsIT.java | 108 -------------------
.../jiras/Surefire1028UnableToRunSingleIT.java | 59 ++++++++++
.../Surefire1028UnableToRunSingleTest.java | 59 ----------
...refire747MethodParallelWithSuiteCountIT.java | 86 ++++++++++-----
.../test/resources/concurrentjunit47/pom.xml | 62 -----------
.../src/test/java/junit47/BasicTest.java | 71 ------------
.../src/test/java/pkg/ATest.java | 2 +-
.../src/test/java/pkg/BTest.java | 2 +-
.../src/test/java/pkg/CTest.java | 2 +-
.../src/test/java/pkg/DTest.java | 2 +-
.../src/test/java/pkg/ATest.java | 2 +-
.../src/test/java/pkg/BTest.java | 2 +-
.../src/test/java/pkg/CTest.java | 2 +-
.../src/test/java/pkg/DTest.java | 2 +-
.../test/resources/junit47-concurrency/pom.xml | 61 +++++++++++
.../src/test/java/junit47/BasicTest.java | 71 ++++++++++++
.../junit47-parallel-with-suite/pom.xml | 5 +-
.../src/test/java/surefire747/SuiteTest1.java | 8 +-
.../src/test/java/surefire747/SuiteTest2.java | 8 +-
80 files changed, 1255 insertions(+), 776 deletions(-)
----------------------------------------------------------------------