Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 73754 invoked from network); 19 Dec 2007 21:29:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Dec 2007 21:29:43 -0000 Received: (qmail 68911 invoked by uid 500); 19 Dec 2007 21:29:32 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 68888 invoked by uid 500); 19 Dec 2007 21:29:32 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Received: (qmail 68877 invoked by uid 99); 19 Dec 2007 21:29:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2007 13:29:32 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2007 21:29:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8CC101A9832; Wed, 19 Dec 2007 13:29:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r605710 - in /maven/surefire/trunk/surefire-integration-tests: ./ src/test/java/org/apache/maven/surefire/its/ Date: Wed, 19 Dec 2007 21:29:10 -0000 To: surefire-commits@maven.apache.org From: dfabulich@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071219212915.8CC101A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dfabulich Date: Wed Dec 19 13:29:07 2007 New Revision: 605710 URL: http://svn.apache.org/viewvc?rev=605710&view=rev Log: Ripped out unnecessary dependency on maven-integration-test-helper SNAPSHOT. Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/pom.xml (original) +++ maven/surefire/trunk/surefire-integration-tests/pom.xml Wed Dec 19 13:29:07 2007 @@ -58,28 +58,10 @@ 1.0 - org.apache.maven.its - maven-integration-test-helper - 1.0-SNAPSHOT - - junit junit 3.8.1 test - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository - - false - - - true - - - Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractTestCaseTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,11 @@ package org.apache.maven.surefire.its; -import java.io.File; - -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test files with "Abstract" in their name that aren't really abstract, * and abstract classes that don't say "Abstract" in their name @@ -14,7 +14,7 @@ * */ public class AbstractTestCaseTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testAbstractTestCase () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AdditionalClasspathTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test additionalClasspathElements * @@ -13,7 +14,7 @@ * */ public class AdditionalClasspathTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testAdditionalClasspath () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,14 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Test report aggregation * @@ -15,7 +16,7 @@ * */ public class AggregateReportTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testAggregateReport () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ArgLineTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test passing an argLine parameter * @@ -13,7 +14,7 @@ * */ public class ArgLineTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testArgLine () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test basic default configuration, runs the JUnit 3 test in the src/test directory. * @@ -13,7 +14,7 @@ * */ public class DefaultConfigurationTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testDefaultConfiguration () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/EnvironmentVariableTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test basic default configuration, runs the JUnit 3 test in the src/test directory. * @@ -13,7 +14,7 @@ * */ public class EnvironmentVariableTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testEnvironmentVariable () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java Wed Dec 19 13:29:07 2007 @@ -1,5 +1,12 @@ package org.apache.maven.surefire.its; + +import junit.framework.TestCase; +import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.apache.maven.reporting.MavenReportException; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -7,12 +14,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; -import org.apache.maven.it.VerificationException; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.apache.maven.reporting.MavenReportException; - /** * Test forkMode * @@ -20,7 +21,7 @@ * */ public class ForkModeTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testForkModeAlways () throws Exception { Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.List; - import junit.framework.Assert; - import org.apache.maven.plugins.surefire.report.ReportTestSuite; import org.apache.maven.plugins.surefire.report.SurefireReportParser; import org.apache.maven.reporting.MavenReportException; + +import java.io.File; +import java.util.List; public class HelperAssertions { Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core * @@ -13,7 +14,7 @@ * */ public class JUnit44Dep - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testJUnit44Dep () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,14 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Basic suite test using all known versions of JUnit 4.x * @@ -15,7 +16,7 @@ * */ public class Junit4VersionsTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void test40 () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java Wed Dec 19 13:29:07 2007 @@ -1,6 +1,7 @@ package org.apache.maven.surefire.its; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; + +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; @@ -14,7 +15,7 @@ * */ public class PlexusConflictTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testPlexusConflict () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test aggregator as a sibling to child modules; invokes modules as "../child" * @@ -13,7 +14,7 @@ * */ public class SiblingAggregatorTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testSiblingAggregator () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test Surefire-146 (forkMode=pertest fails to call setUp) * @@ -13,7 +14,7 @@ * */ public class Surefire146ForkPerTestNoSetupTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testForkPerTestNoSetup () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test charset provider (SUREFIRE-162) * @@ -13,7 +14,7 @@ * */ public class Surefire162CharsetProviderTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testCharsetProvider () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes) * @@ -13,7 +14,7 @@ * */ public class Surefire224WellFormedXmlFailuresTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testWellFormedXmlFailures () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test Surefire-376 (TestNG @AfterSuite failures are ignored) * @@ -13,7 +14,7 @@ * */ public class Surefire376TestNgAfterSuiteFailure - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testAfterSuiteFailure () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run). * @@ -13,7 +14,7 @@ * */ public class Surefire377TestNgAndJUnitTogetherTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgAndJUnitTogether () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test JUnit test that contains inner classes * @@ -13,7 +14,7 @@ * */ public class Surefire42NotExtendingTestCase - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testInnerClass () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test JUnit test that contains inner classes * @@ -13,7 +14,7 @@ * */ public class Surefire44InnerClassTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testInnerClass () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java Wed Dec 19 13:29:07 2007 @@ -1,12 +1,13 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; + /** * Test system properties * @@ -14,7 +15,7 @@ * */ public class SystemPropertiesTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testSystemProperties () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java Wed Dec 19 13:29:07 2007 @@ -1,14 +1,15 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Test failIfNoTests * @@ -16,7 +17,7 @@ * */ public class TestFailIfNoTests - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testFailIfNoTests () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java Wed Dec 19 13:29:07 2007 @@ -1,16 +1,17 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; import org.apache.maven.reporting.MavenReportException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + /** * Test failIfNoTests with various forkModes. * @@ -18,7 +19,7 @@ * */ public class TestFailIfNoTestsForkMode - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testFailIfNoTestsForkModeAlways () throws Exception { Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test project using JUnit4.4 (including Hamcrest extensions) * @@ -13,7 +14,7 @@ * */ public class TestJUnit44Hamcrest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testJUnit44Hamcrest () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test JUnit 4 tests marked with "Ignore" attribute * @@ -13,7 +14,7 @@ * */ public class TestJunit4Ignore - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testJunit4Ignore () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test @BeforeMethod annotation on TestNg suite * @@ -13,7 +14,7 @@ * */ public class TestNgBeforeMethod - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgBeforeMethod () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Wed Dec 19 13:29:07 2007 @@ -1,12 +1,13 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; -import org.apache.maven.it.Verifier; +import junit.framework.TestCase; import org.apache.maven.it.VerificationException; +import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test failures in @BeforeMethod annotation on TestNg suite * @@ -14,7 +15,7 @@ * */ public class TestNgBeforeMethodFailure - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgBeforeMethodFailure () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test TestNG groups, together with TestNG parallelism * @@ -13,7 +14,7 @@ * */ public class TestNgGroupThreadParallel - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgGroupThreadParallel () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgJdk14Test.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test TestNG running in the JDK 1.4 JavaDoc style * @@ -13,7 +14,7 @@ * */ public class TestNgJdk14Test - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgJdk14 () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgPathWithSpaces.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,12 @@ package org.apache.maven.surefire.its; - -import java.io.File; - -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test TestNG test in a directory with spaces * @@ -15,7 +14,7 @@ * */ public class TestNgPathWithSpaces - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgTestWithSpaces () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgReportTest.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; - import junit.framework.Assert; - -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test surefire-report on TestNG test * @@ -15,7 +14,7 @@ * */ public class TestNgReportTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgReport () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test simple TestNG suite XML file * @@ -13,7 +14,7 @@ * */ public class TestNgSuiteXmlTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTestNgSuiteXml () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgVersionsTest.java Wed Dec 19 13:29:07 2007 @@ -1,13 +1,14 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Basic suite test using all known versions of TestNG * @@ -15,7 +16,7 @@ * */ public class TestNgVersionsTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void test47 () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleTest.java Wed Dec 19 13:29:07 2007 @@ -1,14 +1,15 @@ package org.apache.maven.surefire.its; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Test running a single test with -Dtest=BasicTest * @@ -16,7 +17,7 @@ * */ public class TestSingleTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testSingleTest () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestUseIsolatedClassLoader.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test useSystemClassLoader option * @@ -13,7 +14,7 @@ * */ public class TestUseIsolatedClassLoader - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testUseSystemClassLoader () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTest.java Wed Dec 19 13:29:07 2007 @@ -1,12 +1,13 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test * @@ -14,7 +15,7 @@ * */ public class TimeoutForkedTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTimeoutForked () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java Wed Dec 19 13:29:07 2007 @@ -1,11 +1,12 @@ package org.apache.maven.surefire.its; -import java.io.File; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; +import java.io.File; + /** * Test running two test cases; confirms reporting works correctly * @@ -13,7 +14,7 @@ * */ public class TwoTestCasesTest - extends AbstractMavenIntegrationTestCase + extends TestCase { public void testTwoTestCases () throws Exception Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java?rev=605710&r1=605709&r2=605710&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirTest.java Wed Dec 19 13:29:07 2007 @@ -1,7 +1,7 @@ package org.apache.maven.surefire.its; -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import junit.framework.TestCase; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.FileUtils; import org.apache.maven.it.util.ResourceExtractor; @@ -17,7 +17,7 @@ * */ public class UmlautDirTest - extends AbstractMavenIntegrationTestCase + extends TestCase { File testDir;