Author: gadams
Date: Thu May 17 01:22:08 2012
New Revision: 1339441
URL: http://svn.apache.org/viewvc?rev=1339441&view=rev
Log:
Bugzilla #53248: Fix exception thrown from use of -print option in CLI.
Added:
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1339441&r1=1339440&r2=1339441&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
Thu May 17 01:22:08 2012
@@ -588,7 +588,7 @@ public class CommandLineOptions {
private int parsePrintOutputOption(String[] args, int i) throws
FOPException {
setOutputMode(MimeConstants.MIME_FOP_PRINT);
- if ((i + 1 <= args.length)
+ if ((i + 1 < args.length)
&& (args[i + 1].charAt(0) != '-')) {
String arg = args[i + 1];
String[] parts = arg.split(",");
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1339441&r1=1339440&r2=1339441&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Thu May 17 01:22:08 2012
@@ -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="53248"
due-to="Luis Bernardo">
+ Fix exception thrown from use of -print option in CLI.
+ </action>
<action context="Docs" dev="GA" type="fix" fixes-bug="53247">
Fix renderer mime type for PCL output; should be application/x-pcl.
</action>
Added:
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java?rev=1339441&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
(added)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/cli/CommandLineOptionsTestCase.java
Thu May 17 01:22:08 2012
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+/* $Id: CommandLineOptions.java 1293736 2012-02-26 02:29:01Z gadams $ */
+
+package org.apache.fop.cli;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.fop.apps.FOPException;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CommandLineOptionsTestCase {
+
+ private final CommandLineOptions clo = new CommandLineOptions();
+ private final String commandLine = "-fo examples/fo/basic/simple.fo
-print";
+ private String[] cmd;
+ private boolean parsed;
+
+ @Before
+ public void setUp() throws Exception {
+ cmd = commandLine.split(" ");
+ parsed = clo.parse(cmd);
+ }
+
+ @Test
+ public void testParse() {
+ assertTrue(parsed);
+ }
+
+ @Test
+ public void testGetOutputFormat() throws FOPException {
+ assertEquals(clo.getOutputFormat(), "application/X-fop-print");
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
