[#1930] fix failing tests for testEndOfOptionsWithoutOptions, testNamelessCommand, and testHiddenOptions

MikeTheSnowman · remkop · commit 66279cc2f3d3 · 2023-01-27T17:42:13.000+09:00
diff --git a/picocli-codegen/src/test/java/picocli/codegen/docgen/manpage/ManPageGeneratorTest.java b/picocli-codegen/src/test/java/picocli/codegen/docgen/manpage/ManPageGeneratorTest.java
@@ -210,7 +210,6 @@ class MyApp {
         assertEquals(expected, sw.toString());
     }
 
-    @Ignore("[#1930] - needs test fixes for #1896 changes")
     @Test
     public void testHiddenOptions() throws IOException {
 
@@ -288,7 +287,6 @@ private String readAndClose(InputStream in) throws IOException {
         }
     }
 
-    @Ignore("[#1930] - needs test fixes for #1896 changes")
     @Test
     public void testEndOfOptionsWithoutOptions() throws IOException {
 
@@ -458,7 +456,6 @@ public Integer call() throws Exception {
         }
     }
 
-    @Ignore("[#1930] - needs test fixes for #1896 changes")
     @Test
     public void testNamelessCommand() throws IOException {
         File outdir = new File(System.getProperty("java.io.tmpdir"), "manpage" + System.currentTimeMillis());
diff --git a/picocli-codegen/src/test/resources/manpagegenerator/main_class.adoc b/picocli-codegen/src/test/resources/manpagegenerator/main_class.adoc
@@ -1,9 +1,9 @@
 // tag::picocli-generated-full-manpage[]
 // tag::picocli-generated-man-section-header[]
 :doctype: manpage
-:revnumber: 
+:revnumber:
 :manmanual: <main class> Manual
-:mansource: 
+:mansource:
 :man-linkstyle: pass:[blue R < >]
 = <main class>(1)
 
@@ -12,7 +12,7 @@
 // tag::picocli-generated-man-section-name[]
 == Name
 
-<main class> - 
+<main class> -
 
 // end::picocli-generated-man-section-name[]
 
@@ -31,13 +31,14 @@
 // end::picocli-generated-man-section-description[]
 
 // tag::picocli-generated-man-section-options[]
+
 // end::picocli-generated-man-section-options[]
 
 // tag::picocli-generated-man-section-arguments[]
 == Arguments
 
 _<file>_::
-  
+
 
 // end::picocli-generated-man-section-arguments[]
 
diff --git a/picocli-codegen/src/test/resources/testEndOfOptionsWithoutOptions.manpage.adoc b/picocli-codegen/src/test/resources/testEndOfOptionsWithoutOptions.manpage.adoc
@@ -31,10 +31,6 @@ This app does great things.
 // end::picocli-generated-man-section-description[]
 
 // tag::picocli-generated-man-section-options[]
-== Options
-
-*--*::
-  This option can be used to separate command-line options from the list of positional parameters.
 
 // end::picocli-generated-man-section-options[]
 
diff --git a/picocli-codegen/src/test/resources/testHiddenOptions.manpage.adoc b/picocli-codegen/src/test/resources/testHiddenOptions.manpage.adoc
@@ -31,6 +31,7 @@ This app does great things.
 // end::picocli-generated-man-section-description[]
 
 // tag::picocli-generated-man-section-options[]
+
 // end::picocli-generated-man-section-options[]
 
 // tag::picocli-generated-man-section-arguments[]

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,6 @@ class MyApp {`
`210`	`210`	`assertEquals(expected, sw.toString());`
`211`	`211`	`}`
`212`	`212`
`213`		`- @Ignore("[#1930] - needs test fixes for #1896 changes")`
`214`	`213`	`@Test`
`215`	`214`	`public void testHiddenOptions() throws IOException {`
`216`	`215`
`@@ -288,7 +287,6 @@ private String readAndClose(InputStream in) throws IOException {`
`288`	`287`	`}`
`289`	`288`	`}`
`290`	`289`
`291`		`- @Ignore("[#1930] - needs test fixes for #1896 changes")`
`292`	`290`	`@Test`
`293`	`291`	`public void testEndOfOptionsWithoutOptions() throws IOException {`
`294`	`292`
`@@ -458,7 +456,6 @@ public Integer call() throws Exception {`
`458`	`456`	`}`
`459`	`457`	`}`
`460`	`458`
`461`		`- @Ignore("[#1930] - needs test fixes for #1896 changes")`
`462`	`459`	`@Test`
`463`	`460`	`public void testNamelessCommand() throws IOException {`
`464`	`461`	`File outdir = new File(System.getProperty("java.io.tmpdir"), "manpage" + System.currentTimeMillis());`