Support --fork-tests in JUnitProcessor. Support more than one trace processor. Capture stderr/stdout logs, backtrace and time in JUnitProcesor

1 files changed, 45 insertions, 19 deletions

diff --git a/library/cpp/testing/unittest/junit.h b/library/cpp/testing/unittest/junit.h
index f5113c290e..2eca875310 100644
--- a/library/cpp/testing/unittest/junit.h
+++ b/library/cpp/testing/unittest/junit.h
@@ -1,12 +1,26 @@
 #include "registar.h"
 
+#include <util/datetime/base.h>
+#include <util/generic/maybe.h>
+#include <util/system/tempfile.h>
+
 namespace NUnitTest {
 
+extern const TString Y_UNITTEST_OUTPUT_CMDLINE_OPTION;
+
 class TJUnitProcessor : public ITestSuiteProcessor {
+    struct TFailure {
+        TString Message;
+        TString BackTrace;
+    };
+
     struct TTestCase {
         TString Name;
         bool Success;
-        TVector<TString> Failures;
+        TVector<TFailure> Failures;
+        TString StdOut;
+        TString StdErr;
+        double DurationSecods = 0.0;
 
         size_t GetFailuresCount() const {
             return Failures.size();
@@ -27,27 +41,27 @@ class TJUnitProcessor : public ITestSuiteProcessor {
             }
             return sum;
         }
+
+        double GetDurationSeconds() const {
+            double sum = 0.0;
+            for (const auto& [name, testCase] : Cases) {
+                sum += testCase.DurationSecods;
+            }
+            return sum;
+        }
     };
 
-public:
-    TJUnitProcessor(TString file, TString exec)
-        : FileName(file)
-        , ExecName(exec)
-    {
-    }
+    struct TOutputCapturer;
 
-    ~TJUnitProcessor() {
-        Save();
-    }
+public:
+    TJUnitProcessor(TString file, TString exec);
+    ~TJUnitProcessor();
 
-    void OnError(const TError* descr) override {
-        auto* testCase = GetTestCase(descr->test);
-        testCase->Failures.emplace_back(descr->msg);
-    }
+    void SetForkTestsParams(bool forkTests, bool isForked) override;
 
-    void OnFinish(const TFinish* descr) override {
-        GetTestCase(descr->test)->Success = descr->Success;
-    }
+    void OnBeforeTest(const TTest* test) override;
+    void OnError(const TError* descr) override;
+    void OnFinish(const TFinish* descr) override;
 
 private:
     TTestCase* GetTestCase(const TTest* test) {
@@ -73,10 +87,22 @@ private:
         return sum;
     }
 
+    void SerializeToFile();
+    void MergeSubprocessReport();
+
+    TString BuildFileName(size_t index, const TStringBuf extension) const;
+    void MakeReportFileName();
+    void MakeTmpFileNameForForkedTests();
+
 private:
-    TString FileName;
-    TString ExecName;
+    const TString FileName; // cmd line param
+    const TString ExecName; // cmd line param
+    TString ResultReportFileName;
+    TMaybe<TTempFile> TmpReportFile;
     TMap<TString, TTestSuite> Suites;
+    THolder<TOutputCapturer> StdErrCapturer;
+    THolder<TOutputCapturer> StdOutCapturer;
+    TInstant StartCurrentTestTime;
 };
 
 } // namespace NUnitTest