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/02 23:16:00 UTC

cvs commit: jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs Bug15046Test.java Bug15648Test.java Bug13886Test.java Bug13935Test.java Bug15046.java Bug15648.java Bug13886.java Bug13935.java

jkeyes      2003/11/02 14:16:00

  Added:       cli/src/test/org/apache/commons/cli2/bugs Bug15046Test.java
                        Bug15648Test.java Bug13886Test.java
                        Bug13935Test.java
  Removed:     cli/src/test/org/apache/commons/cli2/bugs Bug15046.java
                        Bug15648.java Bug13886.java Bug13935.java
  Log:
  
- renamed classes to be picked up by maven
  
  Revision  Changes    Path
  1.1                  jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15046Test.java
  
  Index: Bug15046Test.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15046Test.java,v 1.1 2003/11/02 22:16:00 jkeyes Exp $
   * $Revision: 1.1 $
   * $Date: 2003/11/02 22:16:00 $
   *
   * ====================================================================
   *
   * 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 Bug15046Test extends TestCase {
  
      public Bug15046Test(String name) {
          super(name);
      }
  
      public void testParamNamedAsOption() throws Exception {
          final String[] CLI_ARGS = new String[] { "-z", "c" };
  
          DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
          ArgumentBuilder abuilder = new ArgumentBuilder();
  
          Option option =
              obuilder
                  .withShortName("z")
                  .withLongName("timezone")
                  .withDescription("affected option")
                  .withArgument(abuilder.withName("timezone").create())
                  .create();
  
          GroupBuilder gbuilder = new GroupBuilder();
          Group options =
              gbuilder.withName("bug15046").withOption(option).create();
  
          CommandLineParser parser = new CommandLineParser();
          parser.setGroup(options);
          CommandLine line = parser.parse(CLI_ARGS);
  
          assertEquals("c", line.getValue("-z"));
  
          Option c =
              obuilder
                  .withShortName("c")
                  .withLongName("conflict")
                  .withDescription("conflicting option")
                  .withArgument(abuilder.withName("conflict").create())
                  .create();
  
          options =
              gbuilder
                  .withName("bug15046")
                  .withOption(option)
                  .withOption(c)
                  .create();
  
          parser.setGroup(options);
          line = parser.parse(CLI_ARGS);
  
          assertEquals("c", line.getValue("-z"));
      }
  }
  
  
  1.1                  jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15648Test.java
  
  Index: Bug15648Test.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug15648Test.java,v 1.1 2003/11/02 22:16:00 jkeyes Exp $
   * $Revision: 1.1 $
   * $Date: 2003/11/02 22:16:00 $
   *
   * ====================================================================
   *
   * 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 Bug15648Test extends TestCase {
  
      public Bug15648Test(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.1                  jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug13886Test.java
  
  Index: Bug13886Test.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug13886Test.java,v 1.1 2003/11/02 22:16:00 jkeyes Exp $
   * $Revision: 1.1 $
   * $Date: 2003/11/02 22:16:00 $
   *
   * ====================================================================
   *
   * 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.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.MissingOptionException;
  import org.apache.commons.cli2.Option;
  import org.apache.commons.cli2.UnexpectedOptionException;
  
  /**
   * @author John Keyes
   */
  public class Bug13886Test extends TestCase {
  
      public Bug13886Test(final String name) {
          super(name);
      }
      
      public void testMandatoryGroup() throws Exception {
          final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
          final GroupBuilder gbuilder = new GroupBuilder();
          
          final Option a = 
              obuilder
                  .withShortName("a")
                  .create();
  
          final Option b = 
              obuilder
                  .withShortName("b")
                  .create();
  
          final Group options = 
              gbuilder
                  .withOption(a)
                  .withOption(b)
                  .withMaximum(1)
                  .withMinimum(1)
                  .create();
          
          final CommandLineParser parser = new CommandLineParser();
          parser.setGroup(options);
          
          try {
              final CommandLine cmdLine = parser.parse(
                  new String[] { } );
              fail("Expected MissingOptionException not caught");
          }
          catch (final MissingOptionException exp) {
          }
  
          try {
              final CommandLine cmdLine = parser.parse(
                  new String[] { "-a" } );
          }
          catch (final MissingOptionException exp) {
              fail("Unexpected MissingOptionException caught");
          }
          
          try {
              final CommandLine cmdLine = parser.parse(
                  new String[] { "-b" } );
          }
          catch (final MissingOptionException exp) {
              fail("Unexpected MissingOptionException caught");
          }
  
          try {
              final CommandLine cmdLine = parser.parse(
                  new String[] { "-a", "-b" } );
          }
          catch (final UnexpectedOptionException exp) {
          }
      }
  }
  
  
  
  1.1                  jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug13935Test.java
  
  Index: Bug13935Test.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons-sandbox/cli/src/test/org/apache/commons/cli2/bugs/Bug13935Test.java,v 1.1 2003/11/02 22:16:00 jkeyes Exp $
   * $Revision: 1.1 $
   * $Date: 2003/11/02 22:16:00 $
   *
   * ====================================================================
   *
   * 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 Bug13935Test extends TestCase {
  
      public Bug13935Test(final String name) {
          super(name);
      }
      
      public void testRequiredGroup() 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"));
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org