You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jk...@apache.org on 2003/11/01 00:12:01 UTC
cvs commit: jakarta-commons-sandbox/cli/src/java/org/apache/commons/cli2 ArgumentImpl.java
jkeyes 2003/10/31 15:12:01
Modified: cli/src/test/org/apache/commons/cli2/bugs Bug15046.java
cli/src/java/org/apache/commons/cli2 ArgumentImpl.java
Added: cli/src/test/org/apache/commons/cli2/bugs Bug15648.java
Log:
- added new test
- strip leading and trailing quotes from argument values
Revision Changes Path
1.3 +63 -0 jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15046.java
Index: Bug15046.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15046.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Bug15046.java 31 Oct 2003 22:08:22 -0000 1.2
+++ Bug15046.java 31 Oct 2003 23:12:01 -0000 1.3
@@ -1,3 +1,63 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache GroupImpl.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
package org.apache.commons.cli2.bugs;
import junit.framework.TestCase;
@@ -10,6 +70,9 @@
import org.apache.commons.cli2.GroupBuilder;
import org.apache.commons.cli2.Option;
+/**
+ * @author John Keyes
+ */
public class Bug15046 extends TestCase {
public Bug15046(String name) {
1.1 jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15648.java
Index: Bug15648.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15648.java,v 1.1 2003/10/31 23:12:01 jkeyes Exp $
* $Revision: 1.1 $
* $Date: 2003/10/31 23:12:01 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache GroupImpl.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.commons.cli2.bugs;
import junit.framework.TestCase;
import org.apache.commons.cli2.ArgumentBuilder;
import org.apache.commons.cli2.CommandLine;
import org.apache.commons.cli2.CommandLineParser;
import org.apache.commons.cli2.DefaultOptionBuilder;
import org.apache.commons.cli2.Group;
import org.apache.commons.cli2.GroupBuilder;
import org.apache.commons.cli2.Option;
/**
* @author John Keyes
*/
public class Bug15648 extends TestCase {
public Bug15648(final String name) {
super(name);
}
public void testQuotedArgumentValue() throws Exception {
final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
final ArgumentBuilder abuilder = new ArgumentBuilder();
final GroupBuilder gbuilder = new GroupBuilder();
final Option testOption =
obuilder
.withShortName("a")
.withArgument(
abuilder
.withName("quoted string")
.create())
.create();
final Group options =
gbuilder
.withOption(testOption)
.create();
final CommandLineParser parser = new CommandLineParser();
parser.setGroup(options);
final CommandLine cmdLine = parser.parse(
new String[] { "-a", "\"two tokens\"" } );
assertTrue(cmdLine.hasOption("-a"));
assertEquals("two tokens", cmdLine.getValue("-a"));
}
}
1.10 +31 -4 jakarta-commons-sandbox/cli/src/java/org/apache/commons/cli2/ArgumentImpl.java
Index: ArgumentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cli/src/java/org/apache/commons/cli2/ArgumentImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ArgumentImpl.java 29 Oct 2003 17:32:12 -0000 1.9
+++ ArgumentImpl.java 31 Oct 2003 23:12:01 -0000 1.10
@@ -208,7 +208,7 @@
final int initialCount = argumentCount;
while (arguments.hasNext() && argumentCount < maximum) {
- final String allValues = (String) arguments.next();
+ final String allValues = stripBoundaryQuotes((String) arguments.next());
if(allValues.equals(consumeRemaining))
{
@@ -456,5 +456,32 @@
public int getMinimum()
{
return minimum;
+ }
+
+ /**
+ * If there are any leading or trailing quotes remove them
+ * from the specified token.
+ *
+ * @param token
+ * the token to strip leading and trailing quotes
+ *
+ * @return String
+ * the possibly modified token
+ */
+ public String stripBoundaryQuotes(String token) {
+ if (!token.startsWith("\"") || !token.endsWith("\"")) {
+ return token;
+ }
+ else {
+ if (token.startsWith("\"")) {
+ token = token.substring(1, token.length());
+ }
+
+ if (token.endsWith("\"")) {
+ token = token.substring(0, token.length() - 1);
+ }
+
+ return token;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org