You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/06/24 02:10:19 UTC
cvs commit: maven-components/maven-core/src/test/resources/projects/recursive-inheritance/f project.properties project.xml
jvanzyl 2004/06/23 17:10:19
Modified: maven-core m2-bootstrap.sh
maven-core/src/test/java/org/apache/maven MavenTest.java
maven-core/src/test/java/org/apache/maven/artifact/collector
DefaultArtifactCollectorTest.java
maven-core/src/test/java/org/apache/maven/artifact/installer
DefaultArtifactInstallerTest.java
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
maven-core/src/test/java/org/apache/maven/plugin
OgnlProjectValueExtractorTest.java PluginTest.java
maven-core/src/test/java/org/apache/maven/project
AbstractProjectTestCase.java
ProjectBaseDirectoryAlignmentTest.java
maven-core/src/test/java/org/apache/maven/project/validation
DefaultModelValidatorTest.java
Added: maven-core/src/test/java/org/apache/maven MavenTestCase.java
maven-core/src/test/java/org/apache/maven/project/inheritance
ProjectInheritanceTestCase.java
maven-core/src/test/resources/inheritance-repo/t00/maven/poms
p0-1.0.pom p1-1.0.pom p2-1.0.pom p3-1.0.pom
p4-1.0.pom
Removed: maven-core/src/test/java/org/apache/maven
MavenPlexusComponentTestBase.java
maven-core/src/test/resources/projects/recursive-inheritance
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/a
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/a/aa
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/b
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/b/bb
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/b/bb/bbb
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/c
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/c/cc
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/c/cc/ccc
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/d
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/e
project.properties project.xml
maven-core/src/test/resources/projects/recursive-inheritance/f
project.properties project.xml
Log:
o cleaning up the tests
o starting a new series of tests for inheritance which use the new v4 POM way
of declaring parents.
Revision Changes Path
1.3 +7 -16 maven-components/maven-core/m2-bootstrap.sh
Index: m2-bootstrap.sh
===================================================================
RCS file: /home/cvs/maven-components/maven-core/m2-bootstrap.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- m2-bootstrap.sh 19 Jun 2004 18:49:00 -0000 1.2
+++ m2-bootstrap.sh 24 Jun 2004 00:10:18 -0000 1.3
@@ -32,31 +32,22 @@
fi
cp src/bin/* ${DIST}/bin > /dev/null 2>&1
+
libs=`cat bootstrap.deps`
cp ../maven-model/maven.xsd ${DIST}
-core="\
-plexus/jars/plexus-0.14-SNAPSHOT.jar \
-classworlds/jars/classworlds-1.1-SNAPSHOT.jar \
-xpp3/jars/xpp3-1.1.3.3.jar \
-xstream/jars/xstream-1.0-SNAPSHOT.jar"
-
-for i in $core
-do
- cp "$repoLocal/$i" ${DIST}/core
-done
-
for i in $libs
do
cp "$repoLocal/$i" ${DIST}/lib
done
-rm -f ${DIST}/lib/plexus-0.14-SNAPSHOT.jar > /dev/null 2>&1
-rm -f ${DIST}/lib/classworlds*.jar > /dev/null 2>&1
-rm -f ${DIST}/lib/xpp3*.jar > /dev/null 2>&1
-rm -f ${DIST}/lib/xstream*.jar > /dev/null 2>&1
-rm -f ${DIST}/lib/junit*.jar > /dev/null 2>&1
+for i in `cat m2-core-plexus.txt`
+do
+ cp "$repoLocal/$i" ${DIST}/core
+ j=`echo $i | sed 's/^.*\///'`
+ rm -f ${DIST}/lib/$j > /dev/null 2>&1
+done
# Install parent plugin model
1.2 +2 -7 maven-components/maven-core/src/test/java/org/apache/maven/MavenTest.java
Index: MavenTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTest.java 11 Jun 2004 15:11:55 -0000 1.1
+++ MavenTest.java 24 Jun 2004 00:10:18 -0000 1.2
@@ -28,13 +28,8 @@
* @version $Id$
*/
public class MavenTest
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
- public MavenTest( String name )
- {
- super( name );
- }
-
public void testMaven()
throws Exception
{
1.1 maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
Index: MavenTestCase.java
===================================================================
package org.apache.maven;
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.classworlds.ClassWorld;
import org.codehaus.classworlds.ClassRealm;
import java.io.InputStream;
import java.io.File;
/**
*
*
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
*
* @version $Id: MavenTestCase.java,v 1.1 2004/06/24 00:10:18 jvanzyl Exp $
*/
public class MavenTestCase
extends PlexusTestCase
{
protected void setUp()
throws Exception
{
super.setUp();
File pluginsDirectory = new File( basedir, "target/maven.home/plugins" );
pluginsDirectory.mkdirs();
}
// We want to provide an environment, for all the maven components being tested, that
// mocks for standard conditions of execution. Which means setting up some values like:
//
// maven.home
// maven.home.local
//
// And using the same plexus configuration for testing that will be used during the
// normal execution of maven by users.
protected void customizeContext()
throws Exception
{
ClassWorld classWorld = new ClassWorld();
ClassRealm rootClassRealm = classWorld.newRealm( "root", Thread.currentThread().getContextClassLoader() );
getContainer().addContextValue( "rootClassRealm", rootClassRealm );
getContainer().addContextValue( "maven.home", new File( basedir, "target/maven.home" ).getPath() );
getContainer().addContextValue( "maven.home.local", new File( basedir, "target/maven.home.local" ).getPath() );
}
public InputStream getCustomConfiguration()
throws Exception
{
ClassLoader cl = Thread.currentThread().getContextClassLoader();
InputStream is = cl.getResourceAsStream( "org/apache/maven/plexus.xml" );
return is;
}
}
1.2 +1 -6 maven-components/maven-core/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java
Index: DefaultArtifactCollectorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/artifact/collector/DefaultArtifactCollectorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactCollectorTest.java 11 Jun 2004 15:11:56 -0000 1.1
+++ DefaultArtifactCollectorTest.java 24 Jun 2004 00:10:18 -0000 1.2
@@ -36,11 +36,6 @@
private MavenProjectBuilder projectBuilder;
- public DefaultArtifactCollectorTest( String testName )
- {
- super( testName );
- }
-
public void setUp()
throws Exception
{
1.2 +1 -6 maven-components/maven-core/src/test/java/org/apache/maven/artifact/installer/DefaultArtifactInstallerTest.java
Index: DefaultArtifactInstallerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/artifact/installer/DefaultArtifactInstallerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactInstallerTest.java 17 Jun 2004 22:04:37 -0000 1.1
+++ DefaultArtifactInstallerTest.java 24 Jun 2004 00:10:18 -0000 1.2
@@ -34,11 +34,6 @@
public class DefaultArtifactInstallerTest
extends AbstractProjectTestCase
{
- public DefaultArtifactInstallerTest( String testName )
- {
- super( testName );
- }
-
public void testArtifactInstaller()
throws Exception
{
1.2 +3 -8 maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java
Index: MavenLifecycleManagerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenLifecycleManagerTest.java 11 Jun 2004 15:11:55 -0000 1.1
+++ MavenLifecycleManagerTest.java 24 Jun 2004 00:10:18 -0000 1.2
@@ -1,6 +1,6 @@
package org.apache.maven.lifecycle;
-import org.apache.maven.MavenPlexusComponentTestBase;
+import org.apache.maven.MavenTestCase;
import java.util.List;
@@ -9,13 +9,8 @@
* @version $Id$
*/
public class MavenLifecycleManagerTest
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
- public MavenLifecycleManagerTest( String name )
- {
- super( name );
- }
-
public void testMavenLifecycleManager()
throws Exception
{
1.6 +3 -8 maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java
Index: OgnlProjectValueExtractorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/OgnlProjectValueExtractorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OgnlProjectValueExtractorTest.java 16 Jun 2004 05:39:03 -0000 1.5
+++ OgnlProjectValueExtractorTest.java 24 Jun 2004 00:10:18 -0000 1.6
@@ -4,7 +4,7 @@
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.MavenPlexusComponentTestBase;
+import org.apache.maven.MavenTestCase;
import java.io.File;
import java.util.HashMap;
@@ -15,13 +15,8 @@
* @version $Id$
*/
public class OgnlProjectValueExtractorTest
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
- public OgnlProjectValueExtractorTest( String name )
- {
- super( name );
- }
-
private MavenProject project;
protected void setUp()
1.3 +3 -8 maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java
Index: PluginTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/plugin/PluginTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginTest.java 17 Jun 2004 00:07:23 -0000 1.2
+++ PluginTest.java 24 Jun 2004 00:10:18 -0000 1.3
@@ -17,7 +17,7 @@
*/
import org.apache.maven.MavenCore;
-import org.apache.maven.MavenPlexusComponentTestBase;
+import org.apache.maven.MavenTestCase;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -35,16 +35,11 @@
* @version $Id$
*/
public class PluginTest
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
PluginDescriptorBuilder builder = new PluginDescriptorBuilder();
PluginManager pluginMM;
-
- public PluginTest( String name )
- {
- super( name );
- }
protected void setUp()
throws Exception
1.4 +2 -7 maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
Index: AbstractProjectTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProjectTestCase.java 19 Jun 2004 20:20:54 -0000 1.3
+++ AbstractProjectTestCase.java 24 Jun 2004 00:10:18 -0000 1.4
@@ -3,21 +3,16 @@
import java.io.File;
import java.io.InputStream;
-import org.apache.maven.MavenPlexusComponentTestBase;
+import org.apache.maven.MavenTestCase;
import org.codehaus.plexus.util.FileUtils;
public class AbstractProjectTestCase
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
protected MavenProjectBuilder projectBuilder;
private String localRepository = System.getProperty( "basedir" ) + "/target/test-classes/local-repo";
-
- public AbstractProjectTestCase( String testName )
- {
- super( testName );
- }
public InputStream getCustomConfiguration()
throws Exception
1.4 +1 -6 maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
Index: ProjectBaseDirectoryAlignmentTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectBaseDirectoryAlignmentTest.java 23 Jun 2004 15:16:17 -0000 1.3
+++ ProjectBaseDirectoryAlignmentTest.java 24 Jun 2004 00:10:18 -0000 1.4
@@ -9,12 +9,7 @@
extends AbstractProjectTestCase
{
private String dir = "src/test/resources/projects/base-directory-alignment/";
-
- public ProjectBaseDirectoryAlignmentTest( String testName )
- {
- super( testName );
- }
-
+
public void testProjectDirectoryBaseDirectoryAlignment()
throws Exception
{
1.1 maven-components/maven-core/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
Index: ProjectInheritanceTestCase.java
===================================================================
/*
* CopyrightPlugin (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.project.inheritance;
import org.apache.maven.MavenTestCase;
import org.apache.maven.model.MailingList;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.MavenProject;
import java.io.File;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: ProjectInheritanceTestCase.java,v 1.1 2004/06/24 00:10:18 jvanzyl Exp $
*/
public abstract class ProjectInheritanceTestCase
extends MavenTestCase
{
protected MavenProjectBuilder projectBuilder;
protected String getTestSeries()
{
String className = getClass().getPackage().getName();
return className.substring( className.lastIndexOf( "." ) + 1 );
}
protected void setUp()
throws Exception
{
super.setUp();
projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
System.setProperty( "maven.repo.local", getLocalRepository() );
}
protected String getLocalRepository()
{
return new File( basedir, "src/test/resources/inheritance-repo/" + getTestSeries() ).getPath();
}
protected File projectFile( String name )
{
File f = new File( "src/test/resources/inheritance-repo/" + getTestSeries() + "/maven/poms", name + "-1.0.pom" );
return new File( basedir, f.getPath() );
}
}
1.2 +3 -8 maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java
Index: DefaultModelValidatorTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/project/validation/DefaultModelValidatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultModelValidatorTest.java 19 Jun 2004 20:20:54 -0000 1.1
+++ DefaultModelValidatorTest.java 24 Jun 2004 00:10:18 -0000 1.2
@@ -7,7 +7,7 @@
import java.io.FileReader;
import java.io.Reader;
-import org.apache.maven.MavenPlexusComponentTestBase;
+import org.apache.maven.MavenTestCase;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
@@ -16,16 +16,11 @@
* @version $Id$
*/
public class DefaultModelValidatorTest
- extends MavenPlexusComponentTestBase
+ extends MavenTestCase
{
private Model model;
private ModelValidator validator;
-
- public DefaultModelValidatorTest( String testName )
- {
- super( testName );
- }
public void testMissingArtifactId()
throws Exception
1.1 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p0-1.0.pom
Index: p0-1.0.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<groupId>maven</groupId>
<artifactId>p0</artifactId>
<name>p0</name>
<version>1.0</version>
<organization>
<name>Codehaus</name>
</organization>
</project>
1.1 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p1-1.0.pom
Index: p1-1.0.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>p0</artifactId>
<version>1.0</version>
</parent>
<groupId>maven</groupId>
<artifactId>p1</artifactId>
<name>p1</name>
<version>1.0</version>
<scm>
<url>scm-url</url>
</scm>
</project>
1.1 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p2-1.0.pom
Index: p2-1.0.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>p1</artifactId>
<version>1.0</version>
</parent>
<groupId>maven</groupId>
<artifactId>p2</artifactId>
<name>p2</name>
<version>1.0</version>
<mailingLists>
<mailingList>
<name>mailing-list</name>
</mailingList>
</mailingLists>
</project>
1.1 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p3-1.0.pom
Index: p3-1.0.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>p2</artifactId>
<version>1.0</version>
</parent>
<groupId>maven</groupId>
<artifactId>p3</artifactId>
<name>p3</name>
<version>1.0</version>
<inceptionYear>2000</inceptionYear>
</project>
1.1 maven-components/maven-core/src/test/resources/inheritance-repo/t00/maven/poms/p4-1.0.pom
Index: p4-1.0.pom
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>p3</artifactId>
<version>1.0</version>
</parent>
<groupId>maven</groupId>
<artifactId>p4</artifactId>
<name>p4</name>
<version>1.0</version>
</project>