Full- chain testing with headless chrome browser

graphics/CMakeLists.txt

@@ -4,18 +4,18 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
 # Folders for generated files
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(JSON_PRO_DIR ${BUILD_DIR}/json_pro)
-set(SVG_PRO_DIR ${BUILD_DIR}/svg_pro)
+set(NEW_SVG_PRO_DIR ${BUILD_DIR}/new_svg_pro)
 set(OLD_SVG_PRO_DIR ${BUILD_DIR}/old_svg_pro)
 set(PDF_PRO_DIR ${BUILD_DIR}/pdf_pro)
 
 # Create the generated directory
 file(MAKE_DIRECTORY ${JSON_PRO_DIR})
-file(MAKE_DIRECTORY ${SVG_PRO_DIR})
+file(MAKE_DIRECTORY ${NEW_SVG_PRO_DIR})
 file(MAKE_DIRECTORY ${OLD_SVG_PRO_DIR})
 file(MAKE_DIRECTORY ${PDF_PRO_DIR})
 
 # Decompress and copy over all references
-foreach(FOLDER json_ref old_svg_ref pdf_ref svg_ref)
+foreach(FOLDER json_ref old_svg_ref pdf_ref new_svg_ref)
     file(GLOB ARCHIVES ${FOLDER}/*zip )
     foreach(ARCHIVE ${ARCHIVES} )
         file(ARCHIVE_EXTRACT INPUT ${ARCHIVE} DESTINATION ${FOLDER})
@@ -179,7 +179,7 @@ foreach(TEST_DESCRIPTION ${TEST_DESCRIPTIONS})
         #     EXEC node Test_JsRoot.js ${macro} ${BUILD_DIR})
 
     elseif(${test_type} STREQUAL "a")
-        foreach (X "j" "o" "p")
+        foreach (X "j" "o" "p" "s")
             ROOTTEST_ADD_TEST(${macro}_${X}
                 MACRO testGraphics.C
                 MACROARG \"${macro}\",\"${X}\",\"${macro_folder}\",\"${BUILD_DIR}\")

graphics/README.md

@@ -0,0 +1,51 @@
+# Recipe for Generating New Reference Files
+This guide will help you update and generate new reference JSON, SVG and PDF files required for testing and debugging. Follow the steps below to ensure you are working with the most recent reference files.
+
+IMPORTANT: Reference JSON's are used to generate new SVG's (headless chrome browser). It is important to debug always both test and in case of a need of new references files to generate new ones for both. Therefore it is necessary to first update the json files and then the new svg files.
+
+## 1. Setting up
+### 1. Create and Prepare Directories
+Start by creating a directory for testing and cloning the necessary repositories.
+
+    mkdir myTesting
+    cd myTesting
+    git clone https://github.com/root-project/root.git
+    git clone https://github.com/root-project/roottest.git
+
+### 2. Build Configuration
+Create a build directory, configure the build to include testing and roottest options, and build the project.
+
+    mkdir build
+    cd build
+    cmake -Dtesting=ON -Droottest=ON ../root
+    cmake --build . -j8
+
+## 2. Running Tests
+To update or debug tests, run the specific tests you are interested in. Replace macroname and testtype with the actual names used in your tests.
+
+    ctest -R roottest-graphics-macroname_testtype
+
+## 3. Updating Reference Files
+### 1. Navigate to the Generated Files Directory
+Change to the directory where the new reference files are located. Replace folder_pro with the actual folder name.
+
+    cd /path/to/build/roottest/graphics/folder_pro
+
+### 2. Move and Rename Files
+Move and rename the files from the _pro suffix to the appropriate reference folder. Replace folder_ref with the actual folder name.
+
+    for file in *_pro*; do 
+        mv "$file" "/path/to/roottest/graphics/folder_ref/${file/_pro/}"; 
+    done
+
+### 3. Zip the Updated Reference Files
+Change to the reference folder and compress the updated files into zip archives.
+
+    cd /path/to/roottest/graphics/ref_folder
+    ls *.fileformat | awk '{print "zip -m " $1 ".zip " $1}' | sh (replace fileformat)
+
+Replace fileformat with the actual file extension of your reference files (e.g., svg, pdf, json).
+
+
+
+

graphics/testGraphics.C

@@ -20,6 +20,7 @@
 #include "TWebCanvas.h"
 #include "TLatex.h"
 #include <TSystem.h>
+#include<TBufferText.h>
 
 #include <algorithm>
 #include <cstdio>
@@ -165,7 +166,7 @@ int test_json(TCanvas* c1, const std::string& macroName, const std::string& buil
     return 0;
 }
 
-//---------------------SVG-----------------------------------------------------------------
+//---------------------old SVG-------------------------------------------------------------
 // Function to remove or normalize specific parts of the SVG content
 std::string preprocessSVGContent(const std::string& svgContent) {
     std::string result = svgContent;
@@ -181,7 +182,7 @@ std::string preprocessSVGContent(const std::string& svgContent) {
     return result;
 }
 
-// Function to compare two SVG files (old graphics)
+// Function to compare two old SVG files (old graphics)
 bool compareSVGFiles(const std::string& filePath1, const std::string& filePath2) {
     try {
         std::string content1 = readFileToString(filePath1);
@@ -205,7 +206,7 @@ bool compareSVGFiles(const std::string& filePath1, const std::string& filePath2)
     }
 }
 
-int test_svg(TCanvas* c1, const std::string& macroName, const std::string& builddir) {
+int test_old_svg(TCanvas* c1, const std::string& macroName, const std::string& builddir) {
     // Paths to the reference and generated SVG files
     std::string refFilePath = "./old_svg_ref/" + macroName + ".svg";
     std::string genFilePath = builddir + "/old_svg_pro/" + macroName + "_pro.svg";
@@ -223,9 +224,9 @@ int test_svg(TCanvas* c1, const std::string& macroName, const std::string& build
 
     // Compare the generated SVG file with the reference SVG file
     if (compareSVGFiles(refFilePath, genFilePath)) {
-        std::cout << "SVG test passed for " << macroName << std::endl;
+        std::cout << "Old SVG test passed for " << macroName << std::endl;
     } else {
-        std::cout << "SVG test failed for " << macroName << std::endl;
+        std::cout << "Old SVG test failed for " << macroName << std::endl;
         return 1;
     }
     return 0;
@@ -273,10 +274,10 @@ bool comparePDFFiles(const std::string& filePath1, const std::string& filePath2)
     }
 }
 
-int test_pdf(TCanvas* c1, const std::string& macroName, const std::string& buildir) {
-    // Paths to the reference and generated SVG files
+int test_pdf(TCanvas* c1, const std::string& macroName, const std::string& builddir) {
+    // Paths to the reference and generated PDF files
     std::string refFilePath = "./pdf_ref/" + macroName + ".pdf";
-    std::string genFilePath = buildir + "/pdf_pro/" + macroName + "_pro.pdf";
+    std::string genFilePath = builddir + "/pdf_pro/" + macroName + "_pro.pdf";
 
     // Check if the reference file exists
     FileStat_t fstat;
@@ -298,6 +299,44 @@ int test_pdf(TCanvas* c1, const std::string& macroName, const std::string& build
     }
     return 0;
 }
+//---------------------new SVG-------------------------------------------------------------
+int test_new_svg(const std::string& macroName, const std::string& builddir){
+     // Paths to the reference and generated new SVG files
+    std::string refFilePath = "./new_svg_ref/" + macroName + ".svg";
+    std::string genFilePath = builddir + "/new_svg_pro/" + macroName + "_pro.svg";
+
+    // path to refernces json to generated new svg
+    std::string refJsonFilePath = "./json_ref/" + macroName + ".json";
+
+    // Read the JSON file
+    std::ifstream refJsonFile(refJsonFilePath);
+    if (!refJsonFile.is_open()) {
+        std::cerr << "Could not open the JSON file: " << refJsonFilePath << std::endl;
+        return 1;
+    }
+    std::string ref_json((std::istreambuf_iterator<char>(refJsonFile)), std::istreambuf_iterator<char>());
+    refJsonFile.close();
+
+    // Check if the reference file exists
+    FileStat_t fstat;
+    if (1 == gSystem->GetPathInfo(refFilePath.c_str(), fstat)) {
+        std::cout << "Reference file not found. Saving generated file as reference: " << macroName << std::endl;
+        ROOT::RWebDisplayHandle::ProduceImage(refFilePath, ref_json, 1200, 800);
+        return 1;
+    } else {
+        // Save the generated SVG file
+        ROOT::RWebDisplayHandle::ProduceImage(genFilePath, ref_json, 1200, 800);
+    }
+
+    // Compare the generated PDF file with the reference PDF file
+    if (compareSVGFiles(refFilePath, genFilePath)) {
+        std::cout << "New SVG test passed for " << macroName << std::endl;
+    } else {
+        std::cout << "New SVG failed for " << macroName << std::endl;
+        return 1;
+    }
+    return 0;
+}
 
 // TEST ROOT MACRO -------------------------------------------------------------------------------
 int testGraphics(const std::string& macroName, const std::string& test_type, const std::string& macro_folder, const std::string& builddir) {
@@ -318,6 +357,9 @@ int testGraphics(const std::string& macroName, const std::string& test_type, con
     gStyle->SetStatTextColor(1);        // Text color of stat box
     gStyle->SetStatBorderSize(1);       // Border size of stat box
 
+    // Here one could set the precison
+    // TBufferText::SetFloatFormat("%.2f");
+    // TBufferText::SetDoubleFormat("%.2f");
 
     // Call the macro to generate the canvas
     std::string command = ".x " + macroPath;
@@ -335,18 +377,23 @@ int testGraphics(const std::string& macroName, const std::string& test_type, con
     // j === test the JSON creation
     // o === test the SVG creation in ROOT (old graphics with --web=off)
     // p == test the PDF creation in ROOT (old graphics with --web=off)
+    // s == test the SVG creation in ROOT (new graphics with web=chrome)
 
     if (test_type == "j") {
         return test_json(c1, macroName, builddir);
     }
     if (test_type == "o") {
         gROOT->SetWebDisplay("off");
-        return test_svg(c1, macroName, builddir);
+        return test_old_svg(c1, macroName, builddir);
     }
     if (test_type == "p") {
         gROOT->SetWebDisplay("off");
         return test_pdf(c1, macroName, builddir);
     }
+    if (test_type == 's'){
+        gROOT->SetWebDisplay("chrome");
+        return test_new_svg(macroName, builddir);
+    }
     std::cerr << "Unrecognised test type '" << test_type << "'" << std::endl;
     return 1;
 }