You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2002/03/03 06:04:58 UTC
cvs commit: jakarta-turbine-maven/src/test/org/apache/maven/project TestProjectMapper.java TestWorkspaceMapper.java
brekke 02/03/02 21:04:58
Modified: src/java/org/apache/maven ProjectProperties.java
src/templates/build build-test.xml
src/test/org/apache/maven/importscrubber
ClassParserWrapperTest.java JavaFileFilterTest.java
src/test/org/apache/maven/importscrubber/filechooser
AllInDirTest.java RecursiveFileChooserTest.java
src/test/org/apache/maven/java TestSourceTool.java
src/test/org/apache/maven/project TestProjectMapper.java
TestWorkspaceMapper.java
Log:
When the build was started and the current working directory was not the root
of the project, the source file sets that maven was building were incorrect
since they were attempting to resolve an absolute path. Removing the
getAbsolutePath() from the creation of the source set fixed the building
issues, but a handful of unit tests were assuming that the current working
directory would always be the root of the project. So I added a <sysproperty>
to the junit task with the base directory of the project so the unit tests
could retrieve it from the system properties. The documentation targets
that maven uses still need to have the current working directory be the projects
root since site.dvsl has this assumption hard coded.
I fixed up all the failing unit tests to read the base dir from the system
properties and build paths to their test data. This could use some refactoring,
maybe extracting a class for a base test case that maven's unit tests could
extend. The site.dvsl could be fixed if the project's basedir could be used
to build the path to xdocs/project.xml.
Revision Changes Path
1.4 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectProperties.java 2 Mar 2002 15:36:42 -0000 1.3
+++ ProjectProperties.java 3 Mar 2002 05:04:58 -0000 1.4
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="jason@zenplex.com">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.3 2002/03/02 15:36:42 kaz Exp $
+ * @version $Id: ProjectProperties.java,v 1.4 2002/03/03 05:04:58 brekke Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -142,7 +142,7 @@
String sourceDirectory = (String) i.next();
log(sourceDirectory);
Path p = new Path(getProject());
- p.setPath(new File(sourceDirectory).getAbsolutePath());
+ p.setPath(sourceDirectory);
srcSet.append(p);
}
1.6 +1 -0 jakarta-turbine-maven/src/templates/build/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-test.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-test.xml 1 Mar 2002 04:27:09 -0000 1.5
+++ build-test.xml 3 Mar 2002 05:04:58 -0000 1.6
@@ -63,6 +63,7 @@
<mkdir dir="${test.reportsDirectory}"/>
<junit printSummary="yes" failureProperty="test.failure">
+ <sysproperty key="basedir" value="${basedir}"/>
<formatter type="plain"/>
<classpath>
<path refid="classpath"/>
1.3 +11 -2 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/ClassParserWrapperTest.java
Index: ClassParserWrapperTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/ClassParserWrapperTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassParserWrapperTest.java 3 Mar 2002 02:59:10 -0000 1.2
+++ ClassParserWrapperTest.java 3 Mar 2002 05:04:58 -0000 1.3
@@ -72,8 +72,7 @@
public class ClassParserWrapperTest
extends TestCase
{
- private static final String TEST_JAR =
- "src/test-importscrubber/test.jar";
+ private String TEST_JAR = null;
public ClassParserWrapperTest(String name)
{
@@ -83,6 +82,16 @@
public static Test suite()
{
return new TestSuite(ClassParserWrapperTest.class);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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_JAR = baseDir + fs + "src/test-importscrubber/test.jar";
}
public void testDependencyResolving()
1.3 +26 -15 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/JavaFileFilterTest.java
Index: JavaFileFilterTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/JavaFileFilterTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaFileFilterTest.java 22 Feb 2002 23:14:52 -0000 1.2
+++ JavaFileFilterTest.java 3 Mar 2002 05:04:58 -0000 1.3
@@ -58,25 +58,36 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.maven.importscrubber.JavaFileFilter;
public class JavaFileFilterTest extends TestCase
{
- public JavaFileFilterTest(String aName)
- {
- super(aName);
- }
+ private String TEST_DIR = null;
+
+ public JavaFileFilterTest(String aName)
+ {
+ super(aName);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(JavaFileFilterTest.class);
+ }
- public static Test suite()
- {
- return new TestSuite(JavaFileFilterTest.class);
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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_DIR = baseDir + fs + "src/test-importscrubber";
+ }
- public void testBasic()
- {
- JavaFileFilter f = new JavaFileFilter();
- assertTrue(f.accept(new File("src/test-importscrubber"), "FunctionalTest.java"));
- assertTrue(!f.accept(new File("src/test-importscrubber"), "Foo.java"));
- }
+ public void testBasic()
+ {
+ JavaFileFilter f = new JavaFileFilter();
+ assertTrue(f.accept(new File(TEST_DIR), "FunctionalTest.java"));
+ assertTrue(!f.accept(new File(TEST_DIR), "Foo.java"));
+ }
}
1.3 +26 -17 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/filechooser/AllInDirTest.java
Index: AllInDirTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/filechooser/AllInDirTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AllInDirTest.java 22 Feb 2002 23:14:52 -0000 1.2
+++ AllInDirTest.java 3 Mar 2002 05:04:58 -0000 1.3
@@ -54,29 +54,38 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.maven.importscrubber.filechooser.AllInDirectoryFileChooser;
public class AllInDirTest extends TestCase
{
- public AllInDirTest(String aName)
- {
- super(aName);
- }
+ private String TEST_DIR = null;
+
+ public AllInDirTest(String aName)
+ {
+ super(aName);
+ }
- public static Test suite()
- {
- return new TestSuite(AllInDirTest.class);
- }
+ public static Test suite()
+ {
+ return new TestSuite(AllInDirTest.class);
+ }
- public void testBasic()
- {
- AllInDirectoryFileChooser fc = new AllInDirectoryFileChooser();
- fc.setRoot("src/test-importscrubber");
- assertEquals(2, fc.getFiles().size());
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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_DIR = baseDir + fs + "src/test-importscrubber";
+ }
+
+ public void testBasic()
+ {
+ AllInDirectoryFileChooser fc = new AllInDirectoryFileChooser();
+ fc.setRoot(TEST_DIR);
+ assertEquals(2, fc.getFiles().size());
+ }
}
1.3 +27 -16 jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/filechooser/RecursiveFileChooserTest.java
Index: RecursiveFileChooserTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/importscrubber/filechooser/RecursiveFileChooserTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RecursiveFileChooserTest.java 22 Feb 2002 23:14:52 -0000 1.2
+++ RecursiveFileChooserTest.java 3 Mar 2002 05:04:58 -0000 1.3
@@ -16,7 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
- * distribution.
+.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
@@ -57,24 +57,35 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.maven.importscrubber.filechooser.RecursiveFileChooser;
public class RecursiveFileChooserTest extends TestCase
{
- public RecursiveFileChooserTest(String aName)
- {
- super(aName);
- }
+ private String TEST_DIR = null;
+
+ public RecursiveFileChooserTest(String aName)
+ {
+ super(aName);
+ }
- public static Test suite()
- {
- return new TestSuite(RecursiveFileChooserTest.class);
- }
+ public static Test suite()
+ {
+ return new TestSuite(RecursiveFileChooserTest.class);
+ }
- public void testBasic()
- {
- RecursiveFileChooser fc = new RecursiveFileChooser();
- fc.setRoot("src/test-importscrubber");
- assertEquals(4, fc.getFiles().size());
- }
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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_DIR = baseDir + fs + "src/test-importscrubber";
+ }
+
+ public void testBasic()
+ {
+ RecursiveFileChooser fc = new RecursiveFileChooser();
+ fc.setRoot(TEST_DIR);
+ assertEquals(4, fc.getFiles().size());
+ }
}
1.3 +27 -32 jakarta-turbine-maven/src/test/org/apache/maven/java/TestSourceTool.java
Index: TestSourceTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/java/TestSourceTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestSourceTool.java 22 Feb 2002 23:39:41 -0000 1.2
+++ TestSourceTool.java 3 Mar 2002 05:04:58 -0000 1.3
@@ -6,11 +6,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.maven.java.Method;
-
public class TestSourceTool
extends TestCase
{
+ private String TEST_FILE = null;
+
public TestSourceTool(String testName)
{
super(testName);
@@ -21,50 +21,45 @@
return new TestSuite(TestSourceTool.class);
}
- public void setUp()
- {
- }
-
- public void tearDown()
+ protected void setUp() throws Exception
{
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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_FILE = baseDir + fs + "src/test-java-parser/Input.java";
}
- public void testSourceTool()
+ public void testSourceTool() throws Exception
{
SourceTool st = new SourceTool();
DepVisitor dv = new DepVisitor();
st.setVisitor(dv);
- try
- {
- st.parse("src/test-java-parser/Input.java");
+ st.parse(TEST_FILE);
// Check the package statement
- List ps = dv.getPackageStatements();
- assertEquals("org.apache.turbine",(String)ps.get(0));
+ List ps = dv.getPackageStatements();
+ assertEquals("org.apache.turbine",(String)ps.get(0));
// Check the import statements
- List is = dv.getImportStatements();
- assertEquals("java.io.*",(String)is.get(0));
- assertEquals("org.apache.turbine.RunData",(String)is.get(1));
- assertEquals("java.net.URLEncoder",(String)is.get(2));
- assertEquals("java.util.Enumeration",(String)is.get(3));
- assertEquals("java.util.Vector",(String)is.get(4));
- assertEquals("javax.servlet.http.HttpServletRequest",(String)is.get(5));
- assertEquals("javax.servlet.http.HttpServletResponse",(String)is.get(6));
- assertEquals("org.apache.turbine.Turbine",(String)is.get(7));
- assertEquals("org.apache.turbine.ParameterParser",(String)is.get(8));
+ List is = dv.getImportStatements();
+ assertEquals("java.io.*",(String)is.get(0));
+ assertEquals("org.apache.turbine.RunData",(String)is.get(1));
+ assertEquals("java.net.URLEncoder",(String)is.get(2));
+ assertEquals("java.util.Enumeration",(String)is.get(3));
+ assertEquals("java.util.Vector",(String)is.get(4));
+ assertEquals("javax.servlet.http.HttpServletRequest",(String)is.get(5));
+ assertEquals("javax.servlet.http.HttpServletResponse",(String)is.get(6));
+ assertEquals("org.apache.turbine.Turbine",(String)is.get(7));
+ assertEquals("org.apache.turbine.ParameterParser",(String)is.get(8));
// Check the number of methods
- assertEquals(3,dv.getMethods().size());
+ assertEquals(3,dv.getMethods().size());
- // Check return types of methods
- assertEquals("void",((Method)dv.getMethods().get(0)).getReturnType());
- assertEquals("Object",((Method)dv.getMethods().get(1)).getReturnType());
- }
- catch (Exception e)
- {
- fail();
- }
+ // Check return types of methods
+ assertEquals("void",((Method)dv.getMethods().get(0)).getReturnType());
+ assertEquals("Object",((Method)dv.getMethods().get(1)).getReturnType());
}
}
1.9 +10 -9 jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java
Index: TestProjectMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/TestProjectMapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestProjectMapper.java 3 Mar 2002 02:50:19 -0000 1.8
+++ TestProjectMapper.java 3 Mar 2002 05:04:58 -0000 1.9
@@ -1,6 +1,5 @@
package org.apache.maven.project;
-import java.io.File;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -10,10 +9,9 @@
public class TestProjectMapper
extends TestCase
{
- private static String TEST_DOCUMENT = "project.xml";
-
- private static String TEST_CLASS =
- "org.apache.maven.project.Project";
+ private String TEST_DOCUMENT = null;
+ private static String TEST_CLASS =
+ "org.apache.maven.project.Project";
public TestProjectMapper(String testName)
{
@@ -25,11 +23,14 @@
return new TestSuite(TestProjectMapper.class);
}
- public void setUp()
- {
- }
- public void tearDown()
+ protected void setUp() throws Exception
{
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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+"project.xml";
}
public void testProjectMapping()
1.2 +20 -28 jakarta-turbine-maven/src/test/org/apache/maven/project/TestWorkspaceMapper.java
Index: TestWorkspaceMapper.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/TestWorkspaceMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWorkspaceMapper.java 19 Feb 2002 18:10:13 -0000 1.1
+++ TestWorkspaceMapper.java 3 Mar 2002 05:04:58 -0000 1.2
@@ -1,6 +1,5 @@
package org.apache.maven.project;
-import java.io.File;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -10,8 +9,7 @@
public class TestWorkspaceMapper
extends TestCase
{
- private static String TEST_DOCUMENT =
- "src/descriptors/workspace/jvz.xml";
+ private String TEST_DOCUMENT = null;
private static String TEST_CLASS =
"org.apache.maven.project.Workspace";
@@ -26,34 +24,28 @@
return new TestSuite(TestWorkspaceMapper.class);
}
- public void setUp()
- {
- }
- public void tearDown()
+ protected void setUp() throws Exception
{
+ super.setUp();
+ String baseDir = System.getProperty("basedir");
+ 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/jvz.xml";
}
- public void testWorkspaceMapping()
+ public void testWorkspaceMapping() throws Exception
{
- try
- {
- Mapper m = new Mapper();
- m.setInclusionRule("profile", "../profile");
- m.setInclusionRule("project", "../project");
- m.setInclusionRule("repository", "../repository");
-
- m.setDebug(true);
- Workspace w = (Workspace) m.map(TEST_DOCUMENT, TEST_CLASS);
-
- //assertEquals("/home/jvanzyl/baseDir", w.getBaseDir());
- //assertEquals("/home/jvanzyl/packageDir", w.getPackageDir());
- //assertEquals("1.0", w.getVersion());
-
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ Mapper m = new Mapper();
+ m.setInclusionRule("profile", "../profile");
+ m.setInclusionRule("project", "../project");
+ m.setInclusionRule("repository", "../repository");
+
+ m.setDebug(true);
+ Workspace w = (Workspace) m.map(TEST_DOCUMENT, TEST_CLASS);
+
+ //assertEquals("/home/jvanzyl/baseDir", w.getBaseDir());
+ //assertEquals("/home/jvanzyl/packageDir", w.getPackageDir());
+ //assertEquals("1.0", w.getVersion());
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>