From 12231256e4f1c345fb62c1f596b1efa15eb74e9b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 20 Feb 2014 00:31:49 +0000
Subject: [PATCH] Fix wxCmdLineParser::Found(name) for options with values.

Calling Found() without providing the second "value" argument started
generating an assert since introduction of the negated options as it reused
FoundSwitch() which can only be used for switches, i.e. options without
values.

Fix this to revert a regression since 2.8 and also add unit tests for the
different Found() overloads.

Closes #15986, #16001.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/cmdline.cpp        |  4 ++-
 tests/cmdline/cmdlinetest.cpp | 61 +++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index 7c567483dc..972d8431da 100644
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -552,7 +552,9 @@ void wxCmdLineParser::AddUsageText(const wxString& text)
 
 bool wxCmdLineParser::Found(const wxString& name) const
 {
-    return FoundSwitch(name) != wxCMD_SWITCH_NOT_FOUND;
+    const wxCmdLineOption* const opt = m_data->FindOptionByAnyName(name);
+
+    return opt && opt->HasValue();
 }
 
 wxCmdLineSwitchState wxCmdLineParser::FoundSwitch(const wxString& name) const
diff --git a/tests/cmdline/cmdlinetest.cpp b/tests/cmdline/cmdlinetest.cpp
index 2e5728971a..5c770d0a5a 100644
--- a/tests/cmdline/cmdlinetest.cpp
+++ b/tests/cmdline/cmdlinetest.cpp
@@ -37,11 +37,13 @@ private:
         CPPUNIT_TEST( ConvertStringTestCase );
         CPPUNIT_TEST( ParseSwitches );
         CPPUNIT_TEST( Usage );
+        CPPUNIT_TEST( Found );
     CPPUNIT_TEST_SUITE_END();
 
     void ConvertStringTestCase();
     void ParseSwitches();
     void Usage();
+    void Found();
 
     DECLARE_NO_COPY_CLASS(CmdLineTestCase)
 };
@@ -250,3 +252,62 @@ void CmdLineTestCase::Usage()
     CPPUNIT_ASSERT_EQUAL("Even more usage text", usageLines[Line_Text_Dummy2]);
     CPPUNIT_ASSERT_EQUAL("", usageLines[Line_Last]);
 }
+
+void CmdLineTestCase::Found()
+{
+    static const wxCmdLineEntryDesc desc[] =
+    {
+        { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
+        { wxCMD_LINE_OPTION, "o", "output",  "output file" },
+        { wxCMD_LINE_OPTION, "s", "size",    "output block size", wxCMD_LINE_VAL_NUMBER },
+        { wxCMD_LINE_OPTION, "d", "date",    "output file date", wxCMD_LINE_VAL_DATE },
+        { wxCMD_LINE_OPTION, "f", "double",  "output double", wxCMD_LINE_VAL_DOUBLE },
+        { wxCMD_LINE_PARAM,  NULL, NULL, "input file", },
+        { wxCMD_LINE_NONE }
+    };
+
+    wxCmdLineParser p(desc);
+    p.SetCmdLine ("-v --output hello -s 2 --date=2014-02-17 -f 0.2 input-file.txt");
+
+    CPPUNIT_ASSERT(p.Parse() == 0);
+
+    wxString dummys;
+    wxDateTime dummydate;
+    long dummyl;
+    double dummyd;
+    // now verify that any option/switch badly queried actually generates an exception
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("v", &dummyd));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("v", &dummydate));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("v", &dummyl));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("v", &dummys));
+    CPPUNIT_ASSERT(p.FoundSwitch("v") != wxCMD_SWITCH_NOT_FOUND);
+    CPPUNIT_ASSERT(p.Found("v"));
+
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("o", &dummyd));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("o", &dummydate));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("o", &dummyl));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.FoundSwitch("o"));
+    CPPUNIT_ASSERT(p.Found("o", &dummys));
+    CPPUNIT_ASSERT(p.Found("o"));
+
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("s", &dummyd));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("s", &dummydate));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("s", &dummys));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.FoundSwitch("s"));
+    CPPUNIT_ASSERT(p.Found("s", &dummyl));
+    CPPUNIT_ASSERT(p.Found("s"));
+
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("d", &dummyd));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("d", &dummyl));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("d", &dummys));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.FoundSwitch("d"));
+    CPPUNIT_ASSERT(p.Found("d", &dummydate));
+    CPPUNIT_ASSERT(p.Found("d"));
+
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("f", &dummydate));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("f", &dummyl));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.Found("f", &dummys));
+    WX_ASSERT_FAILS_WITH_ASSERT(p.FoundSwitch("f"));
+    CPPUNIT_ASSERT(p.Found("f", &dummyd));
+    CPPUNIT_ASSERT(p.Found("f"));
+}