Updated CommandSpec.remove(ArgSpec arg) method to remove the arg from…

… args (List<ArgSpec>) and test case corresponding to same.
remkop · Sep 15, 2021 · acc0c8f · acc0c8f
1 parent 5a95ec3
commit acc0c8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
@@ -6728,6 +6728,7 @@ public CommandSpec remove(ArgSpec arg) {
                 if (positionalParameters.remove(arg)) {
                     removed++;
                 }
+                args.remove(arg);
                 if (removed == 0) {
                     throw new NoSuchElementException(String.valueOf(arg));
                 }

diff --git a/src/test/java/picocli/ModelCommandSpecTest.java b/src/test/java/picocli/ModelCommandSpecTest.java
@@ -1388,6 +1388,7 @@ class MyApp {
         spec.remove(old);
         spec.add(newOpenOption);
 
+        assertFalse(spec.args().contains(old));
         String expectAfter = String.format("" +
                 "Usage: <main class>%n");
         assertEquals(expectAfter, cmd.getUsageMessage(Ansi.OFF));
@@ -1410,6 +1411,7 @@ class Positional {
         assertEquals(CommandLine.Range.valueOf("1"), second.index());
 
         spec.remove(second);
+        assertFalse(spec.args().contains(second));
         assertEquals(1, spec.positionalParameters().size());
         assertSame(first, spec.positionalParameters().get(0));
     }