svn commit: r786791 - in /maven/components/trunk/maven-core/src/test/java/org/apache/maven: AbstractCoreMavenComponentTestCase.java plugin/PluginManagerTest.java

[be...@apache.org]

Author: bentmann
Date: Sat Jun 20 10:32:11 2009
New Revision: 786791

URL: http://svn.apache.org/viewvc?rev=786791&view=rev
Log:
[MNG-4191] separate plugin and artifact repositories

o Updated test setup

Modified:
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java?rev=786791&r1=786790&r2=786791&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java Sat Jun 20 10:32:11 2009
@@ -89,6 +89,7 @@
             .setPluginGroups( Arrays.asList( new String[] { "org.apache.maven.plugins" } ) )
             .setLocalRepository( getLocalRepository() )
             .setRemoteRepositories( getRemoteRepositories() )
+            .setPluginArtifactRepositories( getPluginArtifactRepositories() )
             .setGoals( Arrays.asList( new String[] { "package" } ) )
             .setProperties( new Properties() );
 
@@ -112,6 +113,7 @@
         ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest()
             .setLocalRepository( request.getLocalRepository() )
             .setRemoteRepositories( request.getRemoteRepositories() )
+            .setPluginArtifactRepositories( request.getPluginArtifactRepositories() )
             .setExecutionProperties( executionProperties );
 
         MavenProject project = null;
@@ -139,7 +141,13 @@
         return new MavenProject( model );
     }
     
-    protected List<ArtifactRepository> getRemoteRepositories() 
+    protected List<ArtifactRepository> getRemoteRepositories()
+        throws InvalidRepositoryException
+    {
+        return Arrays.asList( repositorySystem.createDefaultRemoteRepository() );
+    }
+
+    protected List<ArtifactRepository> getPluginArtifactRepositories()
         throws InvalidRepositoryException
     {
         Repository itRepo = new Repository();

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java?rev=786791&r1=786790&r2=786791&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java Sat Jun 20 10:32:11 2009
@@ -127,7 +127,7 @@
         plugin.setVersion( "2.4.2" );
 
         // The project has already been fully interpolated so getting the raw mojoDescriptor is not going to have the processes configuration.
-        MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getRemoteArtifactRepositories() );        
+        MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() );        
         assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" );
         
         System.out.println( session.getCurrentProject().getBuild().getPluginsAsMap() );
@@ -207,7 +207,7 @@
         // we need to pass this through as is so it doesn't get parsed again.
         Artifact pluginArtifact = new ProjectArtifact( pluginProject );
         
-        Set<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getRemoteRepositories() );
+        Set<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() );
         System.out.println( artifacts );
         */
         
@@ -220,12 +220,12 @@
         ArtifactResolutionRequest request = new ArtifactResolutionRequest()
             .setArtifact( pluginArtifact )
             .setLocalRepository( getLocalRepository() )
-            .setRemoteRepostories( getRemoteRepositories() );
+            .setRemoteRepostories( getPluginArtifactRepositories() );
 
         ArtifactResolutionResult result = repositorySystem.resolve( request );
         */
         
-        List<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getRemoteRepositories() );   
+        List<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() );   
         assertEquals( 4, artifacts.size() );
         
         for ( Artifact a : artifacts )