You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/27 21:50:40 UTC
svn commit: r1236883 [1/5] - in /maven/surefire/trunk:
maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/
maven-surefire-common/src/main/java/org/apache/maven/plug...
Author: krosenvold
Date: Fri Jan 27 20:50:34 2012
New Revision: 1236883
URL: http://svn.apache.org/viewvc?rev=1236883&view=rev
Log:
o Reformatted to code style
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/XMLReporterTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/RelocatorTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/PrioritizedTest.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/Priority.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/NonAbstractClassFilter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/booter/ProviderParameterNames.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/SurefireProvider.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/DefaultDirectConsoleReporter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestRequest.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestSetFailedException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/NestedRuntimeException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/ReflectionUtils.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/RunOrderCalculator.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/SurefireReflectionException.java
maven/surefire/trunk/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/SpecificTestClassFilterTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkingRunListenerTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/PojoStackTraceWriterTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/report/RunStatisticsTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT1A.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java
maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/AndGroupMatcherTest.java
maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/OrGroupMatcherTest.java
maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/parse/GroupMatcherParserTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierException.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestFile.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire803MultiFailsafeExecsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire818NpeIgnoresTestsIT.java
maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3TestChecker.java
maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4Reflector.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java
maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4TestChecker.java
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerTest.java
maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
maven/surefire/trunk/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/JUnit48Reflector.java
maven/surefire/trunk/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/JUnit48ReflectorTest.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
maven/surefire/trunk/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit4Reflector481Test.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/TestMethodTest.java
maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java Fri Jan 27 20:50:34 2012
@@ -19,11 +19,8 @@ package org.apache.maven.plugin.failsafe
* under the License.
*/
-import static org.codehaus.plexus.util.IOUtil.*;
-
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -31,19 +28,16 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -61,6 +55,8 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import static org.codehaus.plexus.util.IOUtil.close;
+
/**
* Run integration tests using Surefire.
*
@@ -82,7 +78,7 @@ public class IntegrationTestMojo
/**
* Information about this plugin, mainly used to lookup this plugin's configuration from the currently executing
* project.
- *
+ *
* @parameter default-value="${plugin}"
* @readonly
* @since 2.12
@@ -281,7 +277,7 @@ public class IntegrationTestMojo
* @parameter
* @since 2.5
*/
- private Map<String,String> systemPropertyVariables;
+ private Map<String, String> systemPropertyVariables;
/**
* List of System properties, loaded from a file, to pass to the JUnit tests.
@@ -307,7 +303,7 @@ public class IntegrationTestMojo
* @required
* @readonly
*/
- private Map<String,Artifact> pluginArtifactMap;
+ private Map<String, Artifact> pluginArtifactMap;
/**
* Map of project artifacts.
@@ -316,7 +312,7 @@ public class IntegrationTestMojo
* @required
* @readonly
*/
- private Map<String,Artifact> projectArtifactMap;
+ private Map<String, Artifact> projectArtifactMap;
/**
* The summary file to write integration test results to.
@@ -377,7 +373,7 @@ public class IntegrationTestMojo
/**
* Set this to "true" to cause a failure if the none of the tests specified in -Dtest=... are run. Defaults to
* "true".
- *
+ *
* @parameter expression="${it.failIfNoSpecifiedTests}"
* @since 2.12
*/
@@ -436,7 +432,7 @@ public class IntegrationTestMojo
* @parameter
* @since 2.1.3
*/
- private Map<String,String> environmentVariables = new HashMap<String,String>();
+ private Map<String, String> environmentVariables = new HashMap<String, String>();
/**
* Command line working directory.
@@ -736,10 +732,9 @@ public class IntegrationTestMojo
{
fin = new FileInputStream( summaryFile );
- mergedSummary =
- new FailsafeSummaryXpp3Reader().read( new InputStreamReader( new BufferedInputStream( fin ),
- getEncodingOrDefault() ) );
-
+ mergedSummary = new FailsafeSummaryXpp3Reader().read(
+ new InputStreamReader( new BufferedInputStream( fin ), getEncodingOrDefault() ) );
+
mergedSummary.merge( summary );
}
@@ -1003,12 +998,12 @@ public class IntegrationTestMojo
this.systemProperties = systemProperties;
}
- public Map<String,String> getSystemPropertyVariables()
+ public Map<String, String> getSystemPropertyVariables()
{
return systemPropertyVariables;
}
- public void setSystemPropertyVariables( Map<String,String> systemPropertyVariables )
+ public void setSystemPropertyVariables( Map<String, String> systemPropertyVariables )
{
this.systemPropertyVariables = systemPropertyVariables;
}
@@ -1033,12 +1028,12 @@ public class IntegrationTestMojo
this.properties = properties;
}
- public Map<String,Artifact> getPluginArtifactMap()
+ public Map<String, Artifact> getPluginArtifactMap()
{
return pluginArtifactMap;
}
- public void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap )
+ public void setPluginArtifactMap( Map<String, Artifact> pluginArtifactMap )
{
this.pluginArtifactMap = pluginArtifactMap;
}
@@ -1173,12 +1168,12 @@ public class IntegrationTestMojo
this.forkedProcessTimeoutInSeconds = forkedProcessTimeoutInSeconds;
}
- public Map<String,String> getEnvironmentVariables()
+ public Map<String, String> getEnvironmentVariables()
{
return environmentVariables;
}
- public void setEnvironmentVariables( Map<String,String> environmentVariables )
+ public void setEnvironmentVariables( Map<String, String> environmentVariables )
{
this.environmentVariables = environmentVariables;
}
Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java Fri Jan 27 20:50:34 2012
@@ -132,8 +132,8 @@ public class VerifyMojo
* Additional summary files to read integration test results from.
*
* @parameter
- * @since 2.6
* @noinspection UnusedDeclaration, MismatchedReadAndWriteOfArray
+ * @since 2.6
*/
private File[] summaryFiles;
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java Fri Jan 27 20:50:34 2012
@@ -577,8 +577,7 @@ public abstract class AbstractSurefireMo
if ( plugin != null )
{
- @SuppressWarnings( "rawtypes" )
- List executions = plugin.getExecutions();
+ @SuppressWarnings( "rawtypes" ) List executions = plugin.getExecutions();
return executions != null && executions.size() > 1;
}
}
@@ -874,7 +873,7 @@ public abstract class AbstractSurefireMo
{
// A tribute to Linus Torvalds
String configChecksum = getConfigChecksum();
- @SuppressWarnings( "unchecked" ) Map<String,String> pluginContext = getPluginContext();
+ @SuppressWarnings( "unchecked" ) Map<String, String> pluginContext = getPluginContext();
if ( pluginContext.containsKey( configChecksum ) )
{
getLog().info( "Skipping execution of surefire because it has already been run for this configuration" );
@@ -914,8 +913,7 @@ public abstract class AbstractSurefireMo
classpath.add( getClassesDirectory().getAbsolutePath() );
- @SuppressWarnings( "unchecked" )
- Set<Artifact> classpathArtifacts = getProject().getArtifacts();
+ @SuppressWarnings( "unchecked" ) Set<Artifact> classpathArtifacts = getProject().getArtifacts();
if ( getClasspathDependencyScopeExclude() != null && !getClasspathDependencyScopeExclude().equals( "" ) )
{
@@ -970,9 +968,8 @@ public abstract class AbstractSurefireMo
String surefireVersion = surefireArtifact.getBaseVersion();
Artifact[] extraTestNgArtifacts =
- {
- getArtifactFactory().createArtifact( "org.apache.maven.surefire", "surefire-testng-utils",
- surefireVersion, "runtime", "jar" ),
+ { getArtifactFactory().createArtifact( "org.apache.maven.surefire", "surefire-testng-utils",
+ surefireVersion, "runtime", "jar" ),
getArtifactFactory().createArtifact( "org.apache.maven.surefire", "surefire-grouper", surefireVersion,
"runtime", "jar" ) };
@@ -1007,7 +1004,7 @@ public abstract class AbstractSurefireMo
return filteredArtifacts;
}
- private void showMap( Map<?,?> map, String setting )
+ private void showMap( Map<?, ?> map, String setting )
{
for ( Object o : map.keySet() )
{
@@ -1253,8 +1250,7 @@ public abstract class AbstractSurefireMo
public Classpath getProviderClasspath()
throws ArtifactResolutionException, ArtifactNotFoundException
{
- Artifact surefireArtifact =
- getPluginArtifactMap().get( "org.apache.maven.surefire:surefire-booter" );
+ Artifact surefireArtifact = getPluginArtifactMap().get( "org.apache.maven.surefire:surefire-booter" );
return dependencyResolver.getProviderClasspath( "surefire-testng", surefireArtifact.getBaseVersion(),
testNgArtifact );
}
@@ -1407,7 +1403,7 @@ public abstract class AbstractSurefireMo
public Classpath getProviderClasspath()
throws ArtifactResolutionException, ArtifactNotFoundException
{
- final Map<String,Artifact> pluginArtifactMap = getPluginArtifactMap();
+ final Map<String, Artifact> pluginArtifactMap = getPluginArtifactMap();
Artifact plugin = pluginArtifactMap.get( "org.apache.maven.plugins:maven-surefire-plugin" );
return dependencyResolver.addProviderToClasspath( pluginArtifactMap, plugin );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java Fri Jan 27 20:50:34 2012
@@ -61,17 +61,16 @@ public class CommonReflector
Object createStartupReportConfiguration( StartupReportConfiguration reporterConfiguration )
{
Constructor<?> constructor = ReflectionUtils.getConstructor( this.startupReportConfiguration,
- new Class[]{ boolean.class, boolean.class,
- String.class, boolean.class, boolean.class,
- File.class, boolean.class, String.class,
- String.class, boolean.class } );
+ new Class[]{ boolean.class, boolean.class,
+ String.class, boolean.class, boolean.class,
+ File.class, boolean.class, String.class,
+ String.class, boolean.class } );
//noinspection BooleanConstructorCall
- final Object[] params =
- { reporterConfiguration.isUseFile(), reporterConfiguration.isPrintSummary(),
- reporterConfiguration.getReportFormat(), reporterConfiguration.isRedirectTestOutputToFile(),
- reporterConfiguration.isDisableXmlReport(), reporterConfiguration.getReportsDirectory(),
- reporterConfiguration.isTrimStackTrace(), reporterConfiguration.getReportNameSuffix(),
- reporterConfiguration.getConfigurationHash(), reporterConfiguration.isRequiresRunHistory() };
+ final Object[] params = { reporterConfiguration.isUseFile(), reporterConfiguration.isPrintSummary(),
+ reporterConfiguration.getReportFormat(), reporterConfiguration.isRedirectTestOutputToFile(),
+ reporterConfiguration.isDisableXmlReport(), reporterConfiguration.getReportsDirectory(),
+ reporterConfiguration.isTrimStackTrace(), reporterConfiguration.getReportNameSuffix(),
+ reporterConfiguration.getConfigurationHash(), reporterConfiguration.isRequiresRunHistory() };
return ReflectionUtils.newInstance( constructor, params );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderInfo.java Fri Jan 27 20:50:34 2012
@@ -24,8 +24,8 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.surefire.booter.Classpath;
/**
-* @author Kristian Rosenvold
-*/
+ * @author Kristian Rosenvold
+ */
public interface ProviderInfo
{
String getProviderName();
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ProviderList.java Fri Jan 27 20:50:34 2012
@@ -19,15 +19,14 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.surefire.booterclient.ProviderDetector;
-import org.apache.maven.surefire.providerapi.SurefireProvider;
-import org.apache.maven.surefire.util.NestedRuntimeException;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.surefire.booterclient.ProviderDetector;
+import org.apache.maven.surefire.providerapi.SurefireProvider;
+import org.apache.maven.surefire.util.NestedRuntimeException;
/**
* @author Kristian Rosenvold
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java Fri Jan 27 20:50:34 2012
@@ -19,6 +19,10 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -36,11 +40,6 @@ import org.apache.maven.artifact.version
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.surefire.booter.Classpath;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
/**
* Does dependency resolution and artifact handling for the surefire plugin.
*
@@ -65,7 +64,8 @@ public class SurefireDependencyResolver
private final String pluginName;
protected SurefireDependencyResolver( ArtifactResolver artifactResolver, ArtifactFactory artifactFactory, Log log,
- ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource artifactMetadataSource, String pluginName )
{
this.artifactResolver = artifactResolver;
@@ -118,7 +118,7 @@ public class SurefireDependencyResolver
}
Artifact originatingArtifact = artifactFactory.createBuildArtifact( "dummy", "dummy", "1.0", "jar" );
-
+
return artifactResolver.resolveTransitively( Collections.singleton( providerArtifact ), originatingArtifact,
localRepository, remoteRepositories, artifactMetadataSource,
filter );
@@ -146,7 +146,7 @@ public class SurefireDependencyResolver
return new Classpath( files );
}
- public Classpath addProviderToClasspath( Map<String,Artifact> pluginArtifactMap, Artifact surefireArtifact )
+ public Classpath addProviderToClasspath( Map<String, Artifact> pluginArtifactMap, Artifact surefireArtifact )
throws ArtifactResolutionException, ArtifactNotFoundException
{
List<String> files = new ArrayList<String>();
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java Fri Jan 27 20:50:34 2012
@@ -23,7 +23,6 @@ import java.io.File;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -112,9 +111,9 @@ public interface SurefireExecutionParame
void setSystemProperties( Properties systemProperties );
- Map<String,String> getSystemPropertyVariables();
+ Map<String, String> getSystemPropertyVariables();
- void setSystemPropertyVariables( Map<String,String> systemPropertyVariables );
+ void setSystemPropertyVariables( Map<String, String> systemPropertyVariables );
File getSystemPropertiesFile();
@@ -126,13 +125,13 @@ public interface SurefireExecutionParame
PluginDescriptor getPluginDescriptor();
- Map<String,Artifact> getPluginArtifactMap();
+ Map<String, Artifact> getPluginArtifactMap();
- void setPluginArtifactMap( Map<String,Artifact> pluginArtifactMap );
+ void setPluginArtifactMap( Map<String, Artifact> pluginArtifactMap );
- Map<String,Artifact> getProjectArtifactMap();
+ Map<String, Artifact> getProjectArtifactMap();
- void setProjectArtifactMap( Map<String,Artifact> projectArtifactMap );
+ void setProjectArtifactMap( Map<String, Artifact> projectArtifactMap );
boolean isPrintSummary();
@@ -174,9 +173,9 @@ public interface SurefireExecutionParame
void setForkedProcessTimeoutInSeconds( int forkedProcessTimeoutInSeconds );
- Map<String,String> getEnvironmentVariables();
+ Map<String, String> getEnvironmentVariables();
- void setEnvironmentVariables( Map<String,String> environmentVariables );
+ void setEnvironmentVariables( Map<String, String> environmentVariables );
File getWorkingDirectory();
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java Fri Jan 27 20:50:34 2012
@@ -48,8 +48,7 @@ public final class SurefireHelper
if ( result.getCompletedCount() == 0 )
{
- if ( ( reportParameters.getFailIfNoTests() == null )
- || !reportParameters.getFailIfNoTests() )
+ if ( ( reportParameters.getFailIfNoTests() == null ) || !reportParameters.getFailIfNoTests() )
{
return;
}
@@ -97,8 +96,7 @@ public final class SurefireHelper
if ( result == ProviderConfiguration.NO_TESTS_EXIT_CODE )
{
- if ( ( reportParameters.getFailIfNoTests() == null )
- || !reportParameters.getFailIfNoTests() )
+ if ( ( reportParameters.getFailIfNoTests() == null ) || !reportParameters.getFailIfNoTests() )
{
return;
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java Fri Jan 27 20:50:34 2012
@@ -19,10 +19,6 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.surefire.util.NestedRuntimeException;
-
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
@@ -30,6 +26,9 @@ import java.security.NoSuchAlgorithmExce
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.surefire.util.NestedRuntimeException;
/**
* @author Kristian Rosenvold
@@ -55,7 +54,7 @@ public class ChecksumCalculator
checksumItems.add( value );
}
- public void add( Map<?,?> map )
+ public void add( Map<?, ?> map )
{
if ( map != null )
{
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/MockReporter.java Fri Jan 27 20:50:34 2012
@@ -22,8 +22,8 @@ package org.apache.maven.plugin.surefire
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ConsoleLogger;
+import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java Fri Jan 27 20:50:34 2012
@@ -56,8 +56,8 @@ public class ProviderDetector
* defined using the SPI mechanism.
*
* @param urlEnumeration The urls from the resource
- * @throws IOException When reading the streams fails
* @return The set of service provider names
+ * @throws IOException When reading the streams fails
*/
private static Set<String> getNames( final Enumeration<URL> urlEnumeration )
throws IOException
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/DeserializedStacktraceWriter.java Fri Jan 27 20:50:34 2012
@@ -56,6 +56,6 @@ public class DeserializedStacktraceWrite
public SafeThrowable getThrowable()
{
- return new SafeThrowable( new Throwable( message ));
+ return new SafeThrowable( new Throwable( message ) );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java Fri Jan 27 20:50:34 2012
@@ -28,11 +28,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-
import org.apache.maven.surefire.booter.ForkingRunListener;
import org.apache.maven.surefire.report.CategorizedReportEntry;
-import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ConsoleLogger;
+import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.report.ReporterFactory;
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractConsoleReporter.java Fri Jan 27 20:50:34 2012
@@ -46,12 +46,13 @@ public abstract class AbstractConsoleRep
AbstractConsoleReporter( boolean trimStackTrace, String format )
{
- super( getPrintWriter(), trimStackTrace, format);
+ super( getPrintWriter(), trimStackTrace, format );
}
private static PrintWriter getPrintWriter()
{
- return new PrintWriter( new OutputStreamWriter( new BufferedOutputStream( ORIGINAL_SYSTEM_OUT, BUFFER_SIZE ) ) );
+ return new PrintWriter(
+ new OutputStreamWriter( new BufferedOutputStream( ORIGINAL_SYSTEM_OUT, BUFFER_SIZE ) ) );
}
public void testSetStarting( ReportEntry report )
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractFileReporter.java Fri Jan 27 20:50:34 2012
@@ -44,7 +44,7 @@ public abstract class AbstractFileReport
{
this( trimStackTrace, format, reportsDirectory, null );
}
-
+
AbstractFileReporter( boolean trimStackTrace, String format, File reportsDirectory, String reportNameSuffix )
{
super( trimStackTrace, format );
@@ -89,12 +89,12 @@ public abstract class AbstractFileReport
}
}
- public static File getReportFile( File reportsDirectory, String reportEntryName,
- String reportNameSuffix, String fileExtension )
+ public static File getReportFile( File reportsDirectory, String reportEntryName, String reportNameSuffix,
+ String fileExtension )
{
File reportFile;
- if ( reportNameSuffix != null && reportNameSuffix.length() > 0)
+ if ( reportNameSuffix != null && reportNameSuffix.length() > 0 )
{
reportFile = new File( reportsDirectory, reportEntryName + "-" + reportNameSuffix + fileExtension );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/AbstractTextReporter.java Fri Jan 27 20:50:34 2012
@@ -56,7 +56,7 @@ public abstract class AbstractTextReport
protected AbstractTextReporter( PrintWriter writer, boolean trimStackTrace, String format )
{
- this( trimStackTrace, format);
+ this( trimStackTrace, format );
this.writer = writer;
}
@@ -147,9 +147,8 @@ public abstract class AbstractTextReport
buf.append( ", Skipped: " );
buf.append( skipped );
buf.append( ", Time elapsed: " );
- int elapsed = report.getElapsed() != null
- ? report.getElapsed()
- : (int) ( System.currentTimeMillis() - testSetStartTime );
+ int elapsed =
+ report.getElapsed() != null ? report.getElapsed() : (int) ( System.currentTimeMillis() - testSetStartTime );
buf.append( elapsedTimeAsString( elapsed ) );
buf.append( " sec" );
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleOutputFileReporter.java Fri Jan 27 20:50:34 2012
@@ -24,7 +24,6 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.util.NestedRuntimeException;
@@ -87,7 +86,8 @@ public class ConsoleOutputFileReporter
//noinspection ResultOfMethodCallIgnored
reportsDirectory.mkdirs();
}
- File file = AbstractFileReporter.getReportFile( reportsDirectory, reportEntryName, reportNameSuffix, "-output.txt" );
+ File file = AbstractFileReporter.getReportFile( reportsDirectory, reportEntryName, reportNameSuffix,
+ "-output.txt" );
printWriter = new PrintWriter( new BufferedWriter( new FileWriter( file ) ) );
}
printWriter.write( new String( b, off, len ) );
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java Fri Jan 27 20:50:34 2012
@@ -33,6 +33,6 @@ public class FileReporter
public FileReporter( boolean trimStackTrace, File reportsDirectory, String reportNamePrefix )
{
- super( trimStackTrace, PLAIN, reportsDirectory, reportNamePrefix);
+ super( trimStackTrace, PLAIN, reportsDirectory, reportNamePrefix );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/MulticastingReporter.java Fri Jan 27 20:50:34 2012
@@ -114,7 +114,7 @@ public class MulticastingReporter
return new CategorizedReportEntry( other.getSourceName(), other.getName(), other.getGroup(),
other.getStackTraceWriter(),
(int) ( System.currentTimeMillis() - this.lastStartAt ),
- other.getMessage());
+ other.getMessage() );
}
public void writeMessage( String message )
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetRunListener.java Fri Jan 27 20:50:34 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.apache.maven.plugin.surefire.runorder.StatisticsReporter;
import org.apache.maven.surefire.report.ConsoleLogger;
import org.apache.maven.surefire.report.ConsoleOutputReceiver;
@@ -28,10 +31,6 @@ import org.apache.maven.surefire.report.
import org.apache.maven.surefire.report.TestSetStatistics;
import org.apache.maven.surefire.util.internal.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
/**
* Reports data for a single test set.
* <p/>
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/XMLReporter.java Fri Jan 27 20:50:34 2012
@@ -45,9 +45,9 @@ import org.codehaus.plexus.util.xml.Xpp3
* by Ant's <a href="http://ant.apache.org/manual/Tasks/junit.html"><code><junit></code></a> and
* <a href="http://ant.apache.org/manual/Tasks/junitreport.html"><code><junitreport></code></a> tasks,
* then supported by many tools like CI servers.
- *
+ * <p/>
* <pre><?xml version="1.0" encoding="UTF-8"?>
- *<testsuite name="<i>suite name</i>" [group="<i>group</i>"] tests="<i>0</i>" failures="<i>0</i>" errors="<i>0</i>" skipped="<i>0</i>" time="<i>0,###.###</i>">
+ * <testsuite name="<i>suite name</i>" [group="<i>group</i>"] tests="<i>0</i>" failures="<i>0</i>" errors="<i>0</i>" skipped="<i>0</i>" time="<i>0,###.###</i>">
* <properties>
* <property name="<i>name</i>" value="<i>value</i>"/>
* [...]
@@ -67,11 +67,11 @@ import org.codehaus.plexus.util.xml.Xpp3
* <<b>skipped</b>/>
* </testcase>
* [...]</pre>
- *
+ *
* @author <a href="mailto:jruiz@exist.com">Johnny R. Ruiz III</a>
* @version $Id$
* @see <a href="http://wiki.apache.org/ant/Proposals/EnhancedTestReports">Ant's format enhancement proposal</a>
- * (not yet implemented by Ant 1.8.2)
+ * (not yet implemented by Ant 1.8.2)
*/
public class XMLReporter
extends AbstractReporter
@@ -127,7 +127,7 @@ public class XMLReporter
{
super.testSetCompleted( report );
- long runTime = elapsed > 0 ? elapsed : (System.currentTimeMillis() - testSetStartTime);
+ long runTime = elapsed > 0 ? elapsed : ( System.currentTimeMillis() - testSetStartTime );
Xpp3Dom testSuite = createTestSuiteElement( report, runTime );
@@ -296,7 +296,7 @@ public class XMLReporter
String stackTrace = getStackTrace( report );
- if ( report.getMessage() != null && report.getMessage().length() > 0)
+ if ( report.getMessage() != null && report.getMessage().length() > 0 )
{
element.setAttribute( "message", report.getMessage() );
}
@@ -351,12 +351,13 @@ public class XMLReporter
/**
* Adds system properties to the XML report.
+ * <p/>
+ * <<<<<<< HEAD
*
-<<<<<<< HEAD
* @param testSuite The test suite to report to
-=======
+ * =======
* @param testSuite the target dom suite
->>>>>>> [SUREFIRE-537]
+ * >>>>>>> [SUREFIRE-537]
*/
private void showProperties( Xpp3Dom testSuite )
{
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/BlockingQueue.java Fri Jan 27 20:50:34 2012
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.surefire
/**
* A very simple blocking queue that might have stricter constraints than the standard jdk1.5 blockingqueues.
+ *
* @author Kristian Rosenvold
*/
public interface BlockingQueue
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/FunkyTwoThreadBlockingQueue.java Fri Jan 27 20:50:34 2012
@@ -24,7 +24,7 @@ package org.apache.maven.plugin.surefire
* and *one* consumer thread, and solely optimized for efficient inserts
* by the producer, minimizing producer locking for hand-off to
* a second consumer.
- *
+ * <p/>
* TwoThreadBlockingQueue insert 5000000 elements in = 52
* FunkyTwoThreadBlockingQueue insert 5000000 elements in = 42
* TwoThreadBlockingQueue produced and taken 5000000 elements in = 104
@@ -32,11 +32,13 @@ package org.apache.maven.plugin.surefire
* LinkedBlockingDeque insert 5000000 elements in = 113
* ArrayList insert 5000000 elements in = 18
* LinkedList insert 5000000 elements in = 334
- *
+ * <p/>
* Todo: Determine if this design actually works ;)
+ *
* @author Kristian Rosenvold
*/
-public class FunkyTwoThreadBlockingQueue implements BlockingQueue
+public class FunkyTwoThreadBlockingQueue
+ implements BlockingQueue
{
final int chunkSize = 100;
@@ -54,7 +56,7 @@ public class FunkyTwoThreadBlockingQueue
public void put( String object )
{
insertChunk.elements[insertPos] = object;
- if ( ++insertPos == chunkSize)
+ if ( ++insertPos == chunkSize )
{
Chunk newChunk = new Chunk();
insertChunk.next = newChunk;
@@ -66,7 +68,7 @@ public class FunkyTwoThreadBlockingQueue
public void add( String object )
{
- put( object );
+ put( object );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/internal/TwoThreadBlockingQueue.java Fri Jan 27 20:50:34 2012
@@ -24,14 +24,14 @@ package org.apache.maven.plugin.surefire
* and *one* consumer thread, and solely optimized for efficient inserts
* by the producer, minimizing producer locking for hand-off to
* a second consumer.
- *
+ * <p/>
* The producer can actually come in on different threads
* (because lastInserted is volatile), but can/will lose
* items if they arrive concurrently. Take only supports a single
* client.
- *
+ * <p/>
* This runs like crazy, but is not the most garbage friendly around.
- *
+ * <p/>
* TwoThreadBlockingQueue insert 5000000 elements in = 52ms
* LinkedBlockingQueue insert 5000000 elements in = 179ms
* LikedBlockingDeque insert 5000000 elements in = 114ms
@@ -43,17 +43,22 @@ public class TwoThreadBlockingQueue
implements BlockingQueue
{
private volatile Element lastInserted;
+
private volatile Element lastTaken;
+
private volatile Element first;
public static final String poison = "poison";
public void add( String object )
{
- Element next = new Element( object);
- if (lastInserted == null){
+ Element next = new Element( object );
+ if ( lastInserted == null )
+ {
first = lastInserted = next;
- } else {
+ }
+ else
+ {
lastInserted.next = next;
lastInserted = next;
}
@@ -62,16 +67,21 @@ public class TwoThreadBlockingQueue
public String take()
throws InterruptedException
{
- if (lastTaken == null){
- while (first == null){
- Thread.sleep(1);
+ if ( lastTaken == null )
+ {
+ while ( first == null )
+ {
+ Thread.sleep( 1 );
}
lastTaken = first;
first = null;
- } else {
+ }
+ else
+ {
Element next = lastTaken.next;
- while (next == null){
- Thread.sleep(1);
+ while ( next == null )
+ {
+ Thread.sleep( 1 );
next = lastTaken.next;
}
lastTaken = next;
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java Fri Jan 27 20:50:34 2012
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Properties;
import org.apache.maven.surefire.booter.BooterDeserializer;
import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
@@ -143,8 +142,8 @@ public class BooterDeserializerStartupCo
File cwd = new File( "." );
DirectoryScannerParameters directoryScannerParameters =
- new DirectoryScannerParameters( cwd, new ArrayList<String>(), new ArrayList<String>(), new ArrayList<String>(),
- Boolean.TRUE, "hourly" );
+ new DirectoryScannerParameters( cwd, new ArrayList<String>(), new ArrayList<String>(),
+ new ArrayList<String>(), Boolean.TRUE, "hourly" );
ReporterConfiguration reporterConfiguration = new ReporterConfiguration( cwd, Boolean.TRUE );
String aUserRequestedTest = "aUserRequestedTest";
String aUserRequestedTestMethod = "aUserRequestedTestMethod";
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java Fri Jan 27 20:50:34 2012
@@ -19,15 +19,15 @@ package org.apache.maven.plugin.surefire
* under the License.
*/
-import junit.framework.TestCase;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.SurefireBooterForkException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
+import junit.framework.TestCase;
public class ForkConfigurationTest
extends TestCase
@@ -40,8 +40,8 @@ public class ForkConfigurationTest
File cpElement = getTempClasspathFile();
config.setJvmExecutable( "java" );
- Commandline cli = config.createCommandLine( Collections.singletonList( cpElement.getAbsolutePath() ), true,
- false );
+ Commandline cli =
+ config.createCommandLine( Collections.singletonList( cpElement.getAbsolutePath() ), true, false );
String line = StringUtils.join( cli.getCommandline(), " " );
assertTrue( line.indexOf( "-jar" ) > -1 );
@@ -73,7 +73,8 @@ public class ForkConfigurationTest
public static ForkConfiguration getForkConfiguration()
throws IOException
{
- ForkConfiguration forkConfiguration = new ForkConfiguration( new Classpath(), ForkConfiguration.FORK_ONCE, null );
+ ForkConfiguration forkConfiguration =
+ new ForkConfiguration( new Classpath(), ForkConfiguration.FORK_ONCE, null );
forkConfiguration.setWorkingDirectory( new File( "." ).getCanonicalFile() );
return forkConfiguration;
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java Fri Jan 27 20:50:34 2012
@@ -25,12 +25,11 @@ import java.io.PrintStream;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-
import org.apache.maven.plugin.surefire.booterclient.output.ForkClient;
import org.apache.maven.surefire.booter.ForkingRunListener;
import org.apache.maven.surefire.report.CategorizedReportEntry;
-import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.ConsoleLogger;
+import org.apache.maven.surefire.report.ConsoleOutputReceiver;
import org.apache.maven.surefire.report.PojoStackTraceWriter;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.ReporterException;
@@ -110,17 +109,19 @@ public class ForkingRunListenerTest
standardTestRun.assertExpected( MockReporter.TEST_STARTING, expected );
}
- public void testStringTokenizer(){
- String test ="5,11,com.abc.TestClass,testMethod,null,22,,,";
+ public void testStringTokenizer()
+ {
+ String test = "5,11,com.abc.TestClass,testMethod,null,22,,,";
StringTokenizer tok = new StringTokenizer( test, "," );
- assertEquals( "5", tok.nextToken());
- assertEquals( "11", tok.nextToken());
- assertEquals( "com.abc.TestClass", tok.nextToken());
- assertEquals( "testMethod", tok.nextToken());
- assertEquals( "null", tok.nextToken());
- assertEquals( "22", tok.nextToken());
- assertFalse( tok.hasMoreTokens() );
+ assertEquals( "5", tok.nextToken() );
+ assertEquals( "11", tok.nextToken() );
+ assertEquals( "com.abc.TestClass", tok.nextToken() );
+ assertEquals( "testMethod", tok.nextToken() );
+ assertEquals( "null", tok.nextToken() );
+ assertEquals( "22", tok.nextToken() );
+ assertFalse( tok.hasMoreTokens() );
}
+
public void testSucceded()
throws ReporterException, IOException
{
@@ -217,7 +218,7 @@ public class ForkingRunListenerTest
forkStreamClient.consumeMultiLineContent( content.toString( "utf-8" ) );
- assertTrue ( testVmSystemProperties.size() > 1 );
+ assertTrue( testVmSystemProperties.size() > 1 );
}
public void testMultipleEntries()
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java Fri Jan 27 20:50:34 2012
@@ -51,7 +51,7 @@ public class RunEntryStatisticsMapTest
{
final RunEntryStatisticsMap runEntryStatisticsMap = RunEntryStatisticsMap.fromReader( getStatisticsFile() );
final List<?> list = Arrays.asList( new Class[]{ A.class, B.class, C.class } );
- final List<?> prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsByFailureFirst( list);
+ final List<?> prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsByFailureFirst( list );
assertEquals( A.class, prioritizedTestsClassRunTime.get( 0 ) );
assertEquals( C.class, prioritizedTestsClassRunTime.get( 1 ) );
assertEquals( B.class, prioritizedTestsClassRunTime.get( 2 ) );
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java Fri Jan 27 20:50:34 2012
@@ -47,7 +47,8 @@ public class ConsoleOutputFileReporterTe
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, testName + "-output.txt" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}
@@ -65,7 +66,8 @@ public class ConsoleOutputFileReporterTe
reporter.testSetCompleted( reportEntry );
File expectedReportFile = new File( reportDir, testName + "-" + suffixText + "-output.txt" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/FileReporterTest.java Fri Jan 27 20:50:34 2012
@@ -45,7 +45,8 @@ public class FileReporterTest
reporter.testSetStarting( reportEntry );
File expectedReportFile = new File( reportDir, testName + ".txt" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}
@@ -61,7 +62,8 @@ public class FileReporterTest
reporter.testSetStarting( reportEntry );
File expectedReportFile = new File( reportDir, testName + "-" + suffixText + ".txt" );
- assertTrue("Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist", expectedReportFile.exists() );
+ assertTrue( "Report file (" + expectedReportFile.getAbsolutePath() + ") doesn't exist",
+ expectedReportFile.exists() );
expectedReportFile.delete();
}