Turn the code in the detail_print_help_synopsis test into actual tests.

tzlaine · Sep 13, 2020 · a0d9710 · a0d9710
1 parent 12355ca
commit a0d9710
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/include/boost/program_options_2/parse_command_line.hpp b/include/boost/program_options_2/parse_command_line.hpp
@@ -711,7 +711,7 @@ namespace boost { namespace program_options_2 {
     detail::option<T> argument(std::string_view names)
     {
         // There's something wrong with the argument names in "names".  Either
-        // it contains whitespace, of it contains at least one name that is
+        // it contains whitespace, or it contains at least one name that is
         // not of the form "-<name>" or "--<name>".
         BOOST_ASSERT(detail::valid_nonpositional_names(names));
         return {names, detail::action_kind::assign, 1};
@@ -741,7 +741,7 @@ namespace boost { namespace program_options_2 {
              ...));
 #endif
         // There's something wrong with the argument names in "names".  Either
-        // it contains whitespace, of it contains at least one name that is
+        // it contains whitespace, or it contains at least one name that is
         // not of the form "-<name>" or "--<name>".
         BOOST_ASSERT(detail::valid_nonpositional_names(names));
         // An argument with args=0 and no default is a flag.  Use flag()
@@ -894,7 +894,7 @@ namespace boost { namespace program_options_2 {
     /** TODO */
     template<option_or_group Option, option_or_group... Options>
     detail::option_group<false, Option, Options...>
-    suboptions(std::string_view name, Option opt, Options... opts)
+    subcommand_options(std::string_view name, Option opt, Options... opts)
     {
         return {name, {std::move(opt), std::move(opts)...}};
     }

diff --git a/test/printing.cpp b/test/printing.cpp
@@ -423,33 +423,48 @@ TEST(printing, detail_print_help_synopsis)
     {
         std::ostringstream os;
         po2::detail::print_help_synopsis<boost::text::format::utf8>(
-            std::cout,
+            os,
             sv(exe),
             sv("A program that does things."),
             po2::positional<int>("foo"));
-        // EXPECT_EQ(os.str(), " FOO");
+        EXPECT_EQ(os.str(), R"(usage:  foo/bar [-h] FOO
+
+A program that does things.
+
+)");
     }
 
     {
         std::ostringstream os;
         po2::detail::print_help_synopsis<boost::text::format::utf8>(
-            std::cout,
+            os,
             sv(exe),
             sv("A program that does things."),
             po2::positional<std::vector<int>>("foo", 30));
-        // EXPECT_EQ(os.str(), " FOO");
+        EXPECT_EQ(os.str(), R"(usage:  foo/bar [-h]
+                FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO
+
+A program that does things.
+
+)");
     }
 
     {
         std::string const long_exe = std::string("foo") + po2::detail::fs_sep +
                                      "barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr";
         std::ostringstream os;
         po2::detail::print_help_synopsis<boost::text::format::utf8>(
-            std::cout,
+            os,
             sv(long_exe),
             sv("A program that does things."),
             po2::positional<std::vector<int>>("foo", 30));
-        // EXPECT_EQ(os.str(), " FOO");
+        EXPECT_EQ(
+            os.str(), R"(usage:  foo/barrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr [-h]
+        FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO
+
+A program that does things.
+
+)");
     }
 }