You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/19 18:50:12 UTC
svn commit: r786578 - in /maven/components/trunk/maven-core: pom.xml src/test/java/org/apache/maven/project/ProjectClasspathTest.java src/test/java/org/apache/maven/project/TestProjectBuilder.java

Author: bentmann
Date: Fri Jun 19 16:50:11 2009
New Revision: 786578

URL: http://svn.apache.org/viewvc?rev=786578&view=rev
Log:
o Fixed test setup and re-enabled test

Modified:
    maven/components/trunk/maven-core/pom.xml
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java

Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=786578&r1=786577&r2=786578&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Fri Jun 19 16:50:11 2009
@@ -107,15 +107,6 @@
           </models>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/ProjectClasspathTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>      
     </plugins>
   </build>
   <profiles>

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java?rev=786578&r1=786577&r2=786578&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/ProjectClasspathTest.java Fri Jun 19 16:50:11 2009
@@ -32,8 +32,10 @@
     public void setUp()
         throws Exception
     {
-        //super.setUp();
         projectBuilder = lookup( ProjectBuilder.class, "classpath" );
+
+        // the metadata source looks up the default impl, so we have to trick it
+        getContainer().addComponent( projectBuilder, ProjectBuilder.class, "default" );
     }
    
     @Override

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java?rev=786578&r1=786577&r2=786578&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/TestProjectBuilder.java Fri Jun 19 16:50:11 2009
@@ -3,9 +3,12 @@
  */
 package org.apache.maven.project;
 
+import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.Collections;
 
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.codehaus.plexus.component.annotations.Component;
 
 @Component(role=ProjectBuilder.class,hint="classpath")
@@ -36,4 +39,16 @@
         }
         return build( artifact.getFile(), request );
     }
+
+    @Override
+    public MavenProject build( File pomFile, ProjectBuildingRequest configuration )
+        throws ProjectBuildingException
+    {
+        MavenProject project = super.build( pomFile, configuration );
+
+        project.setRemoteArtifactRepositories( Collections.<ArtifactRepository> emptyList() );
+
+        return project;
+    }
+
 }
\ No newline at end of file