Author: dfabulich
Date: Wed Nov 21 16:52:50 2007
New Revision: 597279
URL: http://svn.apache.org/viewvc?rev=597279&view=rev
Log:
[SUREFIRE-52] Test for multiple test cases, which apparently used to have some
kind of cumulative behavior. Seems to be fixed now.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java
Added:
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=597279&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesTest.java
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+import java.io.File;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test basic default configuration, runs the JUnit 3 test in the src/test
directory.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Dan Fabulich</a>
+ *
+ */
+public class TwoTestCasesTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testDefaultConfiguration ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/junit-twoTestCases" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.executeGoal( "test" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, testDir );
+ }
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 21 16:52:50 2007
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml?rev=597279&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/pom.xml
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit-twoTestCases</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for two test cases</name>
+ <description>Test for two test cases</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java?rev=597279&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/BasicTest.java
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,66 @@
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+ TestSetup setup = new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+
+ return setup;
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java?rev=597279&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/TestTwo.java
Wed Nov 21 16:52:50 2007
@@ -0,0 +1,8 @@
+import junit.framework.TestCase;
+
+
+public class TestTwo
+ extends TestCase
+{
+ public void testTwo() {}
+}
