Nabble - Commons - Dev

Re: [cli] Avalon CLI vs Commons CLI 1.x

2008-07-24T16:57:49Z

Jörg Schaible a écrit :

> Hmmm. I always thought that using the long option the '=' is mandatory while
> for a short option space is optional.

I checked the documentation for getopt [1], the '=' sign after a long
option is required only if the argument is optional. Same thing for the
short options, if the argument is optional it must be grouped with the
option (-O1 and not -O 1).

So Avalon CLI is right. The catch now if we implement this is to decide
how multiple optional arguments are handled. I guess this would make the
value separator mandatory:

--foo=a,b,c

or

-fa,b,c

Emmanuel Bourg

[1] http://www.urbanophile.com/arenn/hacking/getopt/gnu.getopt.Getopt.html

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r679606 - in /commons/proper/cli/branches/cli-1.x/src: java/org/apache/commons/cli/AlreadySelectedException.java java/org/apache/commons/cli/OptionGroup.java test/org/apache/commons/cli/OptionGroupTest.java

2008-07-24T15:55:59Z

Author: ebourg
Date: Thu Jul 24 15:55:58 2008
New Revision: 679606

URL: http://svn.apache.org/viewvc?rev=679606&view=rev
Log:
Changed AlreadySelectedException to include the related option group and the option that triggered the exception

Modified:
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/AlreadySelectedException.java
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/OptionGroup.java
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/OptionGroupTest.java

Modified: commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/AlreadySelectedException.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/AlreadySelectedException.java?rev=679606&r1=679605&r2=679606&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/AlreadySelectedException.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/AlreadySelectedException.java Thu Jul 24 15:55:58 2008
@@ -26,6 +26,12 @@
*/
public class AlreadySelectedException extends ParseException
{
+ /** The option group selected. */
+ private OptionGroup group;
+
+ /** The option that triggered the exception. */
+ private Option option;
+
/**
* Construct a new <code>AlreadySelectedException</code>
* with the specified detail message.
@@ -36,4 +42,40 @@
{
super(message);
}
+
+ /**
+ * Construct a new <code>AlreadySelectedException</code>
+ * for the specified option group.
+ *
+ * @param group the option group already selected
+ * @param option the option that triggered the exception
+ * @since 1.2
+ */
+ public AlreadySelectedException(OptionGroup group, Option option)
+ {
+ this("The option '" + option.getKey() + "' was specified but an option from this group " +
+ "has already been selected: '" + group.getSelected() + "'");
+ this.group = group;
+ this.option = option;
+ }
+
+ /**
+ * Returns the option group where another option has been selected.
+ *
+ * @since 1.2
+ */
+ public OptionGroup getOptionGroup()
+ {
+ return group;
+ }
+
+ /**
+ * Returns the option that was added to the group and triggered the exception.
+ *
+ * @since 1.2
+ */
+ public Option getOption()
+ {
+ return option;
+ }
}

Modified: commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/OptionGroup.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/OptionGroup.java?rev=679606&r1=679605&r2=679606&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/OptionGroup.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/OptionGroup.java Thu Jul 24 15:55:58 2008
@@ -14,15 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.commons.cli;

import java.io.Serializable;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;

/**
* A group of mutually exclusive options.
+ *
* @author John Keyes ( john at integralsource.com )
* @version $Revision$
*/
@@ -31,7 +34,7 @@
private static final long serialVersionUID = 1L;

/** hold the options */
- private HashMap optionMap = new HashMap();
+ private Map optionMap = new HashMap();

/** the name of the selected option */
private String selected;
@@ -40,16 +43,16 @@
private boolean required;

/**
- * add <code>opt</code> to this group
+ * Add the specified <code>Option</code> to this group.
*
- * @param opt the option to add to this group
- * @return this option group with opt added
+ * @param option the option to add to this group
+ * @return this option group with the option added
*/
- public OptionGroup addOption(Option opt)
+ public OptionGroup addOption(Option option)
{
// key - option name
// value - the option
- optionMap.put(opt.getKey(), opt);
+ optionMap.put(option.getKey(), option);

return this;
}
@@ -75,25 +78,22 @@

