git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1341585 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_1rc1old
@@ -357,8 +357,11 @@ public class CommandLineOptions { | |||
} else if (args[i].equals("-a")) { | |||
this.renderingOptions.put(Accessibility.ACCESSIBILITY, Boolean.TRUE); | |||
} else if (args[i].equals("-v")) { | |||
/* Currently just print the version */ | |||
/* verbose mode although users may expect version; currently just print the version */ | |||
printVersion(); | |||
if (args.length == 1) { | |||
return false; | |||
} | |||
} else if (args[i].equals("-param")) { | |||
if (i + 2 < args.length) { | |||
String name = args[++i]; |
@@ -63,6 +63,9 @@ | |||
documents. Example: the fix of marks layering will be such a case when it's done. | |||
--> | |||
<release version="FOP Trunk" date="TBD"> | |||
<action context="Config" dev="GA" type="fix" fixes-bug="52144" due-to="Luis Bernardo"> | |||
Fix crash on use of version switch (-v). | |||
</action> | |||
<action context="Renderers" dev="GA" type="fix" fixes-bug="53242" due-to="Luis Bernardo"> | |||
Support fractional line widths in AFP renderer, fixing problem with SVG line drawing. | |||
</action> |
@@ -22,6 +22,8 @@ package org.apache.fop.cli; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertTrue; | |||
import java.io.IOException; | |||
import org.apache.fop.apps.FOPException; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
@@ -49,4 +51,22 @@ public class CommandLineOptionsTestCase { | |||
assertEquals(clo.getOutputFormat(), "application/X-fop-print"); | |||
} | |||
@Test | |||
public void testVandVersionSwitchs() throws FOPException, IOException { | |||
// test -v | |||
String cl1 = "-v"; | |||
String[] cmd1 = cl1.split(" "); | |||
CommandLineOptions clo1 = new CommandLineOptions(); | |||
assertTrue(!clo1.parse(cmd1)); | |||
// test -version | |||
String cl2 = "-version"; | |||
String[] cmd2 = cl2.split(" "); | |||
CommandLineOptions clo2 = new CommandLineOptions(); | |||
assertTrue(!clo2.parse(cmd2)); | |||
// test -v + more switches | |||
String cl3 = "-v " + commandLine; | |||
String[] cmd3 = cl3.split(" "); | |||
CommandLineOptions clo3 = new CommandLineOptions(); | |||
assertTrue(clo3.parse(cmd3)); | |||
} | |||
} |