Unit test for iri_util

Change-Id: I707cff42d8a146805f07bbf47611848b9c6bb9b0

diff --git a/src/manifest_parser/utils/iri_util.cc b/src/manifest_parser/utils/iri_util.cc
index 03f6aab533a16f593683ff493c256bb8b99ad65d..6a9b8cf1f9d3c632368c7e84e3bb36fea1c9e5bb 100644 (file)
--- a/src/manifest_parser/utils/iri_util.cc
+++ b/src/manifest_parser/utils/iri_util.cc
@@ -17,7 +17,7 @@ bool IsValidIRI(const std::string& iri_string) {
       iri_parse(iri_string.c_str()), iri_destroy);
   return
       iri != nullptr &&
-      iri->scheme != nullptr && (
+      (iri->scheme != nullptr && strlen(iri->scheme) > 0) && (
         iri->display != nullptr ||
         iri->user != nullptr ||
         iri->auth != nullptr ||
@@ -36,7 +36,7 @@ bool IsValidWarpIRI(const std::string& iri_string) {
   return
       iri != nullptr &&
       (iri->host != nullptr && strlen(iri->host) > 0) &&
-      iri->scheme != nullptr &&
+      (iri->scheme != nullptr && strlen(iri->scheme) > 0) &&
       iri->display == nullptr &&
       iri->user == nullptr &&
       iri->auth == nullptr &&

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 9b0a962a38fe257f97114c95811940226536e1ae..479764a65e68e9a5ceef02d4c73828b6beec4b75 100644 (file)
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(TESTS
   string_util_unittest
   version_number_unittest
   language_tag_validator_unittest
+  iri_util_unittest
 )
 SET(DESTINATION_DIR manifest-parser-ut)
 
@@ -25,6 +26,7 @@ ADD_EXECUTABLE(parser_unittest
 ADD_EXECUTABLE(string_util_unittest string_util_unittest.cc)
 ADD_EXECUTABLE(version_number_unittest version_number_unittest.cc)
 ADD_EXECUTABLE(language_tag_validator_unittest language_tag_validator_unittest.cc)
+ADD_EXECUTABLE(iri_util_unittest iri_util_unittest.cc)
 
 INSTALL(DIRECTORY test_samples/ DESTINATION ${SHAREDIR}/${DESTINATION_DIR}/test_samples)
 
@@ -49,6 +51,7 @@ TARGET_LINK_LIBRARIES(parser_unittest PUBLIC ${TARGET_LIBNAME_PARSER} ${GTEST_MA
 TARGET_LINK_LIBRARIES(string_util_unittest PUBLIC ${TARGET_LIBNAME_UTILS} ${GTEST_MAIN_LIBRARIES})
 TARGET_LINK_LIBRARIES(version_number_unittest PUBLIC ${TARGET_LIBNAME_UTILS} ${GTEST_MAIN_LIBRARIES})
 TARGET_LINK_LIBRARIES(language_tag_validator_unittest PUBLIC ${TARGET_LIBNAME_UTILS} ${GTEST_MAIN_LIBRARIES})
+TARGET_LINK_LIBRARIES(iri_util_unittest PUBLIC ${TARGET_LIBNAME_UTILS} ${GTEST_MAIN_LIBRARIES})
 
 FOREACH(test ${TESTS})
   INSTALL(TARGETS ${test} DESTINATION ${BINDIR}/${DESTINATION_DIR})

diff --git a/src/unit_tests/iri_util_unittest.cc b/src/unit_tests/iri_util_unittest.cc
new file mode 100644 (file)
index 0000000..8b590f0
--- /dev/null
+++ b/src/unit_tests/iri_util_unittest.cc
@@ -0,0 +1,62 @@
+// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache 2.0 license that can be
+// found in the LICENSE file.
+
+#include <gtest/gtest.h>
+
+#include <string>
+
+#include "manifest_parser/utils/iri_util.h"
+
+#define TEST_VALID(Name, Sequence)                                             \
+    TEST_F(IriUtilTest, IriUtilValid_ ## Name) {                               \
+        std::string iri = std::string(Sequence);                               \
+        ASSERT_TRUE(IsValidIRI(iri)) << iri;                                   \
+    }
+
+#define TEST_FAIL(Name, Sequence)                                              \
+    TEST_F(IriUtilTest, IriNotValid_ ## Name) {                                \
+        std::string iri = std::string(Sequence);                               \
+        ASSERT_FALSE(IsValidIRI(iri)) << iri;                                  \
+    }
+
+#define TEST_WRAP_VALID(Name, Sequence)                                        \
+    TEST_F(IriUtilTest, IriWarpValid_ ## Name) {                               \
+        std::string iri = std::string(Sequence);                               \
+        ASSERT_TRUE(IsValidWarpIRI(iri)) << iri;                               \
+    }
+
+#define TEST_WRAP_FAIL(Name, Sequence)                                         \
+    TEST_F(IriUtilTest, IriWarpNotValid_ ## Name) {                            \
+        std::string iri = std::string(Sequence);                               \
+        ASSERT_FALSE(IsValidWarpIRI(iri)) << iri;                              \
+    }
+
+namespace parser {
+namespace utils {
+
+class IriUtilTest : public testing::Test { };
+
+TEST_FAIL(TC_1, "");
+TEST_VALID(TC_2, "ab1+-.://a1-._~%xA0%AB/a1-._~%xA0:@asdf%AB");
+TEST_VALID(TC_3, "htt&#x0070;://www.example.com"
+        "/&#x0066;&#x006f;&#x006f;bar&#x002f;foo&#x003f;bar");
+TEST_VALID(TC_4, "http://:300");
+TEST_VALID(TC_5, "http:///");
+TEST_VALID(TC_6, "http:///?\?/?#??..ab1+-.");
+TEST_VALID(TC_7, "http:/");
+TEST_VALID(TC_8, "ftp:abv");
+TEST_VALID(TC_9, "ftp:");
+TEST_VALID(TC_10, "ftp:/a////");
+TEST_FAIL(TC_11, "ftp");
+TEST_VALID(TC_12, "ftp://[2001:0db8:0000:0000:0000:0000:1428:57ab]:300");
+TEST_VALID(TC_13, "ftp://[2001:0db8::1428:57ab]:300");
+
+TEST_WRAP_FAIL(EmptyScheme, "://asdfa.com");
+TEST_WRAP_VALID(ValidScheme, "http://asda.com");
+TEST_WRAP_FAIL(EmptyHostWrap, "http://:30");
+TEST_WRAP_VALID(ValidHost, "http://asas.com:30");
+TEST_WRAP_FAIL(HasIuserinfo, "http://user@example.com:300");
+
+}  // namespace utils
+}  // namespace parser