You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/11/01 13:14:52 UTC
svn commit: r590973 - in
/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src:
main/java/org/apache/maven/jxr/util/DotTask.java
test/java/org/apache/maven/jxr/util/DotTaskTest.java
Author: vsiveton
Date: Thu Nov 1 05:14:51 2007
New Revision: 590973
URL: http://svn.apache.org/viewvc?rev=590973&view=rev
Log:
o make DEFAULT_OUTPUT_FORMAT protected for tests
Modified:
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java?rev=590973&r1=590972&r2=590973&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/main/java/org/apache/maven/jxr/util/DotTask.java Thu Nov 1 05:14:51 2007
@@ -44,13 +44,13 @@
/** Windows Graphviz download URL **/
public static final String GRAPHVIZ_WINDOWS_URL = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-win-2.14.1.bin.tar.gz";
+ protected static final String DEFAULT_OUTPUT_FORMAT = "svg";
+
private static final String TARGZ = GRAPHVIZ_WINDOWS_URL.substring( GRAPHVIZ_WINDOWS_URL.lastIndexOf( '/' ) + 1 );
private static final String TAR = TARGZ.substring( 0, TARGZ.lastIndexOf( '.' ) );
private static final String GRAPHVIZ_DIR = "graphviz-2.14.1"; // inside the tar.gz
-
- private static final String DEFAULT_OUTPUT_FORMAT = "png";
/** The dot executable. */
private File dotExe;
Modified: maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java?rev=590973&r1=590972&r2=590973&view=diff
==============================================================================
--- maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java (original)
+++ maven/sandbox/trunk/jxr/maven-jxr/maven-jxr-utils/src/test/java/org/apache/maven/jxr/util/DotTaskTest.java Thu Nov 1 05:14:51 2007
@@ -75,7 +75,7 @@
}
// Generated files
- File generated = new File( out, "target.dot.png" );
+ File generated = new File( out, "target.dot." + DotTask.DEFAULT_OUTPUT_FORMAT );
assertTrue( generated.exists() );
assertTrue( generated.length() > 0 );
}
@@ -122,7 +122,7 @@
}
// Generated files
- File generated = new File( out, "graph.dot.svg" );
+ File generated = new File( out, "graph.dot." + DotTask.DEFAULT_OUTPUT_FORMAT );
assertFalse( generated.exists() );
assertFalse( generated.length() > 0 );
}