ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test DefaultEmbeddorTest.java
Date Thu, 23 May 2002 01:01:45 GMT
donaldp     02/05/22 18:01:45

  Modified:    container/src/java/org/apache/myrmidon/interfaces/oldmodel
                        Project.java
               container/src/test/org/apache/myrmidon/components/builder/test
                        DefaultProjectBuilderTestCase.java
               container/src/java/org/apache/myrmidon/components/builder
                        DefaultProject.java
               container/src/test/org/apache/myrmidon/components/embeddor/test
                        DefaultEmbeddorTest.java
  Log:
  Remove getTargetNames() + getProjectNames() from Project interface as they were only used
by the testing framework.
  
  Revision  Changes    Path
  1.10      +1 -15     jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/oldmodel/Project.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Project.java	21 May 2002 07:57:14 -0000	1.9
  +++ Project.java	23 May 2002 01:01:45 -0000	1.10
  @@ -16,7 +16,7 @@
    * Implementations may choose to structure it anyway they choose.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.9 $ $Date: 2002/05/21 07:57:14 $
  + * @version $Revision: 1.10 $ $Date: 2002/05/23 01:01:45 $
    */
   public interface Project
       extends Module
  @@ -38,13 +38,6 @@
       String getURI();
   
       /**
  -     * Get names of projects referenced by this project.
  -     *
  -     * @return the names
  -     */
  -    String[] getProjectNames();
  -
  -    /**
        * Retrieve project reference for specified name.
        * The name is local name of project.
        *
  @@ -76,13 +69,6 @@
        * @return the Target or null if no target exists with name
        */
       Target getTarget( String name );
  -
  -    /**
  -     * Retrieve names of all targets in project.
  -     *
  -     * @return the iterator of project names
  -     */
  -    String[] getTargetNames();
   
       /**
        * Retrieve base directory of project.
  
  
  
  1.8       +3 -4      jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java
  
  Index: DefaultProjectBuilderTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultProjectBuilderTestCase.java	21 May 2002 01:49:05 -0000	1.7
  +++ DefaultProjectBuilderTestCase.java	23 May 2002 01:01:45 -0000	1.8
  @@ -9,7 +9,6 @@
   
   import java.io.File;
   import java.io.IOException;
  -import java.util.Arrays;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.AbstractContainerTestCase;
  @@ -22,7 +21,7 @@
    * Test cases for {@link DefaultProjectBuilder}.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.7 $ $Date: 2002/05/21 01:49:05 $
  + * @version $Revision: 1.8 $ $Date: 2002/05/23 01:01:45 $
    */
   public class DefaultProjectBuilderTestCase
       extends AbstractContainerTestCase
  @@ -255,12 +254,12 @@
           assertEquals( expected.getDefaultTargetName(), project.getDefaultTargetName() );
   
           // TODO - make sure each of the projects are the same
  -        assertTrue( Arrays.equals( expected.getProjectNames(), project.getProjectNames()
) );
  +        //assertTrue( Arrays.equals( expected.getProjectNames(), project.getProjectNames()
) );
   
           // TODO - make sure the implicit targets are the same
   
           // TODO - make sure each of the targets are the same
  -        assertTrue( Arrays.equals( expected.getTargetNames(), project.getTargetNames()
) );
  +        //assertTrue( Arrays.equals( expected.getTargetNames(), project.getTargetNames()
) );
       }
   
       /**
  
  
  
  1.14      +1 -21     jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
  
  Index: DefaultProject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultProject.java	21 May 2002 07:57:14 -0000	1.13
  +++ DefaultProject.java	23 May 2002 01:01:45 -0000	1.14
  @@ -24,7 +24,7 @@
    * Default project implementation.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.13 $ $Date: 2002/05/21 07:57:14 $
  + * @version $Revision: 1.14 $ $Date: 2002/05/23 01:01:45 $
    */
   public class DefaultProject
       implements Project, TargetMetaData
  @@ -73,16 +73,6 @@
       }
   
       /**
  -     * Get names of projects referred to by this project.
  -     *
  -     * @return the names
  -     */
  -    public String[] getProjectNames()
  -    {
  -        return (String[])m_references.keySet().toArray( new String[ 0 ] );
  -    }
  -
  -    /**
        * Retrieve project reference for specified name.
        * The name is local name of project.
        *
  @@ -144,16 +134,6 @@
       public final String getDefaultTargetName()
       {
           return m_defaultTarget;
  -    }
  -
  -    /**
  -     * Retrieve names of all targets in project.
  -     *
  -     * @return an array target names
  -     */
  -    public final String[] getTargetNames()
  -    {
  -        return (String[])m_targets.keySet().toArray( new String[ 0 ] );
       }
   
       /**
  
  
  
  1.15      +3 -3      jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java
  
  Index: DefaultEmbeddorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultEmbeddorTest.java	21 May 2002 05:57:14 -0000	1.14
  +++ DefaultEmbeddorTest.java	23 May 2002 01:01:45 -0000	1.15
  @@ -25,7 +25,7 @@
    * Test cases for the default embeddor.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.14 $ $Date: 2002/05/21 05:57:14 $
  + * @version $Revision: 1.15 $ $Date: 2002/05/23 01:01:45 $
    */
   public class DefaultEmbeddorTest
       extends AbstractContainerTestCase
  @@ -87,8 +87,8 @@
           assertEquals( "test-project", project.getName() );
           assertEquals( "main-target", project.getDefaultTargetName() );
           assertEquals( projectFile.getParentFile(), project.getBaseDirectory() );
  -        assertEquals( 0, project.getProjectNames().length );
  -        assertEquals( 1, project.getTargetNames().length );
  +        //assertEquals( 0, project.getProjectNames().length );
  +        //assertEquals( 1, project.getTargetNames().length );
   
           final Target implicitTarget = project.getImplicitTarget();
           assertEquals( 1, implicitTarget.getTasks().length );
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message