Add ET_EXPECT_DEATH tests to DebugEvent test

Author: keyprocedure

devtools/etdump/tests/etdump_test.cpp

@@ -186,11 +186,16 @@ TEST_F(ProfilerETDumpTest, AllocationEvents) {
 }
 
 TEST_F(ProfilerETDumpTest, DebugEvent) {
+  const size_t debug_buf_size = 2048;
+  const size_t etdump_buf_size = 512 * 1024;
+  ASSERT_NE(this->buf, nullptr);
+  Span<uint8_t> span_buf = Span<uint8_t>(this->buf, etdump_buf_size);
+
   for (size_t i = 0; i < 2; i++) {
     for (size_t j = 0; j < 3; j++) {
       etdump_gen[i]->create_event_block("test_block");
 
-      void* ptr = malloc(2048);
+      void* ptr = malloc(debug_buf_size);
 
       EValue evalue_int((int64_t)5);
       etdump_gen[i]->log_evalue(evalue_int);
@@ -206,24 +211,37 @@ TEST_F(ProfilerETDumpTest, DebugEvent) {
       TensorFactory<ScalarType::Float> tf;
       EValue evalue_tensor(tf.ones({3, 2}));
 
-      // using span to record debug data
-      Span<uint8_t> buffer((uint8_t*)ptr, 2048);
-      auto buffer_data_sink = BufferDataSink::create(ptr, 2048);
+      // Create span to record debug data
+      Span<uint8_t> buffer((uint8_t*)ptr, debug_buf_size);
+      auto buffer_data_sink = BufferDataSink::create(ptr, debug_buf_size);
       auto file_data_sink = FileDataSink::create(dump_file_path.c_str());
 
       if (j == 0) {
         ET_EXPECT_DEATH(
             etdump_gen[i]->log_evalue(evalue_tensor),
             "Must set data sink before writing tensor-like data");
+
+        // Set debug buffer with span
         etdump_gen[i]->set_debug_buffer(buffer);
-      }
-      // using buffer data sink to record debug data
-      else if (j == 1) {
-        etdump_gen[i]->set_data_sink(&buffer_data_sink.get());
-      }
-      // using file data sink to record debug data
-      else {
-        etdump_gen[i]->set_data_sink(&file_data_sink.get());
+      } else {
+        // Reset ETDumpGen to trigger ET_EXPECT_DEATH before setting data sink
+        delete etdump_gen[i];
+
+        // Recreate ETDumpGen; set span buffer only for etdump_gen[1]
+        etdump_gen[i] = (i == 0) ? new ETDumpGen() : new ETDumpGen(span_buf);
+        etdump_gen[i]->create_event_block("test_block");
+
+        ET_EXPECT_DEATH(
+            etdump_gen[i]->log_evalue(evalue_tensor),
+            "Must set data sink before writing tensor-like data");
+
+        if (j == 1) {
+          // Set buffer data sink
+          etdump_gen[i]->set_data_sink(&buffer_data_sink.get());
+        } else {
+          // Set file data sink
+          etdump_gen[i]->set_data_sink(&file_data_sink.get());
+        }
       }
 
       etdump_gen[i]->log_evalue(evalue_tensor);
@@ -497,8 +515,8 @@ TEST_F(ProfilerETDumpTest, VerifyData) {
   }
 }
 
-// Helper to assert that logging without a data sink triggers ET_EXPECT_DEATH
-static void et_expect_death_log_delegate(
+// Triggers ET_EXPECT_DEATH if log_intermediate_output_delegate has no data sink
+static void expect_log_intermediate_delegate_death(
     ETDumpGen* gen,
     TensorFactory<ScalarType::Float>& tf) {
   ET_EXPECT_DEATH(
@@ -527,24 +545,25 @@ TEST_F(ProfilerETDumpTest, LogDelegateIntermediateOutput) {
       TensorFactory<ScalarType::Float> tf;
 
       if (j == 0) {
-        et_expect_death_log_delegate(etdump_gen[i], tf);
+        expect_log_intermediate_delegate_death(etdump_gen[i], tf);
 
-        // Use span to record debug data
+        // Set debug buffer with span
         etdump_gen[i]->set_debug_buffer(buffer);
       } else {
-        // Reset ETDumpGen to correctly trigger ET_EXPECT_DEATH
+        // Reset ETDumpGen to trigger ET_EXPECT_DEATH before setting data sink
         delete etdump_gen[i];
 
-        // Recreate ETDumpGen; use span buffer only for etdump_gen[1]
+        // Recreate ETDumpGen; set span buffer only for etdump_gen[1]
         etdump_gen[i] = (i == 0) ? new ETDumpGen() : new ETDumpGen(span_buf);
         etdump_gen[i]->create_event_block("test_block");
-        et_expect_death_log_delegate(etdump_gen[i], tf);
+
+        expect_log_intermediate_delegate_death(etdump_gen[i], tf);
 
         if (j == 1) {
-          // Use buffer data sink to record debug data
+          // Set buffer data sink
           etdump_gen[i]->set_data_sink(&buffer_data_sink.get());
         } else {
-          // Use file data sink to record debug data
+          // Set file data sink
           etdump_gen[i]->set_data_sink(&file_data_sink.get());
         }
       }