jvanzyl     02/04/19 07:52:25

  Modified:    src/test/org/apache/maven/project WorkspaceMapperTest.java
  Log:
  Updating the workspace mapper test to work with MavenUtils.
  
  Revision  Changes    Path
  1.4       +24 -9     
jakarta-turbine-maven/src/test/org/apache/maven/project/WorkspaceMapperTest.java
  
  Index: WorkspaceMapperTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/WorkspaceMapperTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WorkspaceMapperTest.java  17 Apr 2002 15:35:50 -0000      1.3
  +++ WorkspaceMapperTest.java  19 Apr 2002 14:52:25 -0000      1.4
  @@ -4,12 +4,16 @@
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  +import org.apache.maven.MavenUtils;
  +
   import org.apache.commons.xo.Mapper;
   
   public class WorkspaceMapperTest
       extends TestCase 
   {
  -    private String TEST_DOCUMENT = null;
  +    private String WORKSPACE = null;
  +    private String PROFILE = null;
  +    private String MAVEN_LOCAL_REPO = null;
           
       public WorkspaceMapperTest(String testName) 
       {
  @@ -28,25 +32,36 @@
           assertNotNull("The system property basedir was not defined.", baseDir);
           String fs = System.getProperty("file.separator");
           assertNotNull("The system property file.separator was not defined.", fs);
  -        TEST_DOCUMENT = baseDir + fs + "src/descriptors/workspace/turbine.xml";
  +        WORKSPACE = baseDir + fs + "src/test-reactor/workspace.xml";
  +        PROFILE = baseDir + fs + "src/test-reactor/profile.xml";
  +        
  +        // This will simulate our grand collection of project aritifacts.
  +        MAVEN_LOCAL_REPO = baseDir + fs + "src/test-reactor";
       }
   
       public void testWorkspaceMapping() 
           throws Exception
       {
  -        Mapper m = new Mapper();
  -        
  -        m.setInclusionRule("profile", "../profile");
  -        m.setInclusionRule("project", "../project");
  -        
  -        Workspace w = (Workspace) m.map(TEST_DOCUMENT, Workspace.class.getName());
  +        Workspace w = MavenUtils.getWorkspace(WORKSPACE,
  +                                              PROFILE,
  +                                              MAVEN_LOCAL_REPO);
       
  +        // Look at our basic workspace properties
           assertEquals("1", w.getWorkspaceVersion());
           assertEquals("/tmp/reactor/base", w.getBaseDirectory());
           assertEquals("/home/jvanzyl/js/dists", w.getDistributionDirectory());
           assertEquals("/home/jvanzyl/jdk/j2sdk1.4.0", w.getJavaHome());
           assertEquals("/tmp/reactor/descriptors", w.getDescriptorDirectory());
       
  -        assertEquals("turbine", w.getProfile().getName());
  +        // Look at our basic profile properties
  +        Profile profile = w.getProfile();
  +        assertEquals("turbine", profile.getName());
  +    
  +        // Look at our projects within the profile
  +        Project p0 = profile.getProject(0);
  +        assertEquals("stratum", p0.getId());
  +        
  +        Project p1 = profile.getProject(1);
  +        assertEquals("torque", p1.getId());
       }
   }
  
  
  


Reply via email to