jvanzyl 2002/07/22 12:16:37
Modified: src/test/extend project-child.xml
src/test/java/org/apache/maven/project
ProjectInheritanceTest.java
Log:
o making the extension mechanism work better in the it will delve deeping
into the object structure. I would like to use the BeanUtils.copyProperties
but it doesn't quite work the way we need. Can patch BeanUtils later.
These changes were made to accommodate building the commons projects
with a master project.xml where the <build/> element need to be
modified slightly to make a particular project work.
The test case exemplifies this.
Revision Changes Path
1.2 +14 -0 jakarta-turbine-maven/src/test/extend/project-child.xml
Index: project-child.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/extend/project-child.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project-child.xml 17 Jul 2002 21:32:57 -0000 1.1
+++ project-child.xml 22 Jul 2002 19:16:37 -0000 1.2
@@ -4,5 +4,19 @@
<id>super-extendo</id>
<name>Super Extendo</name>
+
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/TestAll.java</exclude>
+ <exclude>**/*Abstract*.java</exclude>
+ </excludes>
+ </unitTest>
+
+ </build>
+
</project>
1.2 +13 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProjectInheritanceTest.java 21 Jul 2002 04:00:05 -0000 1.1
+++ ProjectInheritanceTest.java 22 Jul 2002 19:16:37 -0000 1.2
@@ -54,6 +54,8 @@
* <http://www.apache.org/>.
*/
+import java.util.List;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -146,6 +148,8 @@
// Test Source Directories
assertEquals("src/java", p.getBuild().getSourceDirectory());
+ // Unit Test Source Directories
+ assertEquals("src/test/java", p.getBuild().getUnitTestSourceDirectory());
// Test Aspect Source Directories
//assertEquals("src/aspect", p.getBuild().getAspectSourceDirectory());
@@ -155,7 +159,15 @@
String iuSrc = p.getBuild().getIntegrationUnitTestSourceDirectory();
assertTrue("Should be empty in maven's project descriptor: ["+iuSrc+"]",
Strings.isEmpty(iuSrc));
-
+
+ // Unit Test patterns
+ List unitTestIncludes = p.getBuild().getUnitTest().getIncludes();
+ List unitTestExcludes = p.getBuild().getUnitTest().getExcludes();
+
+ assertEquals("**/*Test*.java", (String)unitTestIncludes.get(0));
+ assertEquals("**/TestAll.java", (String)unitTestExcludes.get(0));
+ assertEquals("**/*Abstract*.java", (String)unitTestExcludes.get(1));
+
// Test Versions
Version v0 = (Version) p.getVersions().get(0);
assertEquals("b1", v0.getId());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
