svn commit: r191833 - /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java

[brett]

Author: brett
Date: Wed Jun 22 06:25:06 2005
New Revision: 191833

URL: http://svn.apache.org/viewcvs?rev=191833&view=rev
Log:
avoid circular dependency in test cases

Modified:
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java?rev=191833&r1=191832&r2=191833&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ProjectClasspathArtifactResolver.java
 Wed Jun 22 06:25:06 2005
@@ -60,10 +60,19 @@
             try
             {
                 String scope = artifact.getArtifactId().substring( 
"scope-".length() );
-                String name = "/projects/scope/transitive-" + scope + 
"-dep.xml";
-                r = new InputStreamReader( getClass().getResourceAsStream( 
name ) );
-                MavenXpp3Reader reader = new MavenXpp3Reader();
-                model = reader.read( r );
+                if ( artifact.getGroupId().equals( "maven-test" ) )
+                {
+                    String name = "/projects/scope/transitive-" + scope + 
"-dep.xml";
+                    r = new InputStreamReader( getClass().getResourceAsStream( 
name ) );
+                    MavenXpp3Reader reader = new MavenXpp3Reader();
+                    model = reader.read( r );
+                }
+                else
+                {
+                    model = new Model();
+                }
+                model.setGroupId( artifact.getGroupId() );
+                model.setArtifactId( artifact.getArtifactId() );
             }
             catch ( IOException e )
             {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]