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

[jvanzyl]

jvanzyl     2002/11/30 09:18:49

  Modified:    src/test/java/org/apache/maven/project
                        ProjectInheritanceTest.java
  Log:
  refactoring
  
  Revision  Changes    Path
  1.22      +8 -8      
jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java
  
  Index: ProjectInheritanceTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/test/java/org/apache/maven/project/ProjectInheritanceTest.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ProjectInheritanceTest.java       26 Nov 2002 23:37:23 -0000      1.21
  +++ ProjectInheritanceTest.java       30 Nov 2002 17:18:49 -0000      1.22
  @@ -188,21 +188,21 @@
           assertEquals( "MAVEN_1_0_B4", v4.getTag() );
       }
   
  -    public void testProjectExtendProperties() throws Exception
  +    public void testProjectExtendProperties()
  +        throws Exception
       {
           Project p = MavenUtils.getProject( new File( TEST_DOCUMENT2 ),
                                              new File( System.getProperty( "basedir" 
) + "/src/test/extend/child_project" ) );
   
           Maven maven = new Maven();
  -        maven.setMavenHome( new File( System.getProperty( "maven.home" ) ) );
           maven.setProject( p );
           maven.setDir( p.getFile().getParentFile() );
  -        maven.runtimeInitialization();
  +        maven.initialize();
   
  -        //assertEquals("maven", maven.getProperty("maven.final.name"));
  -        assertEquals( "conf/java", (String) maven.getVariable( 
"maven.jarResources.basedir" ) );
  -        assertEquals( "right", (String) maven.getVariable( "maven.xdoc.date" ) );
  -        assertEquals( "myValue", (String) maven.getVariable( "myProperty" ) );
  -        assertEquals( "myValue2", (String) maven.getVariable( "myProperty2" ) );
  +        assertEquals("maven", maven.getContext().getVariable( "maven.final.name" ) 
);
  +        assertEquals( "conf/java", (String) maven.getContext().getVariable( 
"maven.jarResources.basedir" ) );
  +        assertEquals( "right", (String) maven.getContext().getVariable( 
"maven.xdoc.date" ) );
  +        assertEquals( "myValue", (String) maven.getContext().getVariable( 
"myProperty" ) );
  +        assertEquals( "myValue2", (String) maven.getContext().getVariable( 
"myProperty2" ) );
       }
   }
  
  
  

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