Removed extra DNG test file; replace test with direct usage one; introduce a test utility wrapper that allow capturing of stderr buffer

Signed-off-by: Aleksandr Motsjonov <[email protected]>

Author: soswow

tests/CMakeLists.txt

@@ -171,6 +171,7 @@ add_test ( NAME Test_Misc COMMAND Test_Misc )
 add_executable (
 	Test_UsageTimer
 	testUsageTimer.cpp
+	test_utils.cpp
 )
 
 target_link_libraries(
@@ -188,6 +189,7 @@ add_test ( NAME Test_UsageTimer COMMAND Test_UsageTimer )
 add_executable (
 	Test_ImageConverter
 	test_image_converter.cpp
+	test_utils.cpp
 )
 
 target_link_libraries(

tests/materials/blackmagic_cinema_camera_cinemadng_no_model.dng

@@ -11,6 +11,8 @@
 #include <string>
 #include <thread>
 
+#include "test_utils.h"
+
 using namespace rta::util;
 
 // Helper function to extract time value from output
@@ -111,13 +113,8 @@ void testTimingOutput()
     std::this_thread::sleep_for( std::chrono::milliseconds( 50 ) );
 
     // Capture output to verify timing
-    std::stringstream buffer;
-    std::streambuf   *old = std::cerr.rdbuf( buffer.rdbuf() );
-
-    timer.print( "test_path", "test_message" );
-
-    std::cerr.rdbuf( old );
-    std::string output = buffer.str();
+    std::string output =
+        capture_stderr( [&]() { timer.print( "test_path", "test_message" ); } );
 
     // Should contain timing information
     OIIO_CHECK_ASSERT( output.find( "Timing:" ) != std::string::npos );
@@ -172,17 +169,11 @@ void testMultipleIndependentInstances()
     std::this_thread::sleep_for( std::chrono::milliseconds( 5 ) );
 
     // Capture outputs to verify different timing
-    std::stringstream buffer1, buffer2;
-    std::streambuf   *old = std::cerr.rdbuf( buffer1.rdbuf() );
-
-    timer1.print( "path1", "message1" );
-    std::cerr.rdbuf( buffer2.rdbuf() );
-    timer2.print( "path2", "message2" );
+    std::string output1 =
+        capture_stderr( [&]() { timer1.print( "path1", "message1" ); } );
 
-    std::cerr.rdbuf( old );
-
-    std::string output1 = buffer1.str();
-    std::string output2 = buffer2.str();
+    std::string output2 =
+        capture_stderr( [&]() { timer2.print( "path2", "message2" ); } );
 
     // Both should contain timing information
     OIIO_CHECK_ASSERT( output1.find( "Timing:" ) != std::string::npos );
@@ -212,13 +203,8 @@ void testTimingAccuracy()
     std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) );
 
     // Capture output to verify timing
-    std::stringstream buffer;
-    std::streambuf   *old = std::cerr.rdbuf( buffer.rdbuf() );
-
-    timer.print( "test_path", "test_message" );
-
-    std::cerr.rdbuf( old );
-    std::string output = buffer.str();
+    std::string output =
+        capture_stderr( [&]() { timer.print( "test_path", "test_message" ); } );
 
     // Should contain timing information
     OIIO_CHECK_ASSERT( output.find( "Timing:" ) != std::string::npos );

tests/testUsageTimer.cpp

@@ -17,9 +17,12 @@
 #include <fstream>
 #include <iostream>
 #include <nlohmann/json.hpp>
+#include <sstream>
 #include <vector>
 #include <ctime>
 
+#include "test_utils.h"
+
 #ifdef WIN32
 #    include <io.h>
 #    include <process.h>
@@ -965,12 +968,22 @@ void test_missing_camera_manufacturer()
     std::vector<std::vector<double>> IDT_matrix;
     std::vector<std::vector<double>> CAT_matrix;
 
