Author: vsiveton
Date: Mon Nov 12 05:50:37 2007
New Revision: 594134
URL: http://svn.apache.org/viewvc?rev=594134&view=rev
Log:
o updated test cases
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
(with props)
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTaskTest.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTaskTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTaskTest.java?rev=594134&r1=594133&r2=594134&view=diff
==============================================================================
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTaskTest.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTaskTest.java
Mon Nov 12 05:50:37 2007
@@ -26,38 +26,35 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Copy;
import org.apache.tools.ant.types.FileSet;
+import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.PathTool;
-import junit.framework.TestCase;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
* @version $Id$
*/
public class UmlDocTaskTest
- extends TestCase
+ extends PlexusTestCase
{
- private static final String BASEDIR = new File( "" ).getAbsolutePath();
-
/** [EMAIL PROTECTED] */
protected void setUp()
throws Exception
{
- File srcDir = new File( BASEDIR, "target/unit/src" );
+ File srcDir = new File( getBasedir(), "target/unit/src" );
if ( !srcDir.exists() )
{
Project antProject = new Project();
- antProject.setBasedir( BASEDIR );
+ antProject.setBasedir( getBasedir() );
Copy copy = new Copy();
copy.setProject( antProject );
copy.setTodir( srcDir );
FileSet set = new FileSet();
- set.setDir( new File( BASEDIR, "src/main/java" ) );
+ set.setDir( new File( getBasedir(), "src/main/java" ) );
set.setIncludes( "**/*.java" );
copy.addFileset( set );
set = new FileSet();
- set.setDir( new File( BASEDIR, "target/generated-sources/antlr" )
);
+ set.setDir( new File( getBasedir(),
"target/generated-sources/antlr" ) );
set.setIncludes( "**/*.java" );
copy.addFileset( set );
copy.execute();
@@ -72,17 +69,16 @@
public void testDefaultExecute()
throws Exception
{
- File out = new File( BASEDIR,
"target/unit/umldoc-default/umlDefault.svg" );
- File srcDir = new File( BASEDIR, "src/test/resources/javasrc" );
+ File out = new File( getBasedir(),
"target/unit/umldoc-default-with-ant/umlDefault.svg" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
Project antProject = new Project();
- antProject.setBasedir( BASEDIR );
+ antProject.setBasedir( getBasedir() );
UmlDocTask task = new UmlDocTask();
task.setProject( antProject );
task.setSrcDir( srcDir );
task.setOut( out );
- task.setVerbose( true );
task.setDiagramEncoding( "UTF-8" );
try
{
@@ -96,6 +92,8 @@
assertTrue( "DOT doesnt exist in the path. Ignored test", true
);
return;
}
+
+ throw e;
}
// Generated files
@@ -111,17 +109,16 @@
public void testLinkExecute()
throws Exception
{
- File out = new File( BASEDIR, "target/unit/umldoc-default/umlLink.svg"
);
- File srcDir = new File( BASEDIR, "target/unit/src" );
+ File out = new File( getBasedir(),
"target/unit/umldoc-default-with-ant/umlLink.svg" );
+ File srcDir = new File( getBasedir(), "target/unit/src" );
Project antProject = new Project();
- antProject.setBasedir( BASEDIR );
+ antProject.setBasedir( getBasedir() );
UmlDocTask task = new UmlDocTask();
task.setProject( antProject );
task.setSrcDir( srcDir );
task.setOut( out );
- task.setVerbose( true );
// All tests passed...
task.setJavasrcPath( PathTool.getRelativePath( "./target/unit/src" ) +
"/target/unit/jxrdoc-default/" );
try
@@ -136,6 +133,8 @@
assertTrue( "DOT doesnt exist in the path. Ignored test", true
);
return;
}
+
+ throw e;
}
// Generated files
Added:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java?rev=594134&view=auto
==============================================================================
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
(added)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
Mon Nov 12 05:50:37 2007
@@ -0,0 +1,110 @@
+package org.apache.maven.jxr.java.doc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.jxr.util.DotUtil.DotNotPresentInPathException;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.PathTool;
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">Vincent Siveton</a>
+ * @version $Id$
+ */
+public class UmlDocTest
+ extends PlexusTestCase
+{
+ /** [EMAIL PROTECTED] */
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ File srcDir = new File( getBasedir(), "target/unit/src" );
+ if ( !srcDir.exists() )
+ {
+ FileUtils.copyDirectory( new File( getBasedir(), "src/main/java"
), srcDir, "**/*.java", null );
+ FileUtils.copyDirectory( new File( getBasedir(),
"target/generated-sources/antlr" ), srcDir, "**/*.java",
+ null );
+ }
+ }
+
+ /**
+ * Call UmlDoc
+ *
+ * @throws Exception if any.
+ */
+ public void testDefaultGenerate()
+ throws Exception
+ {
+ File out = new File( getBasedir(),
"target/unit/umldoc-default/umlDefault.svg" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
+
+ UmlDoc umldoc = (UmlDoc) lookup( UmlDoc.ROLE );
+ assertNotNull( umldoc );
+ try
+ {
+ umldoc.generate( srcDir, out );
+ assertTrue( "DOT exists in the path", true );
+ }
+ catch ( DotNotPresentInPathException e )
+ {
+ assertTrue( "DOT doesnt exist in the path. Ignored test", true );
+ return;
+ }
+
+ // Generated files
+ assertTrue( out.exists() );
+ assertTrue( out.length() > 0 );
+ }
+
+ /**
+ * Call UmlDoc
+ *
+ * @throws Exception if any.
+ */
+ public void testLinkExecute()
+ throws Exception
+ {
+ File out = new File( getBasedir(),
"target/unit/umldoc-default/umlDefault.svg" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
+
+ UmlDoc umldoc = (UmlDoc) lookup( UmlDoc.ROLE );
+ assertNotNull( umldoc );
+ // All tests passed...
+ umldoc.setJavasrcPath( PathTool.getRelativePath( "./target/unit/src" )
+ "/target/unit/jxrdoc-default/" );
+ try
+ {
+ umldoc.generate( srcDir, out );
+ assertTrue( "DOT exists in the path", true );
+ }
+ catch ( DotNotPresentInPathException e )
+ {
+ assertTrue( "DOT doesnt exist in the path. Ignored test", true );
+ return;
+ }
+
+ // Generated files
+ assertTrue( out.exists() );
+ assertTrue( out.length() > 0 );
+ }
+}
Propchange:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/UmlDocTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java?rev=594134&r1=594133&r2=594134&view=diff
==============================================================================
---
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
(original)
+++
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-java/src/test/java/org/apache/maven/jxr/java/doc/XMLDocletTest.java
Mon Nov 12 05:50:37 2007
@@ -28,8 +28,7 @@
import java.util.LinkedList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -41,10 +40,8 @@
* @version $Id$
*/
public class XMLDocletTest
- extends TestCase
+ extends PlexusTestCase
{
- private static final String BASEDIR = new File( "" ).getAbsolutePath();
-
private static final String DEFAULT_EXCLUDES =
"**/*~,**/#*#,**/.#*,**/%*%,**/._*,**/CVS,**/CVS/**,"
+
"**/.cvsignore,**/SCCS,**/SCCS/**,**/vssver.scc,**/.svn,**/.svn/**,**/.DS_Store";
@@ -56,9 +53,9 @@
public void testDefaultExecute()
throws Exception
{
- File srcDir = new File( BASEDIR, "src/test/resources/javasrc" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
- File outputXML = new File( BASEDIR,
"target/unit/xmldoclet-default/javadoc.xml" );
+ File outputXML = new File( getBasedir(),
"target/unit/xmldoclet-default/javadoc.xml" );
// test phase is after compile phase, so we are sure that classes dir
exists
List args = new LinkedList();
@@ -85,7 +82,7 @@
assertTrue( outputXML.length() > 0 );
String content = IOUtil.toString( new FileInputStream( outputXML ) );
assertTrue( content.indexOf( "\"UTF-8\"" ) != -1 );
- File dtd = new File( BASEDIR, "target/unit/xmldoclet-default/" +
XMLDoclet.XMLDOCLET_DTD );
+ File dtd = new File( getBasedir(), "target/unit/xmldoclet-default/" +
XMLDoclet.XMLDOCLET_DTD );
assertTrue( dtd.exists() );
assertTrue( dtd.length() > 0 );
}
@@ -98,7 +95,7 @@
public void testMissingOptionsExecute()
throws Exception
{
- File srcDir = new File( BASEDIR, "src/test/resources/javasrc" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
// test phase is after compile phase, so we are sure that classes dir
exists
List args = new LinkedList();
@@ -126,9 +123,9 @@
public void testNonMandatoryOptionExecute()
throws Exception
{
- File srcDir = new File( BASEDIR, "src/test/resources/javasrc" );
+ File srcDir = new File( getBasedir(), "src/test/resources/javasrc" );
- File outputXML = new File( BASEDIR,
"target/unit/xmldoclet-default/javadoc.xml" );
+ File outputXML = new File( getBasedir(),
"target/unit/xmldoclet-default/javadoc.xml" );
// test phase is after compile phase, so we are sure that classes dir
exists
List args = new LinkedList();
@@ -153,7 +150,7 @@
assertTrue( outputXML.length() > 0 );
String content = IOUtil.toString( new FileInputStream( outputXML ) );
assertTrue( content.indexOf( "\"" + XMLDoclet.DEFAULT_ENCODING_FORMAT
+ "\"" ) != -1 );
- File dtd = new File( BASEDIR, "target/unit/xmldoclet-default/" +
XMLDoclet.XMLDOCLET_DTD );
+ File dtd = new File( getBasedir(), "target/unit/xmldoclet-default/" +
XMLDoclet.XMLDOCLET_DTD );
assertTrue( dtd.exists() );
assertTrue( dtd.length() > 0 );
}
