kaz 02/03/15 20:54:21
Modified: . project.xml
Added: src/test/org/apache/maven/java SourceToolTest.java
src/test/org/apache/maven/project ProjectMapperTest.java
WorkspaceMapperTest.java
Removed: src/test/org/apache/maven/java TestSourceTool.java
src/test/org/apache/maven/project TestProjectMapper.java
TestWorkspaceMapper.java
Log:
Changed the set of classes used for unit testing from **/*Test*.class to
**/*Test.class. This makes it much easier to use classes that have the
word 'Test' in them (such as the inner class in the unit test I just
wrote). Also renamed and modified the only three unit tests in Maven
that did not follow this convention.
Revision Changes Path
1.25 +2 -2 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- project.xml 15 Mar 2002 15:10:15 -0000 1.24
+++ project.xml 16 Mar 2002 04:54:21 -0000 1.25
@@ -258,8 +258,8 @@
<!-- Unit test classes -->
<unitTestClassEntries>
- <unitTestClassEntry>include = **/*Test*.class</unitTestClassEntry>
- <unitTestClassEntry>exclude =
**/TestWorkspaceMapper.class</unitTestClassEntry>
+ <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
+ <unitTestClassEntry>exclude =
**/WorkspaceMapperTest.class</unitTestClassEntry>
</unitTestClassEntries>
<!-- Runtime unit test classes -->
1.1
jakarta-turbine-maven/src/test/org/apache/maven/java/SourceToolTest.java
Index: SourceToolTest.java
===================================================================
package org.apache.maven.java;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
public class SourceToolTest
extends TestCase
{
private String TEST_FILE = null;
public SourceToolTest(String testName)
{
super(testName);
}
public static Test suite()
{
return new TestSuite(SourceToolTest.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_FILE = baseDir + fs + "src/test-java-parser/Input.java";
}
public void testSourceTool() throws Exception
{
SourceTool st = new SourceTool();
DepVisitor dv = new DepVisitor();
st.setVisitor(dv);
st.parse(TEST_FILE);
// Check the package statement
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));
// Check the number of methods
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());
}
}
1.1
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
Index: ProjectMapperTest.java
===================================================================
package org.apache.maven.project;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.stratum.xo.Mapper;
public class ProjectMapperTest
extends TestCase
{
private String TEST_DOCUMENT = null;
private static String TEST_CLASS =
"org.apache.maven.project.Project";
public ProjectMapperTest(String testName)
{
super(testName);
}
public static Test suite()
{
return new TestSuite(ProjectMapperTest.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_DOCUMENT = baseDir+fs+"project.xml";
}
public void testProjectMapping()
{
try
{
Mapper m = new Mapper();
m.setDebug(true);
Project p = (Project) m.map(TEST_DOCUMENT, TEST_CLASS);
assertEquals("jakarta-turbine-maven",p.getName());
assertEquals("maven", p.getId());
assertEquals("Apache Software Foundation", p.getOrganization());
assertEquals("http://jakarta.apache.org/turbine/maven/",p.getUrl());
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/",p.getCvsWebUrl());
assertEquals("0.1", p.getCurrentVersion());
// Test Mailing List info
assertEquals("Turbine User List",
((MailingList)p.getMailingLists().get(0)).getName());
assertEquals("[EMAIL PROTECTED]",
((MailingList)p.getMailingLists().get(0)).getSubscribe());
assertEquals("[EMAIL PROTECTED]",
((MailingList)p.getMailingLists().get(0)).getUnsubscribe());
// Test Developer List info
assertEquals("Juancarlo Anez",
((Developer)p.getDevelopers().get(0)).getName());
assertEquals("[EMAIL PROTECTED]",
((Developer)p.getDevelopers().get(0)).getEmail());
// Test Dependencies
assertEquals("jakarta-turbine-stratum",
((Dependency)p.getDependencies().get(0)).getName());
assertEquals("required",
((Dependency)p.getDependencies().get(0)).getType());
assertEquals("0.1",
((Dependency)p.getDependencies().get(0)).getVersion());
assertEquals("stratum-0.1-dev.jar",
((Dependency)p.getDependencies().get(0)).getJar());
// Test Source Directories
assertEquals("src/java",(String)p.getBuild().getSourceDirectories().get(0));
// Test Test Source Directories ;-)
assertEquals("src/java",(String)p.getBuild().getTestSourceDirectories().get(0));
// Test Jar Resources
//assertEquals("include =
conf/*pipeline.xml",(String)p.getBuild().getJarResources().get(0));
// Test Unit Test Classes
//assertEquals("include = **/*Test.class",
// (String)p.getBuild().getUnitTestClassEntries().get(0));
// Test Runtime Test Classes
//assertEquals("include = **/*Test.class",
// (String)p.getBuild().getRuntimeTestClassEntries().get(0));
// Aspect Source Directories
//assertEquals("src/java/org",(String)p.getBuild().getAspectSourceDirectories().get(0));
}
catch (Exception e)
{
e.printStackTrace();
fail(e.getMessage());
}
}
}
1.1
jakarta-turbine-maven/src/test/org/apache/maven/project/WorkspaceMapperTest.java
Index: WorkspaceMapperTest.java
===================================================================
package org.apache.maven.project;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.stratum.xo.Mapper;
public class WorkspaceMapperTest
extends TestCase
{
private String TEST_DOCUMENT = null;
private static String TEST_CLASS =
"org.apache.maven.project.Workspace";
public WorkspaceMapperTest(String testName)
{
super(testName);
}
public static Test suite()
{
return new TestSuite(WorkspaceMapperTest.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_DOCUMENT = baseDir + fs + "src/descriptors/workspace/jvz.xml";
}
public void testWorkspaceMapping() throws Exception
{
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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
