Added helpDisplayed flag

Author: Jirous, Michal

cppcommandline.qbs

@@ -12,6 +12,7 @@ Project
 
         name: "cppcommandlineexample"
         cpp.includePaths: [ "include", "example" ]
+        cpp.cxxLanguageVersion: "c++11"
         files: [ "example/*" ]
     }
 
@@ -20,6 +21,7 @@ Project
         Depends { name: "Qt.testlib" }
         name: "cppcommandlinetest"
         cpp.includePaths: [ "include", "test" ]
+        cpp.cxxLanguageVersion: "c++11"
         files: [ "test/*" ]
     }
 }

include/cppcommandline.h

@@ -467,6 +467,11 @@ class Parser
         return mAppName;
     }
 
+    bool helpDisplayed() const
+    {
+        return mHelpDisplayed;
+    }
+
     Option &option()
     {
         mOptions.emplace_back(Option());
@@ -540,6 +545,7 @@ class Parser
                 }
 
                 std::cout << std::endl;
+                mHelpDisplayed = true;
                 return;
             }
         }
@@ -594,6 +600,7 @@ class Parser
     std::vector<std::string> mArgs;
     std::vector<Option> mOptions;
     bool mHelp = true;
+    bool mHelpDisplayed = false;
 };
 
 }

test/cppcommandlinetest.cpp

@@ -13,7 +13,7 @@ void CppCommandLineTest::OptionDefaultCtor()
     QCOMPARE(option.description(), std::string());
     QCOMPARE(option.isRequired(), false);
     QCOMPARE(option.defaultValue<std::string>(), std::string());
-    QCOMPARE(option.boundValue<std::string>(), nullptr);
+    QVERIFY(option.boundValue<std::string>() == nullptr);
 }
 
 void CppCommandLineTest::OptionLongNameCtor()
@@ -359,6 +359,7 @@ void CppCommandLineTest::parse()
     QCOMPARE(option, std::string("file"));
     QCOMPARE(another, 10);
     QCOMPARE(positional, std::string("somefile"));
+    QVERIFY(!parser.helpDisplayed());
     }
 }
 
@@ -398,4 +399,17 @@ void CppCommandLineTest::parseFailed()
     }
 }
 
+void CppCommandLineTest::help()
+{
+
+    {
+    SCENARIO("Unmatched required option")
+    std::vector<const char*> args{"./app", "-h"};
+    cppcommandline::Parser parser;
+    parser.parse(static_cast<int>(args.size()), const_cast<char**>(args.data()));
+    QVERIFY(parser.helpDisplayed());
+    }
+
+}
+
 QTEST_APPLESS_MAIN(CppCommandLineTest)

test/cppcommandlinetest.h

@@ -22,6 +22,7 @@ private slots:
     void ParserOptionLongName();
     void parse();
     void parseFailed();
+    void help();
 
 private:
     std::unique_ptr<char**, void(*)(char**)> createArguments(std::vector<std::string> arguments);