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

code formatting 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172225 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2011-09-18 08:52:12 +00:00
parent 40cdcb7563
commit a67cc71fbe
10 changed files with 173 additions and 89 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/DefaultMavenProjectBuilderTest.java
View File

@ -140,11 +140,14 @@ public class DefaultMavenProjectBuilderTest
throws Exception
{
ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" );
ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout, null, null );
ArtifactRepository r =
repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout,
null, null );
return r;
}
public void xtestLoop() throws Exception
public void xtestLoop()
throws Exception
{
while ( true )
{

8
maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java
View File

@ -46,7 +46,9 @@ public class MavenProjectTest
MavenProject childProject = new MavenProject( childModel );
File childFile = new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" );
File childFile =
new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis()
+ "/child/pom.xml" );
childProject.setFile( childFile );
@ -169,7 +171,7 @@ public class MavenProjectTest
assertEquals( "Expecting 1 active profile", 1, activeProfilesClone.size() );
assertNotSame( "The list of active profiles should have been cloned too but is same",
activeProfilesOrig, activeProfilesClone);
assertNotSame( "The list of active profiles should have been cloned too but is same", activeProfilesOrig,
activeProfilesClone );
}
}

24
maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
View File

@ -256,7 +256,8 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPomFromMavenProject( "maven-build/sub/pom.xml", null );
for(String s: pom.getMavenProject().getTestClasspathElements()){
for( String s: pom.getMavenProject().getTestClasspathElements() )
{
System.out.println( s );
}
@ -286,9 +287,9 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = buildPom( "reporting-interpolation" );
assertEquals( createPath(Arrays.asList(System.getProperty("user.dir"),
"src", "test", "resources-project-builder", "reporting-interpolation", "target", "site")),
pom.getValue( "reporting/outputDirectory" ) );
assertEquals( createPath( Arrays.asList( System.getProperty( "user.dir" ), "src", "test",
"resources-project-builder", "reporting-interpolation", "target",
"site" ) ), pom.getValue( "reporting/outputDirectory" ) );
}
@ -331,8 +332,10 @@ public class PomConstructionTest
{
PomTestWrapper pom = buildPom( "execution-configuration" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions" ) ).size() );
assertEquals( "src/main/mdo/nexus.xml", ( pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/model" ) ));
assertEquals( "src/main/mdo/security.xml", ( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ));
assertEquals( "src/main/mdo/nexus.xml",
( pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/model" ) ) );
assertEquals( "src/main/mdo/security.xml",
( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ) );
}
/*
@ -350,8 +353,10 @@ public class PomConstructionTest
PomTestWrapper pom = buildPom( "single-configuration-inheritance" );
assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules" ) ).size() );
assertEquals("2.0.6", pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireMavenVersion[1]/version" ) );
assertEquals("[1.4,)", pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireJavaVersion[1]/version" ) );
assertEquals( "2.0.6",
pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireMavenVersion[1]/version" ) );
assertEquals( "[1.4,)",
pom.getValue( "build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireJavaVersion[1]/version" ) );
}
public void testConfigWithPluginManagement()
@ -1434,7 +1439,8 @@ public class PomConstructionTest
throws Exception
{
PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" );
assertEquals("0.1-stub-SNAPSHOT", pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) );
assertEquals( "0.1-stub-SNAPSHOT",
pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) );
}
public void testProfilePlugins()

19
maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
View File

@ -1,5 +1,24 @@
package org.apache.maven.project;
/*
* 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.
*/
import java.io.File;
import java.util.List;
import java.util.Properties;

22
maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
View File

@ -1,8 +1,24 @@
/**
*
*/
package org.apache.maven.project;
/*
* 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.
*/
import java.util.List;
import org.apache.maven.artifact.Artifact;

8
maven-core/src/test/resources/canonical-pom.xml
View File

@ -19,12 +19,16 @@ specific language governing permissions and limitations
under the License.
-->
<project>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<name>Maven</name>
<build>
<plugins>
<plugin>

28
maven-core/src/test/resources/dependencyManagement-pom.xml
View File

@ -1,11 +1,34 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<!--
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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<name>Maven</name>
<dependencyManagement>
<dependencies>
<dependency>
@ -15,6 +38,7 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>

8
maven-core/src/test/resources/distributionManagement-pom.xml
View File

@ -19,12 +19,16 @@
under the License.
-->
<project>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<name>Maven</name>
<distributionManagement>
<snapshotRepository>
<id>repo-id</id>

14
maven-core/src/test/resources/pom.xml
View File

@ -17,15 +17,18 @@ specific language governing permissions and limitations
under the License.
-->
<model 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">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<packaging>jar</packaging>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Maven</name>
<inceptionYear>2001</inceptionYear>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@ -42,7 +45,8 @@ under the License.
<scope>compile</scope>
</dependency>
</dependencies>
<scm>
<connection>scm-connection</connection>
</scm>
</model>
</project>

8
maven-core/src/test/resources/withActiveByDefaultProfile-pom.xml
View File

@ -19,14 +19,16 @@
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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>maven</groupId>
<artifactId>maven-core</artifactId>
<name>Maven</name>
<version>2.0-SNAPSHOT</version>
<name>Maven</name>
<profiles>
<profile>
<activation>