Convert the gtest tests to catch2 and relocate.

Author: stevenlovegrove

components/pango_core/CMakeLists.txt

@@ -56,4 +56,10 @@ IF(MSVC)
       DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}/pangolin
     )
     target_include_directories(${COMPONENT} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/include")
-ENDIF()
+ENDIF()
+
+find_package(Catch2 2 QUIET)
+if(Catch2_FOUND)
+    add_executable(test_uris ${CMAKE_CURRENT_LIST_DIR}/tests/tests_uri.cpp)
+    target_link_libraries(test_uris PRIVATE Catch2::Catch2 ${COMPONENT})
+endif()

components/pango_core/tests/tests_uri.cpp

@@ -0,0 +1,87 @@
+#define CATCH_CONFIG_MAIN
+#include <catch2/catch.hpp>
+
+#include <string>
+#include <limits>
+#include <functional>
+#include <pangolin/factory/factory_registry.h>
+
+template<typename T>
+inline void ExpectExceptionWithMessageFromAction(
+    std::function<void()> action,
+    const std::string& exceptionMessageBegin
+) {
+    try
+    {
+        action();
+
+        FAIL("The action succeeded when it should have failed.");
+    }
+    catch(const T& ex)
+    {
+        std::string exceptionMessage = std::string(ex.what());
+        std::string exceptionMessageRelevantPortion
+            = exceptionMessage.substr(0, exceptionMessageBegin.size());
+        REQUIRE(exceptionMessageRelevantPortion.compare(exceptionMessageBegin) == 0);
+    }
+    catch(...)
+    {
+        FAIL("Another kind of exception was thrown to the one expected");
+    }
+}
+
+TEST_CASE("Missing Closing Bracket Causes Exception")
+{
+    const std::string rawUri = "abc:[...";
+    auto testAction = [&](){pangolin::ParseUri(rawUri);};
+    ExpectExceptionWithMessageFromAction<std::runtime_error>(testAction,
+         "Unable to parse URI: '" + rawUri + "'");
+}
+
+TEST_CASE("Uri Equals Sign Character In Value Truncates The Rest")
+{
+    const std::string fullUri = "abc:[key=value=notfound,key2=value2]";
+    const pangolin::Uri pangoUri = pangolin::ParseUri(fullUri);
+
+    // parsing option list should have precendence over parsing individual option
+    REQUIRE(pangoUri.params.size() ==  2);
+
+    REQUIRE( pangoUri.params[0].first == std::string("key"));
+    REQUIRE( pangoUri.params[1].first == std::string("key2"));
+
+    const std::string truncated = pangoUri.Get<std::string>("key", "");
+    REQUIRE( truncated == std::string("value"));
+
+    const std::string otherValue = pangoUri.Get<std::string>("key2", "");
+    REQUIRE( otherValue == std::string("value2"));
+}
+
+TEST_CASE("Uri Multiple Occurrences Of Option Overrides Previous")
+{
+    const std::string fullUri = "abc:[key=value,key=value2]";
+    const pangolin::Uri pangoUri = pangolin::ParseUri(fullUri);
+
+    REQUIRE(pangoUri.params.size() == 2);
+    REQUIRE( pangoUri.params[0].first == std::string("key"));
+    REQUIRE( pangoUri.params[1].first == std::string("key"));
+
+    const std::string truncated = pangoUri.Get<std::string>("key", "");
+    REQUIRE( truncated == std::string("value2"));
+}
+
+
+TEST_CASE("Uri Url Contains Everything After Separator")
+{
+    const std::string expectedUrl = "abc:123[],=";
+    const std::string fullUri = "abc:[key=value,key=value2]//" + expectedUrl;
+    const pangolin::Uri pangoUri = pangolin::ParseUri(fullUri);
+    REQUIRE( pangoUri.url == expectedUrl);
+}
+
+TEST_CASE("Uri Invalid Characters After Closed Bracket Are Ignored")
+{
+    const std::string expectedUrl = "abc:123[],=";
+    const std::string fullUri = "abc:[key=value,key=value2]xyz//" + expectedUrl;
+    const pangolin::Uri pangoUri = pangolin::ParseUri(fullUri);
+    REQUIRE( pangoUri.url == expectedUrl);
+}

components/pango_video/CMakeLists.txt

@@ -219,3 +219,10 @@ target_include_directories(${COMPONENT}
 )
 
 target_link_libraries(${COMPONENT} PUBLIC pango_core pango_image pango_packetstream)
+
+
+find_package(Catch2 2 QUIET)
+if(Catch2_FOUND)
+    add_executable(test_video_uris ${CMAKE_CURRENT_LIST_DIR}/tests/tests_video_uri.cpp)
+    target_link_libraries(test_video_uris PRIVATE Catch2::Catch2 ${COMPONENT})
+endif()

components/pango_video/tests/tests_video_uri.cpp

@@ -0,0 +1,79 @@
+#define CATCH_CONFIG_MAIN
+#include <catch2/catch.hpp>
+
+#include <string>
+#include <limits>
+#include <functional>
+#include <pangolin/factory/factory_registry.h>
+#include <pangolin/video/video.h>
+#include <pangolin/video/video_exception.h>
+#include <pangolin/video/iostream_operators.h>
+
+template<typename T>
+inline void ExpectExceptionWithMessageFromAction(
+    std::function<void()> action,
+    const std::string& exceptionMessageBegin
+) {
+    try
+    {
+        action();
+
+        FAIL("The action succeeded when it should have failed.");
+    }
+    catch(const T& ex)
+    {
+        std::string exceptionMessage = std::string(ex.what());
+        std::string exceptionMessageRelevantPortion
+            = exceptionMessage.substr(0, exceptionMessageBegin.size());
+        REQUIRE(exceptionMessageRelevantPortion.compare(exceptionMessageBegin) == 0);
+    }
+    catch(...)
+    {
+        FAIL("Another kind of exception was thrown to the one expected");
+    }
+}
+
+TEST_CASE("Empty Uri Test")
+{
+    REQUIRE_THROWS_AS(pangolin::OpenVideo(""), pangolin::VideoException);
+}
+
+TEST_CASE("Uri Beginning With Dot Interpreted As Image")
+{
+    auto testAction = [](){pangolin::OpenVideo(".");};
+    ExpectExceptionWithMessageFromAction<std::runtime_error>(testAction,
+         "Unsupported image file type");
+}
+
+TEST_CASE("Uri Dimension Legal Separator Character")
+{
+
+    using char_t = std::string::value_type;
+    using char_nl = std::numeric_limits<char_t>;
+    for(char_t c = char_nl::min(); c < char_nl::max(); ++c)
+    {
+        if(c == '\0' || c == '=' || c == ']' || c == ',' || (c >= '0' && c <= '9'))
+        {
+            continue;
+        }
+
+        const int dimWidth = 123, dimHeight = 456;
+        const std::string encodedDim = std::to_string(dimWidth) + c
+            + std::to_string(dimHeight);
+        const std::string fullUri = "abc:[size=" + encodedDim + ",other=value]";
+        const pangolin::Uri pangoUri = pangolin::ParseUri(fullUri);
+
+        REQUIRE(pangoUri.params.size() == 2);
+        REQUIRE( pangoUri.params[0].first == std::string("size"));
+        REQUIRE( pangoUri.params[1].first == std::string("other"));
+
+        const pangolin::ImageDim dim
+            = pangoUri.Get<pangolin::ImageDim>("size", pangolin::ImageDim(0,0));
+        REQUIRE( dim.x == dimWidth);
+        REQUIRE( dim.y == dimHeight);
+
+        const std::string otherValue = pangoUri.Get<std::string>("other", "");
+        REQUIRE( otherValue == std::string("value"));
+
+    }
+}