Author: brett
Date: Fri Aug 26 00:31:18 2005
New Revision: 240178
URL: http://svn.apache.org/viewcvs?rev=240178&view=rev
Log:
update inline with surefire plugin - *TestCase are included, Abstract*TestCase
are not
Added:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(contents, props changed)
- copied, changed from r239317,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
(contents, props changed)
- copied, changed from r239317,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
Removed:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
Modified:
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Fri Aug 26
00:31:18 2005
@@ -843,10 +843,12 @@
includes = new ArrayList();
includes.add( "**/*Test.java" );
+ includes.add( "**/*TestCase.java" );
excludes = new ArrayList();
excludes.add( "**/Abstract*Test.java" );
+ excludes.add( "**/Abstract*TestCase.java" );
String reportsDir = new File( basedir, "target/surefire-reports"
).getAbsolutePath();
Copied:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(from r239317,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java&r1=239317&r2=240178&rev=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTestCase.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Fri Aug 26 00:31:18 2005
@@ -30,7 +30,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl </a>
* @version $Id$
*/
-public abstract class MavenProjectTestCase
+public abstract class AbstractMavenProjectTestCase
extends PlexusTestCase
{
protected MavenProjectBuilder projectBuilder;
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.21
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Fri Aug 26 00:31:18 2005
@@ -19,7 +19,7 @@
import java.io.File;
public class MavenProjectTest
- extends MavenProjectTestCase
+ extends AbstractMavenProjectTestCase
{
public void testCopyConstructor() throws Exception
{
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Fri Aug 26 00:31:18 2005
@@ -22,7 +22,7 @@
import java.io.File;
public class ProjectBaseDirectoryAlignmentTest
- extends MavenProjectTestCase
+ extends AbstractMavenProjectTestCase
{
private String dir =
"src/test/resources/projects/base-directory-alignment/";
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
Fri Aug 26 00:31:18 2005
@@ -25,7 +25,7 @@
* @todo relocate to maven-artifact in entirety
*/
public class ProjectClasspathTest
- extends MavenProjectTestCase
+ extends AbstractMavenProjectTestCase
{
private String dir = "projects/scope/";
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
Fri Aug 26 00:31:18 2005
@@ -19,7 +19,7 @@
import org.apache.maven.model.Goal;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectTestCase;
+import org.apache.maven.project.AbstractMavenProjectTestCase;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
@@ -30,7 +30,7 @@
* @version $Id$
*/
public class CanonicalProjectBuilderTest
- extends MavenProjectTestCase
+ extends AbstractMavenProjectTestCase
{
public void testProjectBuilder()
throws Exception
Copied:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
(from r239317,
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java)
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java?p2=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java&p1=maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java&r1=239317&r2=240178&rev=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
Fri Aug 26 00:31:18 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.maven.project.MavenProjectTestCase;
+import org.apache.maven.project.AbstractMavenProjectTestCase;
import java.io.File;
@@ -24,8 +24,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id$
*/
-public abstract class ProjectInheritanceTestCase
- extends MavenProjectTestCase
+public abstract class AbstractProjectInheritanceTestCase
+ extends AbstractMavenProjectTestCase
{
protected String getTestSeries()
{
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.8
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
Fri Aug 26 00:31:18 2005
@@ -18,7 +18,7 @@
import org.apache.maven.model.MailingList;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.inheritance.ProjectInheritanceTestCase;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
/**
* A test which demonstrates maven's recursive inheritance where
@@ -33,7 +33,7 @@
* @version $Id$
*/
public class ProjectInheritanceTest
- extends ProjectInheritanceTestCase
+ extends AbstractProjectInheritanceTestCase
{
// ----------------------------------------------------------------------
//
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
Fri Aug 26 00:31:18 2005
@@ -17,7 +17,7 @@
*/
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.inheritance.ProjectInheritanceTestCase;
+import org.apache.maven.project.inheritance.AbstractProjectInheritanceTestCase;
/**
* A test which demonstrates maven's recursive inheritance where
@@ -28,7 +28,7 @@
* @version $Id$
*/
public class ProjectInheritanceTest
- extends ProjectInheritanceTestCase
+ extends AbstractProjectInheritanceTestCase
{
// ----------------------------------------------------------------------
//
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java?rev=240178&r1=240177&r2=240178&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Fri Aug 26 00:31:18 2005
@@ -18,7 +18,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.project.MavenProjectTestCase;
+import org.apache.maven.project.AbstractMavenProjectTestCase;
import java.io.FileReader;
import java.io.Reader;
@@ -29,7 +29,7 @@
* @version $Id$
*/
public class DefaultModelValidatorTest
- extends MavenProjectTestCase
+ extends AbstractMavenProjectTestCase
{
private Model model;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