/**
* set the selected option of this group to <code>name</code>.
- * @param opt the option that is selected
+ * @param option the option that is selected
* @throws AlreadySelectedException if an option from this group has
* already been selected.
*/
- public void setSelected(Option opt)
- throws AlreadySelectedException
+ public void setSelected(Option option) throws AlreadySelectedException
{
// if no option has already been selected or the
// same option is being reselected then set the
// selected member variable
- if ((this.selected == null) || this.selected.equals(opt.getOpt()))
+ if ((this.selected == null) || this.selected.equals(option.getOpt()))
{
- this.selected = opt.getOpt();
+ this.selected = option.getOpt();
}
else
{
- throw new AlreadySelectedException("an option from this group has "
- + "already been selected: '"
- + selected + "'");
+ throw new AlreadySelectedException(this, option);
}
}

@@ -163,4 +163,4 @@

return buff.toString();
}
-}
\ No newline at end of file
+}

Modified: commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/OptionGroupTest.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/OptionGroupTest.java?rev=679606&r1=679605&r2=679606&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/OptionGroupTest.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/OptionGroupTest.java Thu Jul 24 15:55:58 2008
@@ -139,7 +139,7 @@
assertTrue( "Confirm TWO extra args", cl.getArgList().size() == 2);
}

- public void testTwoOptionsFromGroup()
+ public void testTwoOptionsFromGroup() throws Exception
{
String[] args = new String[] { "-f", "-d" };

@@ -148,16 +148,15 @@
parser.parse( _options, args);
fail( "two arguments from group not allowed" );
}
- catch (ParseException e)
+ catch (AlreadySelectedException e)
{
- if( !( e instanceof AlreadySelectedException ) )
- {
- fail( "incorrect exception caught:" + e.getMessage() );
- }
+ assertNotNull("null option group", e.getOptionGroup());
+ assertEquals("selected option", "f", e.getOptionGroup().getSelected());
+ assertEquals("option", "d", e.getOption().getOpt());
}
}

- public void testTwoLongOptionsFromGroup()
+ public void testTwoLongOptionsFromGroup() throws Exception
{
String[] args = new String[] { "--file", "--directory" };

@@ -166,12 +165,11 @@
parser.parse(_options, args);
fail( "two arguments from group not allowed" );
}
- catch (ParseException e)
+ catch (AlreadySelectedException e)
{
- if( !( e instanceof AlreadySelectedException ) )
- {
- fail( "incorrect exception caught:" + e.getMessage() );
- }
+ assertNotNull("null option group", e.getOptionGroup());
+ assertEquals("selected option", "f", e.getOptionGroup().getSelected());
+ assertEquals("option", "d", e.getOption().getOpt());
}
}

svn commit: r679583 - in /commons/proper/cli/branches/cli-1.x/src: java/org/apache/commons/cli/ test/org/apache/commons/cli/

2008-07-24T15:25:41Z

Author: ebourg
Date: Thu Jul 24 15:25:38 2008
New Revision: 679583

URL: http://svn.apache.org/viewvc?rev=679583&view=rev
Log:
Changed UnrecognizedOptionException to include the option that wasn't recognized

Modified:
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/Parser.java
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/UnrecognizedOptionException.java
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/GnuParserTest.java
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/PosixParserTest.java

Modified: commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/Parser.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/Parser.java?rev=679583&r1=679582&r2=679583&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/Parser.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/Parser.java Thu Jul 24 15:25:38 2008
@@ -379,8 +379,7 @@
// if there is no option throw an UnrecognisedOptionException
if (!hasOption)
{
- throw new UnrecognizedOptionException("Unrecognized option: "
- + arg);
+ throw new UnrecognizedOptionException("Unrecognized option: " + arg, arg);
}

// get the option represented by arg

Modified: commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/UnrecognizedOptionException.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/UnrecognizedOptionException.java?rev=679583&r1=679582&r2=679583&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/UnrecognizedOptionException.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/UnrecognizedOptionException.java Thu Jul 24 15:25:38 2008
@@ -26,6 +26,9 @@
*/
public class UnrecognizedOptionException extends ParseException
{
+ /** The unrecognized option */
+ private String option;
+
/**
* Construct a new <code>UnrecognizedArgumentException</code>
* with the specified detail message.
@@ -36,4 +39,28 @@
{
super(message);
}
+
+ /**
+ * Construct a new <code>UnrecognizedArgumentException</code>
+ * with the specified option and detail message.
+ *
+ * @param message the detail message
+ * @param option the unrecognized option
+ * @since 1.2
+ */
+ public UnrecognizedOptionException(String message, String option)
+ {
+ this(message);
+ this.option = option;
+ }
+
+ /**
+ * Returns the unrecognized option.
+ *
+ * @since 1.2
+ */
+ public String getOption()
+ {
+ return option;
+ }
}

