cvs commit: jakarta-commons-sandbox/jjar/src/test/org/apache/commons/jjar TestDependencyEngine.java

[jvanzyl]

jvanzyl     01/08/26 10:07:14

  Modified:    jjar/src/test/org/apache/commons/jjar
                        TestDependencyEngine.java
  Log:
  - added test for multi project dep list and it fails currently. the
    actual projects in the project list aren't showing up in the dep list
    and i'm not sure there's any way to ensure a known order. for example
    if there are N projects with no deps, what order will they be in?
    would be nice for testing.
  
  Revision  Changes    Path
  1.2       +38 -6     
jakarta-commons-sandbox/jjar/src/test/org/apache/commons/jjar/TestDependencyEngine.java
  
  Index: TestDependencyEngine.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jjar/src/test/org/apache/commons/jjar/TestDependencyEngine.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestDependencyEngine.java 2001/08/26 16:21:41     1.1
  +++ TestDependencyEngine.java 2001/08/26 17:07:14     1.2
  @@ -10,7 +10,7 @@
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: TestDependencyEngine.java,v 1.1 2001/08/26 16:21:41 jvanzyl Exp $
  + * @version $Id: TestDependencyEngine.java,v 1.2 2001/08/26 17:07:14 jvanzyl Exp $
    */
   public class TestDependencyEngine 
       extends TestCase
  @@ -40,12 +40,12 @@
       
       public void testProjectDependencies()
       {
  -        String cookieList = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
  +        String compare = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
           
           try
           {
               addAlphabetProjects(d);            
  -            assertEquals(getCookieListString(d), cookieList);
  +            assertEquals(compare,getCookieListString(d));
           }
           catch(Exception e)
           {
  @@ -55,13 +55,13 @@
   
       public void testReset()
       {
  -        String cookieList = "";
  +        String compare = "";
           
           try
           {
               addAlphabetProjects(d);
               d.reset();
  -            assertEquals(getCookieListString(d), cookieList);
  +            assertEquals(compare,getCookieListString(d));
           }
           catch(Exception e)
           {
  @@ -115,6 +115,21 @@
           return sb.toString();
       }
   
  +    private String getDependencyString(DependencyEngine d, List projects)
  +        throws Exception
  +    {
  +        StringBuffer sb = new StringBuffer();
  +        List depList = d.getDependencies(projects);
  +        Iterator i = depList.iterator();
  +
  +        while(i.hasNext())
  +        {
  +            sb.append((String) i.next());
  +        }
  +        
  +        return sb.toString();
  +    }
  +
       private List deps(String project)
       {
           ArrayList deps = new ArrayList();
  @@ -134,12 +149,29 @@
   
       public void testMultiProjectDependency()
       {
  +        String compare = "12BCD3A";
  +        
           try
           {
  -            d.addProject("1", deps("A"));
  +            d.reset();
  +            d.addProject("A", deps("B,C,D"));
  +            d.addProject("B", deps("1,2"));
  +            d.addProject("C", deps(null));
  +            d.addProject("D", deps(null));
  +            d.addProject("1", deps(null));
  +            d.addProject("2", deps(null));
  +            d.addProject("3", deps("C"));
  +            
  +            ArrayList projects = new ArrayList();
  +            projects.add("A");
  +            projects.add("3");
  +            
  +            assertEquals(compare,getDependencyString(d, projects));
  +
           }
           catch( Exception e )
           {
  +            fail();
           }
       }
   }