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/06 16:04:26 UTC
svn commit: r1228222 [1/3] - in
/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its:
./ fixture/ jiras/ misc/
Author: krosenvold
Date: Fri Jan 6 15:04:22 2012
New Revision: 1228222
URL: http://svn.apache.org/viewvc?rev=1228222&view=rev
Log:
o Made all integration tests use same fluent api base class
There can be only one.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestCase.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/ReportTestSuite.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireIntegrationTestCase.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireReportParser.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/TestSuiteXmlParser.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire141PluggableProvidersIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire141PluggableProvidersIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire146ForkPerTestNoSetupIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire162CharsetProviderIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire224WellFormedXmlFailuresIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire257NotRerunningTestsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire34SecurityManagerIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire34SecurityManagerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire376TestNgAfterSuiteFailureIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire377TestNgAndJUnitTogetherIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire408ManualProviderSelectionIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire408ManualProviderSelectionIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire42NotExtendingTestCaseIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire44InnerClassTestIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire500PuzzlingErrorIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire510TestClassPathForkModesIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire510TestClassPathForkModesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java (with props)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire613TestCountInParallelIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire613TestCountInParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire621TestCountingJunit3InParallelIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire621TestCountingJunit3InParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire628ConsoleOutputBeforeAndAfterClassIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire634UnsettableSystemPropertiesWarningIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire634UnsettableSystemPropertiesWarningIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire673MockitoIT.java
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenErrorsIT.java
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire674BuildFailingWhenFailsafeErrorsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire685CommaSeparatedIncludesIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire697NiceSummaryIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire705ParallelForkTimeoutIT.java
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire733AllOverrridesCapturedIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire735ForkFailWithRedirectConsoleOutputIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire747MethodParallelWithSuiteCountIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire763EnvironmentForkModeIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772BothReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoSurefireReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772SpecifiedReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire801ForkModeNoneClassLoaderIT.java (contents, props changed)
- copied, changed from r1227906, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java
Removed:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire141PluggableProvidersIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire257NotRerunningTestsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire34SecurityManagerIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire408ManualProviderSelectionIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTestIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire510TestClassPathForkModesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire613TestCountInParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire621TestCountingJunit3InParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire628ConsoleOutputBeforeAndAfterClassIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire634UnsettableSystemPropertiesWarningIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire673MockitoIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire674BuildFailingWhenFailsafeErrorsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire685CommaSeparatedIncludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire697NiceSummaryIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire705ParallelForkTimeoutIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire733AllOverrridesCapturedIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire735ForkFailWithRedirectConsoleOutputIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire747MethodParallelWithSuiteCountIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire801ForkModeNoneClassLoaderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireVerifierTestClass2.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/HelperAssertions.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestCase.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/ReportTestSuite.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire740TruncatedCommaIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire763EnvironmentForkModeIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772BothReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoFailsafeReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772NoSurefireReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/Surefire772SpecifiedReportsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/SurefireReportParser.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/misc/TestSuiteXmlParser.java
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.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/ArgLineIT.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/CheckTestNgBeforeMethodFailureIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.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/CheckTestNgGroupThreadParallelIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.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/CheckTestNgPathWithSpacesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.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/CheckTestNgSuiteXmlSingleIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.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/EnvironmentVariableIT.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/IncludesExcludesIT.java
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.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/JUnit4ForkAlwaysStaticInitPollutionIT.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/PlainOldJavaClasspathIT.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/PojoSimpleIT.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/TestMethodPatternIT.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/UseIsolatedClassLoaderIT.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/WorkingDirectoryMissingIT.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/OutputValidator.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/TestFile.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test files with "Abstract" in their name that aren't really abstract,
@@ -29,7 +29,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AbstractTestCaseIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testAbstractTestCase()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test additionalClasspathElements
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AdditionalClasspathIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testAdditionalClasspath()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java Fri Jan 6 15:04:22 2012
@@ -20,11 +20,9 @@ package org.apache.maven.surefire.its;
*/
import java.io.File;
-import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
-import org.apache.maven.surefire.its.fixture.TestFile;
-import org.apache.maven.surefire.its.misc.HelperAssertions;
+
+import org.apache.maven.surefire.its.fixture.*;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
/**
* Test report aggregation
@@ -33,7 +31,7 @@ import org.apache.maven.surefire.its.mis
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class AggregateReportIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testAggregateReport()
@@ -49,6 +47,6 @@ public class AggregateReportIT
testDirs[0] = new File( outputValidator.getBaseDir(), "child1" );
testDirs[1] = new File( outputValidator.getBaseDir(), "child2" );
IntegrationTestSuiteResults suite = HelperAssertions.parseTestResults( testDirs );
- HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, suite );
+ HelperAssertions.assertTestSuiteResults(2, 0, 1, 0, suite);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test passing an argLine parameter
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ArgLineIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testArgLine()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckSingleTestIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testSingleTest()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test failIfNoTests with various forkModes.
@@ -29,14 +29,13 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsForkModeIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testFailIfNoTestsForkModeAlways()
{
doTest( unpack().forkAlways().failIfNoTests( true ) );
}
-
public void testFailIfNoTestsForkModeNever()
{
doTest( unpack().forkNever().failIfNoTests( true ) );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestFailIfNoTestsIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
private SurefireLauncher unpack()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodFailureIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test failures in @BeforeMethod annotation on TestNg suite
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodFailureIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgBeforeMethodFailure()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgBeforeMethodIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test @BeforeMethod annotation on TestNg suite
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgBeforeMethodIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgBeforeMethod()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgExecuteErrorIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testExecuteError()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgGroupThreadParallelIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test TestNG groups, together with TestNG parallelism
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgGroupThreadParallelIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgGroupThreadParallel()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgJdk14IT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test TestNG running in the JDK 1.4 JavaDoc style
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgJdk14IT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public CheckTestNgJdk14IT()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
@@ -29,7 +29,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgListenerReporterIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgListenerReporter()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgPathWithSpacesIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test TestNG test in a directory with spaces
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgPathWithSpacesIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgTestWithSpaces()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test surefire-report on TestNG test
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgReportTestIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgReport()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test simple TestNG suite XML file
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNgSuiteXml()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlSingleIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class CheckTestNgSuiteXmlSingleIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testTestNGSuite()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Basic suite test using all known versions of TestNG. Used for regression testing Surefire against old versions.
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class CheckTestNgVersionsIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void test47()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClassPathOrderIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test for checking the order of class path elements
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ClassPathOrderIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testClassPathOrder()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathFilteringIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test additionalClasspathElements
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author pgier
*/
public class ClasspathFilteringIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testAdditionalClasspath()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ClasspathScopeFilteringIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test additionalClasspathElements
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class ClasspathScopeFilteringIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testAdditionalClasspath()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ConsoleOutputIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ConsoleOutputIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testProperNewlines()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class DefaultConfigurationIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testDefaultConfiguration()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test basic default configuration, runs the JUnit 3 test in the src/test directory.
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class EnvironmentVariableIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testEnvironmentVariable()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Asserts proper behaviour of console output when forking
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
private SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ForkConsoleOutputWithErrorsIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testXmlFileContainsConsoleOutput()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -30,7 +30,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class ForkModeIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testForkModeAlways()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test include/exclude patterns.
@@ -30,7 +30,7 @@ import org.apache.maven.surefire.its.fix
* @version $Id$
*/
public class IncludesExcludesIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
private SurefireLauncher unpack()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44HamcrestIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test project using JUnit4.4 (including Hamcrest extensions)
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit44HamcrestIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testJUnit44Hamcrest()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java Fri Jan 6 15:04:22 2012
@@ -23,10 +23,10 @@ import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
public class JUnit47RedirectOutputIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testPrintSummaryTrueWithRedirect()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java Fri Jan 6 15:04:22 2012
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.its;
import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test project using "groups" support
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:krosenvold@apache.org">Kristian Rosenvold</a>
*/
public class JUnit48TestCategoriesIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testCategoriesAB()
throws Exception
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -27,7 +27,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnit4ForkAlwaysStaticInitPollutionIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testJunit4Ignore()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java Fri Jan 6 15:04:22 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* JUnit4 RunListener Integration Test.
@@ -29,7 +29,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
*/
public class JUnit4RunListenerIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public JUnit4RunListenerIT()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
@@ -27,55 +28,50 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class JUnitDepIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
- public JUnitDepIT()
+ public SurefireLauncher unpack()
{
- super( "/junit44-dep" );
+ return unpack( "/junit44-dep" );
}
public void testJUnit44Dep()
throws Exception
{
- debugLogging();
- addGoal( "-Djunit-dep.version=4.4" );
- executeTest();
-
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
- verifyTextInLog( "surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
+ unpack().debugLogging().
+ addGoal( "-Djunit-dep.version=4.4" )
+ .executeTest()
+ .verifyErrorFree(1)
+ .verifyTextInLog("surefire-junit4"); // Ahem. Will match on the 4.7 provider too
}
public void testJUnit44DepWithSneaky381()
throws Exception
{
- debugLogging();
- activateProfile( "provided381" );
- addGoal( "-Djunit-dep.version=4.4" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().debugLogging().
+ addGoal( "-Djunit-dep.version=4.4" )
+ .activateProfile("provided381")
+ .executeTest()
+ .verifyErrorFree(1);
}
public void testJUnit47Dep()
throws Exception
{
- debugLogging();
- addGoal( "-Djunit-dep.version=4.7" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
- verifyTextInLog( "surefire-junit47" );
+ unpack().debugLogging().
+ addGoal( "-Djunit-dep.version=4.7" )
+ .executeTest()
+ .verifyErrorFree(1).
+ verifyTextInLog("surefire-junit47");
}
public void testJUnit48Dep()
throws Exception
{
- debugLogging();
- addGoal( "-Djunit-dep.version=4.8" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
- verifyTextInLog( "surefire-junit47" );
+ unpack().debugLogging().
+ addGoal( "-Djunit-dep.version=4.8" )
+ .executeTest()
+ .verifyErrorFree(1).
+ verifyTextInLog("surefire-junit47");
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -27,22 +27,14 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class Junit47concurrencyIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public Junit47concurrencyIT()
- {
- super( "/concurrentjunit47" );
- }
-
public void test47()
throws Exception
{
// todo: Align with others
- addGoal( "-DjunitVersion=4.7" );
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack("concurrentjunit47").addD("junitVersion", "4.7").setJUnitVersion("4.7").executeTest()
+ .verifyErrorFree(1);
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4IgnoreIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public void testJunit4Ignore()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java Fri Jan 6 15:04:22 2012
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.SurefireLauncher;
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass2;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Basic suite test using all known versions of JUnit 4.x
@@ -28,7 +28,7 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class Junit4VersionsIT
- extends SurefireVerifierTestClass2
+ extends SurefireIntegrationTestCase
{
public Junit4VersionsIT()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* SUREFIRE-621 Asserts proper test counts when running junit 3 tests in parallel
@@ -27,19 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class NoRunnableTestsInClassIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public NoRunnableTestsInClassIT()
- {
- super( "/norunnableTests" );
- }
-
- public void testJunit3ParallelBuildResultCount()
- throws Exception
+ public void testJunit3ParallelBuildResultCount()
{
- failNever();
- execute( "test" );
- verifyTextInLog( "No tests found in junit.norunnabletests.BasicTest" );
+ unpack("norunnableTests").failNever().executeTest().
+ verifyTextInLog("No tests found in junit.norunnabletests.BasicTest");
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlainOldJavaClasspathIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test useManifestOnlyJar option
@@ -27,19 +27,10 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class PlainOldJavaClasspathIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public PlainOldJavaClasspathIT()
- {
- super( "/plain-old-java-classpath" );
- }
-
public void testPlainOldJavaClasspath()
- throws Exception
{
- this.executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ executeErrorFreeTest("plain-old-java-classpath", 1);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test library using a conflicting version of plexus-utils
@@ -27,28 +28,19 @@ import org.apache.maven.surefire.its.fix
* @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
*/
public class PlexusConflictIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public PlexusConflictIT()
- {
- super( "/plexus-conflict" );
- }
-
public void testPlexusConflict()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().executeTest().verifyErrorFree(1);
}
public void testPlexusConflictIsolatedClassLoader()
- throws Exception
{
- executeTest();
- verifyErrorFreeLog();
- addD( "surefire.useSystemClassLoader", "false" );
- assertTestSuiteResults( 1, 0, 0, 0 );
+ unpack().addD( "surefire.useSystemClassLoader", "false" ).executeTest().verifyErrorFree(1);
+ }
+
+ private SurefireLauncher unpack() {
+ return unpack("/plexus-conflict");
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test support for POJO tests.
@@ -27,20 +27,11 @@ import org.apache.maven.surefire.its.fix
* @author Benjamin Bentmann
*/
public class PojoSimpleIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
-
- public PojoSimpleIT()
- {
- super( "/pojo-simple" );
- }
-
public void testit()
- throws Exception
{
- executeTest();
- assertTestSuiteResults( 2, 0, 1, 0);
+ unpack("pojo-simple").executeTest().assertTestSuiteResults(2, 0, 1, 0);
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java?rev=1228222&r1=1228221&r2=1228222&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java Fri Jan 6 15:04:22 2012
@@ -19,7 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireVerifierTestClass;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Asserts proper behaviour of console output when forking
@@ -28,24 +29,17 @@ import org.apache.maven.surefire.its.fix
* @author Kristian Rosenvold
*/
public class ReportersIT
- extends SurefireVerifierTestClass
+ extends SurefireIntegrationTestCase
{
-
- public ReportersIT()
- {
- super( "/reporters" );
- }
-
public void testRedirectOutputTestNg()
- throws Exception
{
- redirectToFile( true );
- printSummary( true );
-
- execute( "test" );
- assertPresent( getSurefireReportsFile( "TestSuite-output.txt" ) );
- assertPresent( getSurefireReportsFile( "TEST-TestSuite.xml" ) );
- assertPresent( getSurefireReportsFile( "TestSuite.txt" ) );
+ OutputValidator reporters = unpack("reporters").
+ redirectToFile(true)
+ .printSummary(true).executeTest();
+
+ reporters.getSurefireReportsFile( "TestSuite-output.txt" ).assertFileExists();
+ reporters.getSurefireReportsFile( "TEST-TestSuite.xml" ).assertFileExists();
+ reporters.getSurefireReportsFile( "TestSuite.txt" ).assertFileExists();
}
}