Added tests for cppcommandline::Option

Author: mv185095

include/cppcommandline.h

@@ -12,13 +12,6 @@ namespace cppcommandline
 class Option
 {
 public:
-    enum class Match
-    {
-        None,
-        Argument,
-        ArgumentAndValue
-    };
-
     Option() :
         d(std::unique_ptr<OptionPrivate>(new OptionPrivate))
     {
@@ -34,6 +27,19 @@ class Option
             d->longName = longName;
     }
 
+    Option(Option &&option) :
+        d(option.d.release())
+    {
+
+    }
+
+    Option(const Option &option) = delete;
+
+    Option &operator=(Option &&option)
+    {
+        d.reset(option.d.release()); return *this;
+    }
+
     bool isPositional() const
     {
         return d->longName.empty();
@@ -94,20 +100,6 @@ class Option
         return val;
     }
 
-    Option(Option &&option) :
-        d(option.d.release())
-    {
-
-    }
-
-    Option(const Option &option) = delete;
-
-    Option &operator=(Option &&option)
-    {
-        d.reset(option.d.release());
-        return *this;
-    }
-
     Option &asShortName(std::string shortName)
     {
 
@@ -163,49 +155,17 @@ class Option
         setValueBinding(&value);
     }
 
-    Match match(std::string argument, std::string next = std::string())
+private:
+    enum class Type
     {
-        Match result = Match::None;
-        KeyValue keyValue = getKeyValue(argument);
-
-        if(keyValue.key.empty()) //either positional or next is a value
-        {
-            if(isLongNameArgument(argument))
-            {
-
-            }
-            else if(isShortNameArgument(argument))
-            {
-
-            }
-            else //positional, next is not part of this resolution
-            {
-                if(d->type == Type::Bool) //next is not part of this resolution
-                {
-
-                }
-                else
-                {
-
-                }
-            }
-        }
-        else //next is not part of this resolution
-        {
-            if(isLongNameArgument(keyValue.key))
-            {
-
-            }
-            else if(isShortNameArgument(keyValue.key))
-            {
-
-            }
-        }
-
-        return result;
-    }
+        Undefined,
+        String,
+        Integer,
+        LongLong,
+        Double,
+        Bool
+    };
 
-private:
     union DefaultValue
     {
         int i;
@@ -229,16 +189,6 @@ class Option
         std::string value;
     };
 
