cvs commit: maven/src/test/java/org/apache/maven/project ProjectInheritanceTest.java

[brett]

brett       2003/12/30 17:38:09

  Modified:    src/test/java/org/apache/maven/project Tag: MAVEN-1_0-BRANCH
                        ProjectInheritanceTest.java
  Log:
  fix inheritence tests, add resource inheritence tests
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.40.4.3  +23 -6     
maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===================================================================
  RCS file: 
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.40.4.2
  retrieving revision 1.40.4.3
  diff -u -r1.40.4.2 -r1.40.4.3
  --- ProjectInheritanceTest.java       10 Dec 2003 04:47:11 -0000      1.40.4.2
  +++ ProjectInheritanceTest.java       31 Dec 2003 01:38:09 -0000      1.40.4.3
  @@ -55,6 +55,9 @@
    */
   
   import java.io.File;
  +import java.util.Arrays;
  +import java.util.Collections;
  +import java.util.Iterator;
   import java.util.List;
   
   import junit.framework.Test;
  @@ -97,7 +100,7 @@
       public void testProjectMapping() throws Exception
       {
           Project p = MavenUtils.getProject( new File( TEST_DOCUMENT ) );
  -        
  +
           // Make sure the groupId is inherited correctly.
           assertEquals( "maven", p.getGroupId() );
           
  @@ -171,15 +174,29 @@
           assertEquals( "maven:child", p.getId() );
           
           // Test organization inheritance. These should pass, but don't
  -        if ( false )  {
  -          assertNotNull( p.getOrganization() );
  -          assertEquals( "Apache Software Foundation", p.getOrganization().getName() 
);
  -          assertEquals( "http://jakarta.apache.org/";, p.getOrganization().getUrl() 
);
  -        }
  +        assertNotNull( p.getOrganization() );
  +        assertEquals( "Apache Software Foundation", p.getOrganization().getName() );
  +        assertEquals( "http://www.apache.org/";, p.getOrganization().getUrl() );
       
           // Test siteAddress / siteDirectory
           assertEquals( "theSiteAddress", p.getSiteAddress());
           assertEquals( "theSiteDirectory", p.getSiteDirectory());
  +
  +        boolean found = false;
  +        List resources = p.getBuild().getResources();
  +        for ( Iterator i = resources.iterator(); i.hasNext(); )
  +        {
  +            Resource r = ( Resource ) i.next();
  +            File dir = new File( p.getFile().getParent(), "src" + FS + "messages" 
).getCanonicalFile();
  +            if ( r.getDirectory().equals( dir.getPath() ) )
  +            {
  +                assertEquals( "check target path", "org/apache/maven/messages", 
r.getTargetPath() );
  +                assertEquals( "check includes", Arrays.asList( new String[] { 
"messages*.properties" } ), r.getIncludes() );
  +                assertEquals( "check excludes", Collections.EMPTY_LIST, 
r.getExcludes() );
  +                found = true;
  +            }
  +        }
  +        assertTrue( "Check found resources for src/messages", found );
       }
   
   }
  
  
  

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