refactor tests for invalid format items

CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.2.3)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
 if(POLICY CMP0135)
   cmake_policy(SET CMP0135 NEW)
 endif()
@@ -844,7 +847,9 @@ add_function_test(current_target
 )
 
 add_function_test(element
-  SOURCES test/function/element.cpp
+  SOURCES
+    test/function/element.cpp
+    $<TARGET_OBJECTS:test_helper_fixture>
 )
 
 add_function_test(element_leak
@@ -1055,7 +1060,9 @@ add_function_test(memory
 )
 
 add_function_test(param
-  SOURCES ${PROJECT_SOURCE_DIR}/test/function/param.cpp
+  SOURCES
+    ${PROJECT_SOURCE_DIR}/test/function/param.cpp
+    $<TARGET_OBJECTS:test_helper_fixture>
 )
 
 add_function_test(perror

include/test/helper/fixture.hpp

@@ -85,4 +85,18 @@ create_nil_entry( void );
 const char *
 load_corpus( const std::string& name );
 
+/**
+ * Returns stumpless_test_data holding the contents of all the files at the named
+ * location in the test/corpora folder. For example, a name of "invalid_param_name"
+ * will return the contents of all the files under test/corpora/invalid_param_name
+ * directory in the form of an array.
+ *
+ *
+ * @param name The directory name.
+ *
+ * @return vector of strings holding test values.
+ */
+std::vector<std::string>
+load_corpus_folder( const std::string& name );
+
 #endif /* __STUMPLESS_TEST_HELPER_FIXTURE_HPP */

test/corpora/invalid_param_name/1

@@ -0,0 +1 @@
+par=am

test/corpora/invalid_param_name/2

@@ -0,0 +1 @@
+par]am

test/corpora/invalid_param_name/3

@@ -0,0 +1 @@
+par\"am

test/function/element.cpp

@@ -18,10 +18,12 @@
 
 #include <cstddef>
 #include <cstdlib>
+#include <string>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <stumpless.h>
 #include "test/helper/assert.hpp"
+#include "test/helper/fixture.hpp"
 #include "test/helper/memory_allocation.hpp"
 
 using::testing::HasSubstr;
@@ -351,18 +353,13 @@ namespace {
 
   TEST_F( ElementTest, GetParamByNameInvalidName ) {
     const struct stumpless_param *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_param_by_name( element_with_params, "par=am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_param_by_name( element_with_params, "par]am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_param_by_name( element_with_params, "par\"am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_param_by_name( element_with_params, invalid_name.c_str() );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( ElementTest, GetParamCount ) {
@@ -557,18 +554,13 @@ namespace {
 
   TEST_F( ElementTest, GetParamValueByNameInvalidName ) {
     const char *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_param_value_by_name( element_with_params, "par=am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_param_value_by_name( element_with_params, "par]am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_param_value_by_name( element_with_params, "par\"am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_param_value_by_name( element_with_params, invalid_name.c_str() );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( ElementTest, HasParam ) {
@@ -593,18 +585,13 @@ namespace {
 
   TEST_F( ElementTest, HasParamInvalidName ) {
     bool result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_element_has_param( element_with_params, "par=am" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_element_has_param( element_with_params, "para]m" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_element_has_param( element_with_params, "pa\"ram" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_element_has_param( element_with_params, invalid_name.c_str() );
+      EXPECT_FALSE( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( ElementTest, SetName ) {
@@ -1017,19 +1004,14 @@ namespace {
 
   TEST( NewElementTest, InvalidName ) {
     struct stumpless_element *element;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    element = stumpless_new_element( "ele=ment" );
-    EXPECT_NULL( element );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    element = stumpless_new_element( "element]" );
-    EXPECT_NULL( element );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      element = stumpless_new_element( invalid_name.c_str() );
+      EXPECT_NULL( element );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
 
-    element = stumpless_new_element( "El\"ment" );
-    EXPECT_NULL( element );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
     stumpless_free_all(  );
   }
 
@@ -1056,22 +1038,17 @@ namespace {
   TEST( SetElementNameTest, InvalidName) {
     struct stumpless_element *element;
     struct stumpless_element *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
     element = stumpless_new_element( "element" );
     ASSERT_NOT_NULL( element );
 
-    result = stumpless_set_element_name( element, "ele=ment");
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_set_element_name( element, invalid_name.c_str() );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
 
-    result = stumpless_set_element_name( element, "eleme]nt");
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_set_element_name( element, "element\"");
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
     stumpless_destroy_element_and_contents( element );
     stumpless_free_all(  );
   }

test/function/entry.cpp

@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+#include <string>
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
@@ -596,34 +597,24 @@ namespace {
 
   TEST_F( EntryTest, GetParamByNameInvalidParamName ) {
     const struct stumpless_param *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_entry_param_by_name( basic_entry, "e-name", "par=am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_by_name( basic_entry, "e-name", "par]am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_by_name( basic_entry, "e-name", "par\"am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_entry_param_by_name( basic_entry, "e-name", invalid_name.c_str() );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, GetParamByNameInvalidElementName ) {
     const struct stumpless_param *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_entry_param_by_name( basic_entry, "ele=ment", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_by_name( basic_entry, "ele]ment", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_by_name( basic_entry, "e-name\"", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_entry_param_by_name( basic_entry, invalid_name.c_str(), "param" );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, GetParamValueByIndex ) {
@@ -689,34 +680,24 @@ namespace {
 
   TEST_F( EntryTest, GetParamValueByNameInvalidParamName ) {
     const char *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "e-name", "par=am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "e-name", "par]am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "e-name", "par\"am" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_entry_param_value_by_name( basic_entry, "e-name", invalid_name.c_str() );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, GetParamValueByNameInvalidElementName ) {
     const char *result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "e=name", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "e]name", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_entry_param_value_by_name( basic_entry, "\"e-name", "param" );
-    EXPECT_NULL( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_entry_param_value_by_name( basic_entry, invalid_name.c_str(), "param" );
+      EXPECT_NULL( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, HasElement ) {
@@ -745,50 +726,35 @@ namespace {
 
   TEST_F( EntryTest, HasElementInvalidName ) {
     bool result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_entry_has_element( basic_entry, "ele=ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_entry_has_element( basic_entry, "ele]ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_entry_has_element( basic_entry, "element\"" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_entry_has_element( basic_entry, invalid_name.c_str() );
+      EXPECT_FALSE( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, GetElementInvalidName ) {
     bool result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_element_by_name( basic_entry, "ele=ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_element_by_name( basic_entry, "ele]ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_element_by_name( basic_entry, "element\"" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_element_by_name( basic_entry, invalid_name.c_str() );
+      EXPECT_FALSE( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, GetElementIdxInvalidName ) {
     bool result;
+    std::vector<std::string> invalid_names = load_corpus_folder("invalid_param_name");
 
-    result = stumpless_get_element_index( basic_entry, "ele=ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_element_index( basic_entry, "ele]ment" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
-
-    result = stumpless_get_element_index( basic_entry, "element\"" );
-    EXPECT_FALSE( result );
-    EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    for(const auto& invalid_name : invalid_names) {
+      result = stumpless_get_element_index( basic_entry, invalid_name.c_str() );
+      EXPECT_FALSE( result );
+      EXPECT_ERROR_ID_EQ( STUMPLESS_INVALID_ENCODING );
+    }
   }
 
   TEST_F( EntryTest, SetAppName ) {
@@ -1740,7 +1706,7 @@ namespace {
     stumpless_free_all(  );
   }
 
-  TEST( NewEntryStrTest, New ){
+  TEST( NewEntryStrTest, New ) {
     struct stumpless_entry *entry;
     const char *app_name = "test-app-name";
     const char *msgid = "test-msgid";