test: NDEBUG

Pluto-tv · Jul 3, 2024 · b398049 · b398049
1 parent 1171416
commit b398049
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/include/packager/live_packager_export.h b/include/packager/live_packager_export.h
@@ -146,6 +146,7 @@ void lp_removeCustomLogSink();
 
 /// When the return value is not NULL, clients will need to free this memory
 char** lp_getErrorMessages(int* num_messages);
+void lp_flushMessage();
 void lp_freeErrorMessages(char** messages, int num_messages);
 
 #ifdef __cplusplus

diff --git a/packager/CMakeLists.txt b/packager/CMakeLists.txt
@@ -220,11 +220,6 @@ target_link_libraries(packager_test
 
 # Disabled by default, otherwise build live packager unit tests if BUILD_LIVE_TEST is on.
 if(BUILD_LIVE_TEST AND NOT MSVC)
-  set(IS_DEBUG_BUILD CMAKE_BUILD_TYPE STREQUAL "Debug")
-  # Indication to the code that this is a debug build
-  if (${IS_DEBUG_BUILD})
-    add_compile_definitions(__DEBUG__)
-  endif ()
   add_executable(live_packager_test
           live_packager_test.cc
   )

diff --git a/packager/live_packager_export.cc b/packager/live_packager_export.cc
@@ -191,6 +191,12 @@ char** lp_getErrorMessages(int* num_messages) {
   return out_messages;
 }
 
+void lp_flushMessage() {
+  if (custom_sink) {
+    custom_sink->Flush();
+  }
+}
+
 void lp_freeErrorMessages(char** messages, int num_messages) {
   if (!messages) {
     return;

diff --git a/packager/live_packager_logging.cc b/packager/live_packager_logging.cc
@@ -21,6 +21,10 @@ void LogCollectorSink::Send(const absl::LogEntry& entry) {
   }
 }
 
+void LogCollectorSink::Flush() {
+  messages_.clear();
+}
+
 const std::vector<std::string>& LogCollectorSink::GetMessages() const {
   return messages_;
 }
@@ -41,6 +45,7 @@ void InstallCustomLogSink(absl::LogSink& sink) {
 }
 
 void RemoveCustomLogSink(absl::LogSink& sink) {
+  absl::FlushLogSinks();
   absl::RemoveLogSink(&sink);
 }
 

diff --git a/packager/live_packager_logging.h b/packager/live_packager_logging.h
@@ -15,6 +15,8 @@ class LogCollectorSink : public absl::LogSink {
 
   virtual void Send(const absl::LogEntry& entry) override;
 
+  virtual void Flush() override;
+
   const std::vector<std::string>& GetMessages() const;
 
  private:

diff --git a/packager/live_packager_test.cc b/packager/live_packager_test.cc
@@ -1562,7 +1562,7 @@ TEST(LivePackagerLoggingTest, InvalidDecryptKeyID) {
   SegmentBuffer out;
   ASSERT_NE(Status::OK, live_packager.Package(init_seg, media_seg, out));
 
-#ifdef __DEBUG__
+#ifdef NDEBUG
   const std::vector<std::string> expected_errors = {
       "(ERROR): Error retrieving decryption key: 14 (INTERNAL_ERROR): Key for "
       "key_id=00000000621f2afe7ab2c868d5fd2e2e was not found.",
@@ -1579,12 +1579,18 @@ TEST(LivePackagerLoggingTest, InvalidDecryptKeyID) {
 
   int num_errors = 0;
   const auto messages = lp_getErrorMessages(&num_errors);
+  ASSERT_TRUE(messages);
   ASSERT_EQ(expected_errors.size(), num_errors);
   for (int i(0); i < num_errors; ++i) {
     ASSERT_NE(nullptr, messages[i]);
     EXPECT_EQ(expected_errors[i], std::string(messages[i]));
   }
   lp_freeErrorMessages(messages, num_errors);
+
+  lp_flushMessage();
+  const auto empty_messages = lp_getErrorMessages(&num_errors);
+  ASSERT_EQ(0, num_errors);
+  ASSERT_TRUE(!empty_messages);
   lp_removeCustomLogSink();
 }