-    enum class Type
-    {
-        Undefined,
-        String,
-        Integer,
-        LongLong,
-        Double,
-        Bool
-    };
-
     struct OptionPrivate
     {
         std::string longName;

test/cppcommandlinetest.cpp

@@ -6,7 +6,6 @@
 void CppCommandLineTest::OptionDefaultCtor()
 {
     SCENARIO("Option default constructor")
-
     cppcommandline::Option option;
     QCOMPARE(true, option.isPositional());
     QCOMPARE(std::string(), option.longName());
@@ -17,4 +16,124 @@ void CppCommandLineTest::OptionDefaultCtor()
     QCOMPARE(nullptr, option.boundValue<std::string>());
 }
 
+void CppCommandLineTest::OptionLongNameCtor()
+{
+    {
+    SCENARIO("Option long name constructor")
+    cppcommandline::Option option("longName1");
+    QCOMPARE(std::string("longName1"), option.longName());
+    }
+
+    {
+    SCENARIO("Option invalid long name")
+    QVERIFY_EXCEPTION_THROWN(cppcommandline::Option option("long.name"), std::logic_error);
+    }
+}
+
+void CppCommandLineTest::OptionMoveCtor()
+{
+    SCENARIO("Option move ctor")
+    cppcommandline::Option option(cppcommandline::Option("longName"));
+    QCOMPARE(std::string("longName"), option.longName());
+}
+
+void CppCommandLineTest::OptionMoveAssignment()
+{
+    SCENARIO("Option move assignment")
+    cppcommandline::Option option = cppcommandline::Option("longName");
+    QCOMPARE(std::string("longName"), option.longName());
+}
+
+void CppCommandLineTest::positional()
+{
+    {
+    SCENARIO("Option is positional without any names")
+    cppcommandline::Option option;
+    QCOMPARE(true, option.isPositional());
+    }
+
+    {
+    SCENARIO("Option is not positional if it has a name")
+    cppcommandline::Option option("longName");
+    QCOMPARE(false, option.isPositional());
+    }
+}
+
+void CppCommandLineTest::shortName()
+{
+    {
+    SCENARIO("Option short name")
+    cppcommandline::Option option = std::move(cppcommandline::Option("longName1").asShortName("o"));
+    QCOMPARE(std::string("o"), option.shortName());
+    }
+
+    {
+    SCENARIO("Option invalid short name")
+    QVERIFY_EXCEPTION_THROWN(cppcommandline::Option("longName").asShortName("o1"), std::logic_error);
+    }
+}
+
+void CppCommandLineTest::description()
+{
+    SCENARIO("Option description")
+    cppcommandline::Option option = std::move(cppcommandline::Option("longName").withDescription("My fancty description"));
+    QCOMPARE(std::string("My fancty description"), option.description());
+}
+
+void CppCommandLineTest::required()
+{
+    {
+    SCENARIO("Option required")
+    cppcommandline::Option option = std::move(cppcommandline::Option("longName").required());
+    QCOMPARE(true, option.isRequired());
+    }
+
+    {
+    SCENARIO("Option with default value cannot be required")
+    QVERIFY_EXCEPTION_THROWN(cppcommandline::Option("longName").withDefaultValue(10).required(), std::logic_error);
+    }
+}
+
+void CppCommandLineTest::defaultValue()
+{
+    {
+    SCENARIO("Option default value")
+    cppcommandline::Option option = std::move(cppcommandline::Option("longName").withDefaultValue(std::string("option")));
+    QCOMPARE(std::string("option"), option.defaultValue<std::string>());
+    }
+
+    {
+    SCENARIO("Option default value cannot be specified for required options")
+    QVERIFY_EXCEPTION_THROWN(cppcommandline::Option("longName").required().withDefaultValue(std::string("option")), std::logic_error);
+    }
+
+    {
+    SCENARIO("Option with default value cannot return different type")
+    cppcommandline::Option option = std::move(cppcommandline::Option("longName").withDefaultValue(std::string("option")));
+    QVERIFY_EXCEPTION_THROWN(option.defaultValue<int>(), std::logic_error);
+    }
+}
+
+void CppCommandLineTest::boundValue()
+{
+    {
+    SCENARIO("Option bound value")
+    std::string boundValue;
+    cppcommandline::Option option;
+    option.bindTo(boundValue);
+    QCOMPARE(&boundValue, option.boundValue<std::string>());
+    }
+
+    {
+    SCENARIO("Option bound value with differently typed default value is not possible")
+    std::string boundValue;
+    cppcommandline::Option option = std::move(cppcommandline::Option().withDefaultValue(10));
+    QVERIFY_EXCEPTION_THROWN(option.bindTo(boundValue), std::logic_error);
+    }
+}
+
+
+
+
+
 QTEST_APPLESS_MAIN(CppCommandLineTest)

test/cppcommandlinetest.h

@@ -7,4 +7,13 @@ class CppCommandLineTest : public QObject
     Q_OBJECT
 private slots:
     void OptionDefaultCtor();
+    void OptionLongNameCtor();
+    void OptionMoveCtor();
+    void OptionMoveAssignment();
+    void positional();
+    void shortName();
+    void description();
+    void required();
+    void defaultValue();
+    void boundValue();
 };

test/qtestbdd.h

@@ -120,19 +120,19 @@ namespace qtestbdd
 
 //gtestbdd
 #define FEATURE(description)\
-    qInfo() << "FEATURE " << description;
+qInfo() << "FEATURE " << description;
 
 #define SCENARIO(description)\
-    qtestbdd::Scenario s(description);
+qtestbdd::Scenario s(description);
 
 #define GIVEN(description)\
-    s.given(description);
+s.given(description);
 
 #define WHEN(description)\
-    s.when(description);
+s.when(description);
 
 #define THEN(description)\
-    s.then(description);
+s.then(description);
 
 #define AND(description)\
-    s.et(description);
+s.et(description);