Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#1930] fix 3 failing tests in ManPageGeneratorTest #1940

Merged
merged 1 commit into from
Jan 27, 2023
Merged

[#1930] fix 3 failing tests in ManPageGeneratorTest #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions picocli-codegen/src/test/java/picocli/codegen/docgen/manpage/ManPageGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ class MyApp {
assertEquals(expected, sw.toString());
}

@Ignore("[#1930] - needs test fixes for #1896 changes")
@Test
public void testHiddenOptions() throws IOException {

Expand Down Expand Up @@ -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 {

Expand Down Expand Up @@ -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());
Expand Down
9 changes: 5 additions & 4 deletions picocli-codegen/src/test/resources/manpagegenerator/main_class.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -12,7 +12,7 @@
// tag::picocli-generated-man-section-name[]
== Name

<main class> -
<main class> -

// end::picocli-generated-man-section-name[]

Expand All @@ -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[]

Expand Down
4 changes: 0 additions & 4 deletions picocli-codegen/src/test/resources/testEndOfOptionsWithoutOptions.manpage.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
1 change: 1 addition & 0 deletions picocli-codegen/src/test/resources/testHiddenOptions.manpage.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down