Modified: commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/GnuParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/GnuParserTest.java?rev=679583&r1=679582&r2=679583&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/GnuParserTest.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/GnuParserTest.java Thu Jul 24 15:25:38 2008
@@ -65,28 +65,19 @@
assertTrue("Confirm size of extra args", cl.getArgList().size() == 2);
}

- public void testExtraOption() throws Exception
+ public void testUnrecognizedOption() throws Exception
{
- String[] args = new String[] { "-a", "-d", "-b", "toast",
- "foo", "bar" };
-
- boolean caught = false;
+ String[] args = new String[] { "-a", "-d", "-b", "toast", "foo", "bar" };

try
{
- CommandLine cl = parser.parse(options, args);
-
- assertTrue("Confirm -a is set", cl.hasOption("a"));
- assertTrue("Confirm -b is set", cl.hasOption("b"));
- assertTrue("confirm arg of -b", cl.getOptionValue("b").equals("toast"));
- assertTrue("Confirm size of extra args", cl.getArgList().size() == 3);
+ parser.parse(options, args);
+ fail("UnrecognizedOptionException wasn't thrown");
}
catch (UnrecognizedOptionException e)
{
- caught = true;
+ assertEquals("-d", e.getOption());
}
-
- assertTrue( "Confirm UnrecognizedOptionException caught", caught );
}

public void testMissingArg() throws Exception

Modified: commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/PosixParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/PosixParserTest.java?rev=679583&r1=679582&r2=679583&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/PosixParserTest.java (original)
+++ commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/PosixParserTest.java Thu Jul 24 15:25:38 2008
@@ -85,28 +85,19 @@
assertTrue( "Confirm size of extra args", cl.getArgList().size() == 2);
}

- public void testExtraOption() throws Exception
+ public void testUnrecognizedOption() throws Exception
{
- String[] args = new String[] { "-adbtoast",
- "foo", "bar" };
-
- boolean caught = false;
+ String[] args = new String[] { "-adbtoast", "foo", "bar" };

try
{
- CommandLine cl = parser.parse(options, args);
-
- assertTrue( "Confirm -a is set", cl.hasOption("a") );
- assertTrue( "Confirm -b is set", cl.hasOption("b") );
- assertTrue( "confirm arg of -b", cl.getOptionValue("b").equals("toast") );
- assertTrue( "Confirm size of extra args", cl.getArgList().size() == 3);
+ parser.parse(options, args);
+ fail("UnrecognizedOptionException wasn't thrown");
}
catch (UnrecognizedOptionException e)
{
- caught = true;
+ assertEquals("-adbtoast", e.getOption());
}
-
- assertTrue( "Confirm UnrecognizedOptionException caught", caught );
}

public void testMissingArg() throws Exception

svn commit: r679530 - in /commons/proper/cli/trunk/src: java/org/apache/commons/cli2/ java/org/apache/commons/cli2/commandline/ java/org/apache/commons/cli2/option/ test/org/apache/commons/cli2/ test/org/apache/commons/cli2/bug/

2008-07-24T13:28:17Z

Author: oheger
Date: Thu Jul 24 13:28:16 2008
New Revision: 679530

URL: http://svn.apache.org/viewvc?rev=679530&view=rev
Log:
CLI-123: Groups are now added to the command line if any of their child options are found. This makes it possible to test for the presence of a group and also validate minimum and maximum constraints when child groups are involved.

Added:
commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java (with props)
Modified:
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/OptionImpl.java
commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java?rev=679530&r1=679529&r2=679530&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/Option.java Thu Jul 24 13:28:16 2008
@@ -194,4 +194,25 @@
* @return true iff the CommandLine will be invalid without this Option
*/
boolean isRequired();
+
+ /**
+ * Returns the parent of this option. Options can be organized in a
+ * hierarchical manner if they are added to groups. This method can be used
+ * for obtaining the parent option of this option. The result may be
+ * <b>null</b> if this option does not have a parent.
+ *
+ * @return the parent of this option
+ */
+ Option getParent();
+
+ /**
+ * Sets the parent of this option. This method is called when the option is
+ * added to a group. Storing the parent of an option makes it possible to
+ * keep track of hierarchical relations between options. For instance, if an
+ * option is identified while parsing a command line, the group this option
+ * belongs to can also be added to the command line.
+ *
+ * @param parent the parent option
+ */
+ void setParent(Option parent);
}

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java?rev=679530&r1=679529&r2=679530&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java Thu Jul 24 13:28:16 2008
@@ -69,6 +69,13 @@
for (Iterator i = option.getTriggers().iterator(); i.hasNext();) {
nameToOption.put(i.next(), option);
}
+
+ // ensure that all parent options are also added
+ Option parent = option.getParent();
+ while (parent != null && !options.contains(parent)) {
+ options.add(parent);
+ parent = parent.getParent();
+ }
}

