You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/10/18 21:41:12 UTC
(commons-cli) branch master updated (c16057a8 -> 252a587d)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
from c16057a8 Refactor default parser test #294
new 967a3835 Sort members
new 252a587d Next version will be 1.10.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/changes/changes.xml | 2 +-
.../org/apache/commons/cli/DefaultParserTest.java | 118 ++++++++++-----------
2 files changed, 60 insertions(+), 60 deletions(-)
(commons-cli) 01/02: Sort members
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
commit 967a3835b743a05ebcb1b87fcd917dae6e89b924
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Oct 18 17:40:32 2024 -0400
Sort members
---
.../org/apache/commons/cli/DefaultParserTest.java | 118 ++++++++++-----------
1 file changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/test/java/org/apache/commons/cli/DefaultParserTest.java b/src/test/java/org/apache/commons/cli/DefaultParserTest.java
index 2f1272ca..d0507a68 100644
--- a/src/test/java/org/apache/commons/cli/DefaultParserTest.java
+++ b/src/test/java/org/apache/commons/cli/DefaultParserTest.java
@@ -37,65 +37,6 @@ import org.junit.jupiter.params.provider.ArgumentsSource;
public class DefaultParserTest extends AbstractParserTestCase {
- @Override
- @BeforeEach
- public void setUp() {
- super.setUp();
- parser = new DefaultParser();
- }
-
- @Test
- public void testBuilder() {
- // @formatter:off
- final Builder builder = DefaultParser.builder()
- .setStripLeadingAndTrailingQuotes(false)
- .setAllowPartialMatching(false)
- .setDeprecatedHandler(null);
- // @formatter:on
- parser = builder.build();
- assertEquals(DefaultParser.class, parser.getClass());
- parser = builder.get();
- assertEquals(DefaultParser.class, parser.getClass());
- }
-
- @Test
- public void testDeprecated() throws ParseException {
- final Set<Option> handler = new HashSet<>();
- parser = DefaultParser.builder().setDeprecatedHandler(handler::add).build();
- final Option opt1 = Option.builder().option("d1").deprecated().build();
- // @formatter:off
- final Option opt2 = Option.builder().option("d2").deprecated(DeprecatedAttributes.builder()
- .setForRemoval(true)
- .setSince("1.0")
- .setDescription("Do this instead.").get()).build();
- // @formatter:on
- final Option opt3 = Option.builder().option("a").build();
- // @formatter:off
- final CommandLine cl = parser.parse(new Options()
- .addOption(opt1)
- .addOption(opt2)
- .addOption(opt3),
- new String[] {"-d1", "-d2", "-a"});
- // @formatter:on
- // Trigger handler:
- assertTrue(cl.hasOption(opt1.getOpt()));
- assertTrue(cl.hasOption(opt2.getOpt()));
- assertTrue(cl.hasOption(opt3.getOpt()));
- // Assert handler was triggered
- assertTrue(handler.contains(opt1));
- assertTrue(handler.contains(opt2));
- assertFalse(handler.contains(opt3));
- }
-
- @ParameterizedTest(name = "{index}. {0}")
- @ArgumentsSource(ExternalArgumentsProvider.class)
- public void testParameterized(final String testName, final CommandLineParser parser, final String[] args, final String expected,
- final String option, final String message) throws Exception {
- final CommandLine cl = parser.parse(options, args);
-
- assertEquals(expected, cl.getOptionValue(option), message);
- }
-
static class ExternalArgumentsProvider implements ArgumentsProvider {
@Override
@@ -209,12 +150,71 @@ public class DefaultParserTest extends AbstractParserTestCase {
}
}
+ @Override
+ @BeforeEach
+ public void setUp() {
+ super.setUp();
+ parser = new DefaultParser();
+ }
+
+ @Test
+ public void testBuilder() {
+ // @formatter:off
+ final Builder builder = DefaultParser.builder()
+ .setStripLeadingAndTrailingQuotes(false)
+ .setAllowPartialMatching(false)
+ .setDeprecatedHandler(null);
+ // @formatter:on
+ parser = builder.build();
+ assertEquals(DefaultParser.class, parser.getClass());
+ parser = builder.get();
+ assertEquals(DefaultParser.class, parser.getClass());
+ }
+
+ @Test
+ public void testDeprecated() throws ParseException {
+ final Set<Option> handler = new HashSet<>();
+ parser = DefaultParser.builder().setDeprecatedHandler(handler::add).build();
+ final Option opt1 = Option.builder().option("d1").deprecated().build();
+ // @formatter:off
+ final Option opt2 = Option.builder().option("d2").deprecated(DeprecatedAttributes.builder()
+ .setForRemoval(true)
+ .setSince("1.0")
+ .setDescription("Do this instead.").get()).build();
+ // @formatter:on
+ final Option opt3 = Option.builder().option("a").build();
+ // @formatter:off
+ final CommandLine cl = parser.parse(new Options()
+ .addOption(opt1)
+ .addOption(opt2)
+ .addOption(opt3),
+ new String[] {"-d1", "-d2", "-a"});
+ // @formatter:on
+ // Trigger handler:
+ assertTrue(cl.hasOption(opt1.getOpt()));
+ assertTrue(cl.hasOption(opt2.getOpt()));
+ assertTrue(cl.hasOption(opt3.getOpt()));
+ // Assert handler was triggered
+ assertTrue(handler.contains(opt1));
+ assertTrue(handler.contains(opt2));
+ assertFalse(handler.contains(opt3));
+ }
+
@Override
@Test
@Disabled("Test case handled in the parameterized tests as \"DEFAULT behavior\"")
public void testLongOptionWithEqualsQuoteHandling() throws Exception {
}
+ @ParameterizedTest(name = "{index}. {0}")
+ @ArgumentsSource(ExternalArgumentsProvider.class)
+ public void testParameterized(final String testName, final CommandLineParser parser, final String[] args, final String expected,
+ final String option, final String message) throws Exception {
+ final CommandLine cl = parser.parse(options, args);
+
+ assertEquals(expected, cl.getOptionValue(option), message);
+ }
+
@Override
@Test
@Disabled("Test case handled in the parameterized tests as \"DEFAULT behavior\"")
(commons-cli) 02/02: Next version will be 1.10.0
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-cli.git
commit 252a587d38258a3fd49cccb498a050de23b1a9fe
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Oct 18 17:41:08 2024 -0400
Next version will be 1.10.0
---
src/changes/changes.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4e6224d6..1cfd8500 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
<title>Apache Commons CLI Release Notes</title>
</properties>
<body>
- <release version="1.9.1" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
+ <release version="1.10.0" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required.">
<!-- FIX -->
<action type="add" issue="CLI-339" dev="ggregory" due-to="Gary Gregory">Deprecate CommandLine.Builder() in favor of CommandLine.builder().</action>
<action type="add" issue="CLI-339" dev="ggregory" due-to="Gary Gregory">Deprecate DeprecatedAttributes.Builder() in favor of DeprecatedAttributes.builder().</action>