You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/04/19 15:04:41 UTC

cvs commit: maven-components/maven-project/src/test/java/org/apache/maven/project/helpers ProjectTestHelper.java ModelTestHelper.java

jvanzyl     2004/04/19 06:04:41

  Modified:    maven-project/src/test/java/org/apache/maven/project
                        AbstractProjectTestCase.java
                        DefaultProjectBuilderTest.java
                        ProjectReactorTest.java
               maven-project/src/test/java/org/apache/maven/project/helpers
                        ProjectTestHelper.java
  Removed:     maven-project/src/test/java/org/apache/maven/project/helpers
                        ModelTestHelper.java
  Log:
  o model is generated now and testing of the generation process occurs in
    modello, but we will also be testing getters/setters using a special
    battery in surefire.
  
  Revision  Changes    Path
  1.2       +0 -4      maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java
  
  Index: AbstractProjectTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/AbstractProjectTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractProjectTestCase.java	16 Apr 2004 17:01:58 -0000	1.1
  +++ AbstractProjectTestCase.java	19 Apr 2004 13:04:40 -0000	1.2
  @@ -1,10 +1,6 @@
   package org.apache.maven.project;
   
  -import org.apache.maven.model.Build;
  -import org.apache.maven.model.Resource;
   import org.codehaus.plexus.PlexusTestCase;
  -
  -import java.io.File;
   
   public class AbstractProjectTestCase
       extends PlexusTestCase
  
  
  
  1.8       +0 -10     maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java
  
  Index: DefaultProjectBuilderTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/DefaultProjectBuilderTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultProjectBuilderTest.java	16 Apr 2004 19:13:25 -0000	1.7
  +++ DefaultProjectBuilderTest.java	19 Apr 2004 13:04:40 -0000	1.8
  @@ -4,13 +4,9 @@
   import org.apache.maven.model.Model;
   import org.apache.maven.model.Resource;
   import org.apache.maven.model.UnitTest;
  -import org.apache.maven.project.helpers.ModelTestHelper;
   import org.apache.maven.project.helpers.ProjectTestHelper;
  -import org.codehaus.plexus.util.DirectoryScanner;
   
   import java.io.File;
  -import java.util.ArrayList;
  -import java.util.List;
   
   public class DefaultProjectBuilderTest
       extends AbstractProjectTestCase
  @@ -34,8 +30,6 @@
   
           MavenProject project = projectBuilder.build( f );
   
  -        ModelTestHelper.testModelMapping( project.getModel() );
  -
           assertEquals( "foo", project.getProperty( "maven.name" ) );
   
           assertNotNull( project.getFile() );
  @@ -92,8 +86,6 @@
   
           assertNotNull( "Test project can't be null!", project );
   
  -        ModelTestHelper.testModelMapping( project.getModel() );
  -
           ProjectTestHelper.testProjectFieldRetrieval( project );
       }
   
  @@ -105,8 +97,6 @@
           MavenProject project = projectBuilder.build( f );
   
           assertNotNull( "Test project can't be null!", project );
  -
  -        ModelTestHelper.testModelMapping( project.getModel() );
   
           ProjectTestHelper.testProjectFieldRetrieval( project );
       }
  
  
  
  1.2       +0 -6      maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectReactorTest.java
  
  Index: ProjectReactorTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/ProjectReactorTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProjectReactorTest.java	16 Apr 2004 19:13:25 -0000	1.1
  +++ ProjectReactorTest.java	19 Apr 2004 13:04:40 -0000	1.2
  @@ -1,11 +1,5 @@
   package org.apache.maven.project;
   
  -import org.apache.maven.model.Build;
  -import org.apache.maven.model.Model;
  -import org.apache.maven.model.Resource;
  -import org.apache.maven.model.UnitTest;
  -import org.apache.maven.project.helpers.ModelTestHelper;
  -import org.apache.maven.project.helpers.ProjectTestHelper;
   import org.codehaus.plexus.util.DirectoryScanner;
   
   import java.io.File;
  
  
  
  1.5       +6 -9      maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java
  
  Index: ProjectTestHelper.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/project/helpers/ProjectTestHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectTestHelper.java	17 Apr 2004 15:14:17 -0000	1.4
  +++ ProjectTestHelper.java	19 Apr 2004 13:04:40 -0000	1.5
  @@ -16,21 +16,18 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.model.MailingList;
  -import org.apache.maven.model.Developer;
  +import junit.framework.TestCase;
  +import org.apache.maven.model.Build;
   import org.apache.maven.model.Contributor;
   import org.apache.maven.model.Dependency;
  -import org.apache.maven.model.Build;
  -import org.apache.maven.model.UnitTest;
  +import org.apache.maven.model.Developer;
  +import org.apache.maven.model.MailingList;
   import org.apache.maven.model.Resource;
  +import org.apache.maven.model.UnitTest;
   import org.apache.maven.project.MavenProject;
  -import junit.framework.TestCase;
   
   /**
  - *
  - *
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  - *
    * @version $Id$
    */
   public class ProjectTestHelper
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org