public void addValue(final Option option,

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java?rev=679530&r1=679529&r2=679530&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java Thu Jul 24 13:28:16 2008
@@ -89,6 +89,7 @@
// process the options
for (final Iterator i = options.iterator(); i.hasNext();) {
final Option option = (Option) i.next();
+ option.setParent(this);

if (option instanceof Argument) {
i.remove();

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/OptionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/OptionImpl.java?rev=679530&r1=679529&r2=679530&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/OptionImpl.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/OptionImpl.java Thu Jul 24 13:28:16 2008
@@ -33,6 +33,7 @@
public abstract class OptionImpl implements Option {
private final int id;
private final boolean required;
+ private Option parent;

/**
* Creates an OptionImpl with the specified id
@@ -95,7 +96,9 @@

public int hashCode() {
int hashCode = getId();
- hashCode = (hashCode * 37) + getPreferredName().hashCode();
+ if (getPreferredName() != null) {
+ hashCode = (hashCode * 37) + getPreferredName().hashCode();
+ }

if (getDescription() != null) {
hashCode = (hashCode * 37) + getDescription().hashCode();
@@ -123,6 +126,14 @@
// nothing to do normally
}

+ public Option getParent() {
+ return parent;
+ }
+
+ public void setParent(Option parent) {
+ this.parent = parent;
+ }
+
protected void checkPrefixes(final Set prefixes) {
// nothing to do if empty prefix list
if (prefixes.isEmpty()) {

Modified: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java?rev=679530&r1=679529&r2=679530&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java (original)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli2/CommandLineTestCase.java Thu Jul 24 13:28:16 2008
@@ -433,6 +433,7 @@
final Iterator i = cl.getOptions().iterator();

assertSame(login, i.next());
+ assertSame(group, i.next());
assertSame(help, i.next());
assertSame(targets, i.next());
assertSame(targets, i.next());

Added: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java?rev=679530&view=auto
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java (added)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java Thu Jul 24 13:28:16 2008
@@ -0,0 +1,126 @@
+/**
+ * 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.
+ */
+package org.apache.commons.cli2.bug;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.cli2.CommandLine;
+import org.apache.commons.cli2.Group;
+import org.apache.commons.cli2.Option;
+import org.apache.commons.cli2.OptionException;
+import org.apache.commons.cli2.builder.ArgumentBuilder;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
+import org.apache.commons.cli2.commandline.Parser;
+
+/**
+ * Group options are not added to the command line when child elements are
+ * detected. This causes the validation of maximum and minimum to fail.
+ *
+ * @author Oliver Heger
+ * @version $Id$
+ */
+public class BugCLI123Test extends TestCase {
+ /** An option of the parent group. */
+ private Option parentOption;
+
+ /** An option of the child group. */
+ private Option childOption1;
+
+ /** Another option of the child group. */
+ private Option childOption2;
+
+ /** The parent group. */
+ private Group parentGroup;
+
+ /** The child group. */
+ private Group childGroup;
+
+ /** The parser. */
+ private Parser parser;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ final ArgumentBuilder abuilder = new ArgumentBuilder();
+ final GroupBuilder gbuilder = new GroupBuilder();
+ parentOption = obuilder.withLongName("parent").withShortName("p")
+ .withArgument(abuilder.withName("name").create()).create();
+ childOption1 = obuilder.withLongName("child").withShortName("c")
+ .withArgument(abuilder.withName("c").create()).create();
+ childOption2 = obuilder.withLongName("sub").withShortName("s")
+ .withArgument(abuilder.withName("s").create()).create();
+ childGroup = gbuilder.withName("childOptions").withMinimum(0)
+ .withMaximum(2).withOption(childOption1).withOption(
+ childOption2).create();
+ parentGroup = gbuilder.withName("parentOptions").withMinimum(1)
+ .withMaximum(1).withOption(parentOption).withOption(childGroup)
+ .create();
+ parser = new Parser();
+ parser.setGroup(parentGroup);
+ }
+
+ /**
+ * A single option of the child group is specified.
+ */
+ public void testSingleChildOption() throws OptionException {
+ CommandLine cl = parser.parse(new String[] { "--child", "test" });
+ assertTrue("Child option not found", cl.hasOption(childOption1));
+ assertEquals("Wrong value for option", "test", cl
+ .getValue(childOption1));
+ assertTrue("Child group not found", cl.hasOption(childGroup));
+ }
+
+ /**
+ * Two options of the child group are specified.
+ */
+ public void testMultipleChildOptions() throws OptionException {
+ CommandLine cl = parser.parse(new String[] { "--child", "test",
+ "--sub", "anotherTest" });
+ assertTrue("Child option not found", cl.hasOption(childOption1));
+ assertEquals("Wrong value for option", "test", cl
+ .getValue(childOption1));
+ assertTrue("Sub option not found", cl.hasOption(childOption2));
+ assertEquals("Wrong value for sub option", "anotherTest", cl
+ .getValue(childOption2));
+ assertTrue("Child group not found", cl.hasOption(childGroup));
+ }
+
+ /**
+ * The option defined for the parent group is specified.
+ */
+ public void testSingleParentOption() throws OptionException {
+ CommandLine cl = parser.parse(new String[] { "--parent", "yes" });
+ assertTrue("Parent option not found", cl.hasOption(parentOption));
+ assertEquals("Wrong value for option", "yes", cl.getValue(parentOption));
+ assertFalse("Found child group", cl.hasOption(childGroup));
+ }
+
+ /**
+ * The parent option and an option of the child group is specified. This
+ * should cause an exception.
+ */
+ public void testParentOptionAndChildOption() throws OptionException {
+ try {
+ parser.parse(new String[] { "--parent", "error", "--child",
+ "exception" });
+ fail("Maximum restriction for parent not verified!");
+ } catch (OptionException oex) {
+ // ok
+ }
+ }
+}

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI123Test.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

svn commit: r679516 - /commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java

2008-07-24T12:46:30Z

Author: oheger
Date: Thu Jul 24 12:46:30 2008
New Revision: 679516

URL: http://svn.apache.org/viewvc?rev=679516&view=rev
Log:
CLI-6: Added an additional test case to verify that unknown short options cause an exception.

Modified:
commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java

Modified: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java?rev=679516&r1=679515&r2=679516&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java (original)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli2/commandline/ParserTest.java Thu Jul 24 12:46:30 2008
@@ -82,6 +82,17 @@
}
}

+ public void testParse_WithUnexpectedShortOption() {
+ try {
+ parser.parse(new String[]{"-vx"});
+ fail("OptionException");
+ }
+ catch(OptionException e) {
+ assertEquals(options,e.getOption());
+ assertEquals("Unexpected -x while processing --help|--verbose",e.getMessage());
+ }
+ }
+
public void testParseAndHelp_Successful() throws IOException {
final CommandLine cl = parser.parseAndHelp(new String[]{"-v"});

svn commit: r679511 - in /commons/proper/cli/trunk/src: java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java test/org/apache/commons/cli2/bug/BugCLI158Test.java

2008-07-24T12:38:04Z

Author: oheger
Date: Thu Jul 24 12:38:04 2008
New Revision: 679511

URL: http://svn.apache.org/viewvc?rev=679511&view=rev
Log:
CLI-158: Default arguments are now applied even if arguments are passed. The default values for missing arguments will be set.
Thanks to tobias dot bocanegra at day dot com for the patch.

Added:
commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java (with props)
Modified:
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java?rev=679511&r1=679510&r2=679511&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java Thu Jul 24 12:38:04 2008
@@ -109,26 +109,33 @@
}

public List getValues(final Option option,
- final List defaultValues) {
- // First grab the command line values
+ List defaultValues) {
+ // initialize the return list
List valueList = (List) values.get(option);

- // Secondly try the defaults supplied to the method
- if ((valueList == null) || valueList.isEmpty()) {
- valueList = defaultValues;
- }
-
- // Thirdly try the option's default values
- if ((valueList == null) || valueList.isEmpty()) {
- valueList = (List) this.defaultValues.get(option);
+ // grab the correct default values
+ if (defaultValues == null || defaultValues.isEmpty()) {
+ defaultValues = (List) this.defaultValues.get(option);
}

- // Finally use an empty list
- if (valueList == null) {
- valueList = Collections.EMPTY_LIST;
+ // augment the list with the default values
+ if (defaultValues != null && !defaultValues.isEmpty()) {
+ if (valueList == null || valueList.isEmpty()) {
+ valueList = defaultValues;
+ } else {
+ // if there are more default values as specified, add them to
+ // the list.
+ if (defaultValues.size() > valueList.size()) {
+ // copy the list first
+ valueList = new ArrayList(valueList);
+ for (int i=valueList.size(); i<defaultValues.size(); i++) {
+ valueList.add(defaultValues.get(i));
+ }
+ }
+ }
}
-
- return valueList;
+
+ return valueList == null ? Collections.EMPTY_LIST : valueList;
}

public List getUndefaultedValues(Option option) {

Added: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java?rev=679511&view=auto
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java (added)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java Thu Jul 24 12:38:04 2008
@@ -0,0 +1,114 @@
+/**
+ * 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.
+ */
+package org.apache.commons.cli2.bug;
+
+import java.util.Arrays;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.cli2.CommandLine;
+import org.apache.commons.cli2.Group;
+import org.apache.commons.cli2.builder.ArgumentBuilder;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
+import org.apache.commons.cli2.commandline.Parser;
+import org.apache.commons.cli2.option.DefaultOption;
+
+/**
+ * http://issues.apache.org/jira/browse/CLI-158
+ */
+public class BugCLI158Test extends TestCase {
+
+ private Parser createDefaultValueParser(String[] defaults) {
+ final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ final ArgumentBuilder abuilder = new ArgumentBuilder();
+ final GroupBuilder gbuilder = new GroupBuilder();
+
+ DefaultOption bOption = obuilder.withShortName("b")
+ .withLongName("b")
+ .withArgument(abuilder.withName("b")
+ .withMinimum(0)
+ .withMaximum(defaults.length)
+ .withDefaults(Arrays.asList(defaults))
+ .create())
+ .create();
+
+ Group options = gbuilder
+ .withName("options")
+ .withOption(bOption)
+ .create();
+
+ Parser parser = new Parser();
+ parser.setHelpTrigger("--help");
+ parser.setGroup(options);
+ return parser;
+ }
+
+ public void testSingleOptionSingleArgument() throws Exception {
+ Parser parser = createDefaultValueParser(new String[]{"100", "1000"});
+ String enteredValue1 = "1";
+ String[] args = new String[]{"-b", enteredValue1};
+ CommandLine cl = parser.parse(args);
+ CommandLine cmd = cl;
+ assertNotNull(cmd);
+ List b = cmd.getValues("-b");
+ assertEquals("[" + enteredValue1 + ", 1000]", b + "");
+ }
+
+ public void testSingleOptionNoArgument() throws Exception {
+ Parser parser = createDefaultValueParser(new String[]{"100", "1000"});
+ String[] args = new String[]{"-b"};
+ CommandLine cl = parser.parse(args);
+ CommandLine cmd = cl;
+ assertNotNull(cmd);
+ List b = cmd.getValues("-b");
+ assertEquals("[100, 1000]", b + "");
+ }
+
+ public void testSingleOptionMaximumNumberOfArgument() throws Exception {
+ String[] args = new String[]{"-b", "1", "2"};
+ final ArgumentBuilder abuilder = new ArgumentBuilder();
+ final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ final GroupBuilder gbuilder = new GroupBuilder();
+
+ DefaultOption bOption = obuilder.withShortName("b")
+ .withLongName("b")
+ .withArgument(abuilder.withName("b")
+ .withMinimum(2)
+ .withMaximum(4)
+ .withDefault("100")
+ .withDefault("1000")
+ .withDefault("10000")
+ .create())
+ .create();
+
+ Group options = gbuilder
+ .withName("options")
+ .withOption(bOption)
+ .create();
+
+ Parser parser = new Parser();
+ parser.setHelpTrigger("--help");
+ parser.setGroup(options);
+ CommandLine cl = parser.parse(args);
+ CommandLine cmd = cl;
+ assertNotNull(cmd);
+ List b = cmd.getValues("-b");
+ assertEquals("[1, 2, 10000]", b + "");
+ }
+}
\ No newline at end of file

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI158Test.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Re: [cli] CLI 2 State of Play

2008-07-24T09:33:05Z

Emmanuel,

Is there a way of triggering the CLI 1.2 release process? Given that
there are significant changes over 1.1 and the idea of a 1.3 is not
rejected, I think moving to a 1.2 release sooner rather than later would
be useful. The only threat I can see is if 1.2 has the same blocking
errors as 1.1 compared to 1.2 and I think you believe that the tests are
in place to show that the reported blocking problems of 1.1 are actually
fixed in 1.2-SNAPSHOT.

--
Russel.
====================================================
Dr Russel Winder Partner

Concertant LLP t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road, f: +44 8700 516 084
London SW11 1EN, UK. m: +44 7770 465 077

signature.asc (196 bytes) Download Attachment

svn commit: r679179 - in /commons/proper/cli/trunk/src: java/org/apache/commons/cli2/option/GroupImpl.java test/org/apache/commons/cli2/bug/BugCLI144Test.java

2008-07-23T13:09:05Z

Author: oheger
Date: Wed Jul 23 13:09:05 2008
New Revision: 679179

URL: http://svn.apache.org/viewvc?rev=679179&view=rev
Log:
CLI-144: validate() is now called only once for an option that belongs to a group.
Thanks to David dot Biesack at sas dot com for the unit test and dioktos at gmail dot com for a proposed fix.

Added:
commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java (with props)
Modified:
commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java

Modified: commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java?rev=679179&r1=679178&r2=679179&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java (original)
+++ commons/proper/cli/trunk/src/java/org/apache/commons/cli2/option/GroupImpl.java Wed Jul 23 13:09:05 2008
@@ -245,14 +245,8 @@
for (final Iterator i = options.iterator(); i.hasNext();) {
final Option option = (Option) i.next();

- // if the child option is required then validate it
- if (option.isRequired()) {
- option.validate(commandLine);
- }
-
- if (option instanceof Group) {
- option.validate(commandLine);
- }
+ // needs validation?
+ boolean validate = option.isRequired() || option instanceof Group;

// if the child option is present then validate it
if (commandLine.hasOption(option)) {
@@ -261,7 +255,10 @@

break;
}
+ validate = true;
+ }

+ if (validate) {
option.validate(commandLine);
}
}

Added: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java
URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java?rev=679179&view=auto
==============================================================================
--- commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java (added)
+++ commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java Wed Jul 23 13:09:05 2008
@@ -0,0 +1,66 @@
+/**
+ * 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.
+ */
+package org.apache.commons.cli2.bug;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.cli2.CommandLine;
+import org.apache.commons.cli2.Group;
+import org.apache.commons.cli2.builder.ArgumentBuilder;
+import org.apache.commons.cli2.builder.DefaultOptionBuilder;
+import org.apache.commons.cli2.builder.GroupBuilder;
+import org.apache.commons.cli2.commandline.Parser;
+import org.apache.commons.cli2.option.DefaultOption;
+import org.apache.commons.cli2.validation.FileValidator;
+
+/**
+ * Test case for http://issues.apache.org/jira/browse/CLI-144 CLI 2 throws
+ *
+ * <pre>
+ * Exception in thread "main" java.lang.ClassCastException: java.io.File cannot be cast to java.lang.String
+ * </pre>
+ *
+ * when there should be no such exception
+ *
+ * @author David Biesack
+ */
+public class BugCLI144Test extends TestCase {
+ public void testFileValidator() {
+ final DefaultOptionBuilder obuilder = new DefaultOptionBuilder();
+ final ArgumentBuilder abuilder = new ArgumentBuilder();
+ final GroupBuilder gbuilder = new GroupBuilder();
+ DefaultOption fileNameOption = obuilder.withShortName("f")
+ .withLongName("file-name").withRequired(true).withDescription(
+ "name of an existing file").withArgument(
+ abuilder.withName("file-name").withValidator(
+ FileValidator.getExistingFileInstance())
+ .create()).create();
+ Group options = gbuilder.withName("options").withOption(fileNameOption)
+ .create();
+ Parser parser = new Parser();
+ parser.setHelpTrigger("--help");
+ parser.setGroup(options);
+
+ final String fileName = "src/test/org/apache/commons/cli2/bug/BugCLI144Test.java";
+ CommandLine cl = parser
+ .parseAndHelp(new String[] { "--file-name", fileName });
+ assertNotNull(cl);
+ assertEquals("Wrong file", new File(fileName), cl.getValue(fileNameOption));
+ }
+}

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/proper/cli/trunk/src/test/org/apache/commons/cli2/bug/BugCLI144Test.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

svn commit: r679034 [2/2] - in /commons/sandbox/monitoring/trunk: ./ src/main/java/org/apache/commons/monitoring/ src/main/java/org/apache/commons/monitoring/impl/metrics/ src/main/java/org/apache/commons/monitoring/impl/monitors/ src/main/java/org/apa...

2008-07-23T02:00:23Z

Copied: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java (from r679011, commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java?p2=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java&p1=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java&r1=679011&r2=679034&rev=679034&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java Wed Jul 23 02:00:21 2008
@@ -25,20 +25,20 @@
import org.apache.commons.monitoring.Monitor;
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CompositeValuesMonitor;
+import org.apache.commons.monitoring.impl.monitors.CompositeMetricsMonitor;

/**
* Test for basic Monitor behaviour
*
* @author <a href="mailto:nicolas@...">Nicolas De Loof</a>
*/
-public class CompositeValuesMonitorTest
+public class CompositeMetricsMonitorTest
extends TestCase
{
public void testReset()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key( "MonitorTest.testReset", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key( "MonitorTest.testReset", "test", "utils" ) );
Counter counter = monitor.getCounter( Monitor.PERFORMANCES );
counter.add( 1, Unit.NANOS );
assertEquals( 1, counter.get() );
@@ -51,7 +51,7 @@
public void testCompositeCounter()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key( "MonitorTest.testComposite", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key( "MonitorTest.testComposite", "test", "utils" ) );
Counter counter = monitor.getCounter( MonitoringTest.COUNTER );
Composite<Counter> composite = (Composite<Counter>) counter;

@@ -79,7 +79,7 @@
public void testCompositeGauge()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key( "MonitorTest.testComposite", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key( "MonitorTest.testComposite", "test", "utils" ) );
Gauge gauge = monitor.getGauge( MonitoringTest.GAUGE );
Composite<Gauge> composite = (Composite<Gauge>) gauge;

Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:eol-style = native

Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =

Propchange: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain

Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java Wed Jul 23 02:00:21 2008
@@ -22,7 +22,7 @@
import org.apache.commons.monitoring.Counter;
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.values.ThreadSafeCounter;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeCounter;

public class ThreadSafeCounterTest
extends TestCase

Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java Wed Jul 23 02:00:21 2008
@@ -23,7 +23,7 @@
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Role;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.values.ThreadSafeGauge;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeGauge;

public class ThreadSafeGaugeTest
extends TestCase

Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java Wed Jul 23 02:00:21 2008
@@ -22,9 +22,9 @@
import org.apache.commons.monitoring.Counter;
import org.apache.commons.monitoring.Monitor;
import org.apache.commons.monitoring.MonitoringTest;
-import org.apache.commons.monitoring.StatValue;
+import org.apache.commons.monitoring.Metric;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CreateValuesOnDemandMonitor;
+import org.apache.commons.monitoring.impl.monitors.CreateMetricsOnDemandMonitor;
import org.apache.commons.monitoring.listeners.ThresholdListener;

/**
@@ -36,7 +36,7 @@
public void testThresholdListener()
throws Exception
{
- final Monitor monitor = new CreateValuesOnDemandMonitor(
+ final Monitor monitor = new CreateMetricsOnDemandMonitor(
new Monitor.Key( "MonitoringTest.testMonitoring", "test", "utils" ) );
Counter counter = monitor.getCounter( MonitoringTest.COUNTER );

@@ -65,7 +65,7 @@
this.monitor = monitor;
}

- public void exceed( StatValue value, long l )
+ public void exceed( Metric value, long l )
{
count++;
assertEquals( 10, l );

Modified: commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
--- commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java (original)
+++ commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java Wed Jul 23 02:00:21 2008
@@ -32,8 +32,8 @@
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Role;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CreateValuesOnDemandMonitor;
-import org.apache.commons.monitoring.impl.values.ThreadSafeCounter;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeCounter;
+import org.apache.commons.monitoring.impl.monitors.CreateMetricsOnDemandMonitor;
import org.apache.commons.monitoring.reporting.Renderer.Options;

public class RendererTest
@@ -46,12 +46,12 @@
throws Exception
{
monitors = new LinkedList<Monitor>();
- Monitor m1 = new CreateValuesOnDemandMonitor( new Monitor.Key( "JsonRendererTest.setUp", "test", "reporting" ) );
+ Monitor m1 = new CreateMetricsOnDemandMonitor( new Monitor.Key( "JsonRendererTest.setUp", "test", "reporting" ) );
m1.getCounter( Monitor.PERFORMANCES ).add( 10, Unit.NANOS );
m1.getGauge( Monitor.CONCURRENCY );
monitors.add( m1 );

- Monitor m2 = new CreateValuesOnDemandMonitor( new Monitor.Key( "TestCase", "test", "junit" ) );
+ Monitor m2 = new CreateMetricsOnDemandMonitor( new Monitor.Key( "TestCase", "test", "junit" ) );
m2.getCounter( Monitor.PERFORMANCES );
m2.getGauge( Monitor.CONCURRENCY ).increment(Unit.UNARY);
monitors.add( m2 );