-    // This should fail because there's no camera make
-    bool success = prepare_transform_spectral(
-        image_spec, settings, WB_multipliers, IDT_matrix, CAT_matrix );
+    // Capture stderr output to verify error messages
+    bool        success;
+    std::string output = capture_stderr( [&]() {
+        // This should fail because there's no camera make
+        success = prepare_transform_spectral(
+            image_spec, settings, WB_multipliers, IDT_matrix, CAT_matrix );
+    } );
 
     // Should fail
     OIIO_CHECK_ASSERT( !success );
+
+    // Assert on the expected error message
+    OIIO_CHECK_ASSERT(
+        output.find(
+            "Missing the camera manufacturer name in the file metadata. You can provide a camera make using the --custom-camera-make parameter" ) !=
+        std::string::npos );
 }
 
 /// Tests that conversion fails when camera model is missing (should fail)
@@ -990,19 +1003,34 @@ void test_empty_camera_model()
     // Create illuminant data (so illuminant data loading succeeds)
     test_dir.create_test_data_file( "illuminant", { { "illuminant", "D65" } } );
 
-    // Use the DNG file with camera make but no model
-    std::string test_file =
-        "../../tests/materials/blackmagic_cinema_camera_cinemadng_no_model.dng";
-
-    // Test: Missing camera model via main entrance (no custom camera info provided)
-    std::vector<std::string> args = {
-        "--wb-method", "illuminant", "--illuminant", "D65",    "--mat-method",
-        "spectral",    "--verbose",  "--overwrite",  test_file
-    };
+    // Create ImageSpec with camera make but no model
+    OIIO::ImageSpec image_spec;
+    image_spec["cameraMake"] = "Blackmagic";
+    // Do not set cameraModel - this is what we're testing
+
+    // Set up ImageConverter with spectral mode settings
+    ImageConverter converter;
+    converter.settings.WB_method =
+        ImageConverter::Settings::WBMethod::Illuminant;
+    converter.settings.matrix_method =
+        ImageConverter::Settings::MatrixMethod::Spectral;
+    converter.settings.illuminant = "D65";
+    converter.settings.verbosity  = 1;
+    converter.settings.database_directories.push_back(
+        test_dir.get_database_path() );
+
+    // Create empty options list
+    OIIO::ParamValueList options;
+
+    // Capture stderr output to verify error messages
+    bool        success;
+    std::string output = capture_stderr( [&]() {
+        // This should fail with error message about missing camera model
+        success = converter.configure( image_spec, options );
+    } );
 
-    // This should fail with error message about missing camera model
-    std::string output = run_rawtoaces_with_data_dir(
-        args, test_dir.get_database_path(), false, true );
+    // Should fail
+    OIIO_CHECK_ASSERT( !success );
 
     // Assert on the expected error message - focus on the main camera identifier error
     OIIO_CHECK_ASSERT(

tests/test_image_converter.cpp

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the rawtoaces Project.
+
+#include "test_utils.h"
+
+#include <functional>
+#include <iostream>
+#include <sstream>
+#include <streambuf>
+
+/// RAII helper class to capture stderr output for testing
+class StderrCapture
+{
+public:
+    StderrCapture() : buffer(), old( std::cerr.rdbuf( buffer.rdbuf() ) ) {}
+
+    ~StderrCapture() { std::cerr.rdbuf( old ); }
+
+    /// Get the captured output as a string
+    std::string str() const { return buffer.str(); }
+
+private:
+    std::stringstream buffer;
+    std::streambuf   *old;
+};
+
+/// Wrapper function that captures stderr output from a callable action
+std::string capture_stderr( std::function<void()> action )
+{
+    StderrCapture capture;
+    action();
+    return capture.str();
+}

tests/test_utils.cpp

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright Contributors to the rawtoaces Project.
+
+#pragma once
+
+#include <functional>
+#include <string>
+
+/// Wrapper function that captures stderr output from a callable action
+/// @param action A callable (function, lambda, etc.) that may write to stderr
+/// @return The captured stderr output as a string
+std::string capture_stderr( std::function<void()> action );