Author: vsiveton
Date: Fri Jan  7 19:09:14 2011
New Revision: 1056464

URL: http://svn.apache.org/viewvc?rev=1056464&view=rev
Log:
o improved test cases

Modified:
    
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java
    
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
    
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml
    
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml
    
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-extra-configuration-plugin-config.xml

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java?rev=1056464&r1=1056463&r2=1056464&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/AsfDoapProjectStub.java
 Fri Jan  7 19:09:14 2011
@@ -24,7 +24,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.model.Developer;
@@ -56,7 +55,9 @@ public class AsfDoapProjectStub
         try
         {
             model =
-                pomReader.read( ReaderFactory.newXmlReader( new File( 
getBasedir(),
+                pomReader.read( ReaderFactory.newXmlReader( new File(
+                                                                      new 
File( super.getBasedir(),
+                                                                               
 "/src/test/resources/unit/asf-doap-configuration/" ),
                                                                       
"asf-doap-configuration-plugin-config.xml" ) ) );
             setModel( model );
         }
@@ -76,12 +77,6 @@ public class AsfDoapProjectStub
     }
 
     @Override
-    public File getBasedir()
-    {
-        return new File( super.getBasedir() + 
"/src/test/resources/unit/asf-doap-configuration/" );
-    }
-
-    @Override
     public List<Developer> getDevelopers()
     {
         return model.getDevelopers();
@@ -132,8 +127,8 @@ public class AsfDoapProjectStub
     @Override
     public List<ArtifactRepository> getRemoteArtifactRepositories()
     {
-        ArtifactRepository repository = new DefaultArtifactRepository( 
"central", "http://repo2.maven.org/maven2/";,
-                                                                       new 
DefaultRepositoryLayout() );
+        ArtifactRepository repository =
+            new DefaultArtifactRepository( "central", 
"http://repo2.maven.org/maven2/";, new DefaultRepositoryLayout() );
 
         return Collections.singletonList( repository );
     }

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java?rev=1056464&r1=1056463&r2=1056464&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/java/org/apache/maven/plugin/doap/stubs/DoapProjectStub.java
 Fri Jan  7 19:09:14 2011
@@ -55,7 +55,9 @@ public class DoapProjectStub
         try
         {
             model =
-                pomReader.read( ReaderFactory.newXmlReader( new File( 
getBasedir(),
+                pomReader.read( ReaderFactory.newXmlReader( new File(
+                                                                      new 
File( super.getBasedir(),
+                                                                               
 "/src/test/resources/unit/doap-configuration/" ),
                                                                       
"doap-configuration-plugin-config.xml" ) ) );
             setModel( model );
         }
@@ -75,12 +77,6 @@ public class DoapProjectStub
     }
 
     @Override
-    public File getBasedir()
-    {
-        return new File( super.getBasedir() + 
"/src/test/resources/unit/doap-configuration/" );
-    }
-
-    @Override
     public List<Developer> getDevelopers()
     {
         return model.getDevelopers();
@@ -131,8 +127,8 @@ public class DoapProjectStub
     @Override
     public List<ArtifactRepository> getRemoteArtifactRepositories()
     {
-        ArtifactRepository repository = new DefaultArtifactRepository( 
"central", "http://repo2.maven.org/maven2/";,
-                                                                       new 
DefaultRepositoryLayout() );
+        ArtifactRepository repository =
+            new DefaultArtifactRepository( "central", 
"http://repo2.maven.org/maven2/";, new DefaultRepositoryLayout() );
 
         return Collections.singletonList( repository );
     }

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml?rev=1056464&r1=1056463&r2=1056464&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/asf-doap-configuration/asf-doap-configuration-plugin-config.xml
 Fri Jan  7 19:09:14 2011
@@ -84,6 +84,7 @@ under the License.
           <project 
implementation="org.apache.maven.plugin.doap.stubs.AsfDoapProjectStub"/>
           <localRepository>${localRepository}</localRepository>
           
<doapFile>target/test/unit/asf-doap-configuration/asf-doap-configuration.rdf</doapFile>
+          
<outputDirectory>target/test/unit/asf-doap-configuration</outputDirectory>
           <lang>en</lang>
           <validate>true</validate>
 

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml?rev=1056464&r1=1056463&r2=1056464&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-configuration-plugin-config.xml
 Fri Jan  7 19:09:14 2011
@@ -85,6 +85,7 @@ under the License.
           <project 
implementation="org.apache.maven.plugin.doap.stubs.DoapProjectStub"/>
           <localRepository>${localRepository}</localRepository>
           
<doapFile>target/test/unit/doap-configuration/doap-configuration.rdf</doapFile>
+          
<outputDirectory>target/test/unit/doap-configuration</outputDirectory>
           <lang>en</lang>
           <validate>true</validate>
 

Modified: 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-extra-configuration-plugin-config.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-extra-configuration-plugin-config.xml?rev=1056464&r1=1056463&r2=1056464&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-extra-configuration-plugin-config.xml
 (original)
+++ 
maven/plugins/trunk/maven-doap-plugin/src/test/resources/unit/doap-configuration/doap-extra-configuration-plugin-config.xml
 Fri Jan  7 19:09:14 2011
@@ -34,6 +34,7 @@ under the License.
           <project 
implementation="org.apache.maven.plugin.doap.stubs.DoapProjectStub"/>
           <localRepository>${localRepository}</localRepository>
           
<doapFile>target/test/unit/doap-configuration/doap-extra-configuration.rdf</doapFile>
+          
<outputDirectory>target/test/unit/doap-configuration</outputDirectory>
           <lang>en</lang>
           <validate>true</validate>
 


Reply via email to