Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

place tests in consistent locations 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163400 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-02-24 04:21:52 +00:00
parent 87b3e49afd
commit fd8d091275
3 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-core/src/test/java/org/apache/maven/project/DefaultProjectDefaultsInjectorTest.java → maven-core/src/test/java/org/apache/maven/project/injection/DefaultModelDefaultsInjectorTest.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.project;
package org.apache.maven.project.injection;
/*
* Copyright 2001-2005 The Apache Software Foundation.
@ -20,7 +20,6 @@ import junit.framework.TestCase;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Model;
import org.apache.maven.project.injection.DefaultModelDefaultsInjector;
import java.util.List;
import java.util.Properties;
@ -28,8 +27,8 @@ import java.util.Properties;
/**
* @author jdcasey
*/
public class DefaultProjectDefaultsInjectorTest
extends TestCase
public class DefaultModelDefaultsInjectorTest
extends TestCase
{
public void testShouldConstructWithNoParams()

33
maven-core/src/test/java/org/apache/maven/project/interpolation/RegexBasedProjectInterpolatorTest.java → maven-core/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
View File

@ -1,20 +1,19 @@
package org.apache.maven.project.interpolation;
/* ====================================================================
* Copyright 2001-2004 The Apache Software Foundation.
/*
* Copyright 2001-2005 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
* 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
* 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.
* ====================================================================
* 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 junit.framework.TestCase;
@ -23,10 +22,8 @@ import org.apache.maven.model.Model;
/**
* @author jdcasey
*
* Created on Feb 3, 2005
*/
public class RegexBasedProjectInterpolatorTest
public class RegexBasedModelInterpolatorTest
extends TestCase
{
@ -43,7 +40,7 @@ public class RegexBasedProjectInterpolatorTest
Model out = new RegexBasedModelInterpolator().interpolate( model );
assertEquals( "3.8.1", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
assertEquals( "3.8.1", ( (Dependency) out.getDependencies().get( 0 ) ).getVersion() );
}
public void testShouldNotInterpolateDependencyVersionWithInvalidReference()
@ -59,7 +56,7 @@ public class RegexBasedProjectInterpolatorTest
Model out = new RegexBasedModelInterpolator().interpolate( model );
assertEquals( "${something}", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
assertEquals( "${something}", ( (Dependency) out.getDependencies().get( 0 ) ).getVersion() );
}
public void testTwoReferences()
@ -76,7 +73,7 @@ public class RegexBasedProjectInterpolatorTest
Model out = new RegexBasedModelInterpolator().interpolate( model );
assertEquals( "foo-3.8.1", ((Dependency) out.getDependencies().get( 0 )).getVersion() );
assertEquals( "foo-3.8.1", ( (Dependency) out.getDependencies().get( 0 ) ).getVersion() );
}
}

30
maven-core/src/test/java/org/apache/maven/plugin/ReflectionProjectValueExtractorTest.java → maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java
View File

@ -1,22 +1,34 @@
/*
* Copyright (c) 2004 Your Corporation. All Rights Reserved.
*/
package org.apache.maven.plugin;
package org.apache.maven.util.introspection;
import java.io.File;
import java.util.List;
/*
* Copyright 2001-2005 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.apache.maven.MavenTestCase;
import org.apache.maven.model.Build;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.util.introspection.ReflectionValueExtractor;
import java.io.File;
import java.util.List;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
*/
public class ReflectionProjectValueExtractorTest
public class ReflectionValueExtractorTest
extends MavenTestCase
{
private MavenProject project;
@ -30,7 +42,7 @@ public class ReflectionProjectValueExtractorTest
builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
File f = getTestFile( "src/test/resources/pom.xml" );
File f = getTestFile( "src/test/resources/pom.xml" );
project = getProject( f );
}