factor file checking into test helper

include/test/helper/rfc5424.hpp

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 
 /*
- * Copyright 2018-2023 Joel E. Anderson
+ * Copyright 2018-2024 Joel E. Anderson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,17 @@
 #define RFC_5424_PRIVAL_MAX 191
 
 void TestRFC5424Compliance( const std::string &syslog_msg );
+
+/**
+ * Tests each line of the given file for RFC 5424 compliance, and also tests
+ * that the number of messages equals the expected count.
+ */
+void
+TestRFC5424File( const std::string &filename,
+                 std::size_t expected_count );
+
 void TestRFC5424StructuredData( const std::string &sd_elements );
+
 void TestRFC5424Timestamp( const std::string &timestamp );
 
 #endif /* __STUMPLESS_TEST_HELPER_RFC5424_HPP */

src/target/chain.c

@@ -42,7 +42,7 @@ stumpless_add_target_to_chain( struct stumpless_target *chain,
 
   VALIDATE_ARG_NOT_NULL( chain );
   VALIDATE_ARG_NOT_NULL( target );
-  
+
   clear_error();
 
   lock_target( chain );

test/function/cpp/element.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /*
- * Copyright 2020-2021 Joel E. Anderson
+ * Copyright 2020-2024 Joel E. Anderson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-#include <cstddef>
 #include <cstdlib>
 #include <gtest/gtest.h>
 #include <stumpless.hpp>
@@ -46,7 +45,7 @@ namespace {
   };
 
   TEST_F( CppElementTest, GetParamByIndex ) {
-     Param param = element_with_params->GetParam( ( size_t ) 0 );
+     Param param = element_with_params->GetParam( ( std::size_t ) 0 );
      const char *param_name = param.GetName(  );
      EXPECT_STREQ( param_name, param_1_name );
      free( ( void * ) param_name );

test/helper/rfc5424.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /*
- * Copyright 2018-2023 Joel E. Anderson
+ * Copyright 2018-2024 Joel E. Anderson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+#include <fstream>
 #include <regex>
 #include <string>
 #include <gtest/gtest.h>
@@ -44,6 +45,21 @@ void TestRFC5424Compliance( const std::string &syslog_msg ) {
   }
 }
 
+void
+TestRFC5424File( const std::string &filename,
+                 std::size_t expected_count ) {
+  std::ifstream log_file( filename );
+  std::string line;
+  std::size_t i = 0;
+
+  while( std::getline( log_file, line ) ) {
+    TestRFC5424Compliance( line.c_str() );
+    i++;
+  }
+
+  EXPECT_EQ( i, expected_count );
+}
+
 void TestRFC5424StructuredData( const std::string &structured_data ) {
   enum sd_state {
     INIT_STATE,
@@ -208,4 +224,4 @@ void TestRFC5424Timestamp( const std::string &timestamp ) {
     default:
       ADD_FAILURE() << "DATE-MONTH was not a value between 1 and 12";
   }
-}
+}

test/thread_safety/target/file.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /*
- * Copyright 2020-2023 Joel E. Anderson
+ * Copyright 2020-2024 Joel E. Anderson
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,7 @@
  */
 
 #include <cstddef>
-#include <fstream>
 #include <gtest/gtest.h>
-#include <string>
 #include <stumpless.h>
 #include <thread>
 #include "test/helper/assert.hpp"
@@ -59,15 +57,7 @@ namespace {
     stumpless_free_all(  );
 
     // check for consistency in the log file
-    std::ifstream log_file( filename );
-    std::string line;
-    i = 0;
-    while( std::getline( log_file, line ) ) {
-      TestRFC5424Compliance( line.c_str() );
-      i++;
-    }
-    EXPECT_EQ( i, THREAD_COUNT * MESSAGE_COUNT );
-
+    TestRFC5424File( filename, THREAD_COUNT * MESSAGE_COUNT );
     remove( filename );
   }
 }

tools/check_headers/c_standard_library.yml

@@ -7,4 +7,5 @@
 "CRITICAL_SECTION":
   - "private/windows_wrapper.h"
   - "windows.h"
+"size_t": "stddef.h"
 "true": "stdbool.h"

tools/check_headers/standard_library.yml

@@ -158,9 +158,6 @@
 "SIG_ERR": "signal.h"
 "SIGINT": "signal.h"
 "signal": "signal.h"
-"size_t":
-  - "cstddef"
-  - "stddef.h"
 "snprintf":
  - "cstdio"
  - "stdio.h"

tools/check_headers/stumpless_private.yml

@@ -186,6 +186,7 @@
 "TEST_LEVEL_DISABLED": "test/helper/level_disabled.hpp"
 "TEST_LEVEL_ENABLED": "test/helper/level_enabled.hpp"
 "TestRFC5424Compliance": "test/helper/rfc5424.hpp"
+"TestRFC5424File": "test/helper/rfc5424.hpp"
 "TestRFC5424Timestamp": "test/helper/rfc5424.hpp"
 "TestSetDestinationOnOpenTarget": "test/helper/network.hpp"
 "TestSetDestinationOnPausedTarget": "test/helper/network.hpp"