Modernize fitpanel UnitTesting.cxx

Do not automatically terminate application
Use gSystem->RedirectOutput

Author: linev

gui/fitpanel/test/UnitTesting.cxx

@@ -2,12 +2,11 @@
 
 #include "TApplication.h"
 #include "TROOT.h"
-#include "TBenchmark.h"
+#include "TSystem.h"
 
 #include "TCanvas.h"
 #include "TH1.h"
 
-#include "TPluginManager.h"
 #include "TError.h"
 
 #include "TGComboBox.h"
@@ -27,11 +26,8 @@
 
 #include "../src/CommonDefs.h"
 
-#ifdef WIN32
-#include "io.h"
-#else
-#include "unistd.h"
-#endif
+
+TString gTmpfilename;
 
 // Function that compares to doubles up to an error limit
 int equals(Double_t n1, Double_t n2, double ERRORLIMIT = 1.E-4)
@@ -102,10 +98,6 @@ class FitEditorUnitTesting
    // Pointer to the current (and only one) TFitEditor opened.
    TFitEditor* f;
 
-   // These two variables are here to redirect the standard output to
-   // a file.
-   int old_stdout;
-   FILE *out;
 public:
 
    // Exception thrown when any of the pointers managed by the
@@ -121,21 +113,6 @@ class FitEditorUnitTesting
 
    // Constructor: Receives the instance of the TFitEditor
    FitEditorUnitTesting() {
-      // Redirect the stdout to a file outputUnitTesting.txt
-      #ifdef WIN32
-      old_stdout = _dup (_fileno (stdout));
-      #else
-      old_stdout = dup (fileno (stdout));
-      #endif
-      auto res = freopen ("outputUnitTesting.txt", "w", stdout);
-      if (!res) {
-          throw InvalidPointer("In FitEditorUnitTesting constructor cannot freopen");
-      }
-      #ifdef WIN32
-      out = _fdopen (old_stdout, "w");
-      #else
-      out = fdopen (old_stdout, "w");
-      #endif
 
       // Execute the initial script
       TString scriptLine = TString(".x ") + TROOT::GetTutorialDir() + "/math/fit/FittingDemo.C+";
@@ -164,73 +141,6 @@ class FitEditorUnitTesting
    // then they should comment this method.
    ~FitEditorUnitTesting() {
       f->DoClose();
-      gApplication->Terminate();
-   }
-
-   // This is a generic method to make the output of all the tests
-   // consistent. T is a function pointer to one of the tests
-   // function. It has been implemented through templates to permit
-   // more test types than the originally designed.
-   // @ str : Name of the test
-   // @ func : Member function pointer to the real implementation of
-   // the test.
-   template <typename T>
-   int MakeTest(const char* str,  T func )
-   {
-      fprintf(stdout, "\n***** %s *****\n", str);
-      int status = (this->*func)();
-
-      fprintf(stdout, "%s..........", str);
-      fprintf(out, "%s..........", str);
-      if ( status == 0 ) {
-         fprintf(stdout, "OK\n");
-         fprintf(out, "OK\n");
-      }
-      else {
-         fprintf(stdout, "FAILED\n");
-         fprintf(out, "FAILED\n");
-      }
-      return status;
-   }
-
-   // This is where all the tests are called. If the user wants to add
-   // new tests or avoid executing one of the existing ones, it is
-   // here where they should do it.
-   int UnitTesting() {
-      int result = 0;
-
-      fprintf(out, "\n**STARTING TFitEditor Unit Tests**\n\n");
-
-      result += MakeTest("TestHistogramFit...", &FitEditorUnitTesting::TestHistogramFit);
-
-      result += MakeTest("TestGSLFit.........", &FitEditorUnitTesting::TestGSLFit);
-
-      result += MakeTest("TestUpdate.........", &FitEditorUnitTesting::TestUpdate);
-
-      result += MakeTest("TestGraph..........", &FitEditorUnitTesting::TestGraph);
-
-      result += MakeTest("TestGraphError.....", &FitEditorUnitTesting::TestGraphError);
-
-      result += MakeTest("TestGraph2D........", &FitEditorUnitTesting::TestGraph2D);
-
-      result += MakeTest("TestGraph2DError...", &FitEditorUnitTesting::TestGraph2DError);
-
-      result += MakeTest("TestUpdateTree.....", &FitEditorUnitTesting::TestUpdateTree);
-
-      // TODO: reenable in batch once stack smashing issue is fixed
-      if (!gROOT->IsBatch())
-         result += MakeTest("TestTree1D.........", &FitEditorUnitTesting::TestTree1D);
-
-      // TODO: reenable once fit results are fixed
-      // result += MakeTest("TestTree2D.........", &FitEditorUnitTesting::TestTree2D);
-
-      // TODO: reenable once fit results are fixed
-      // result += MakeTest("TestTreeND.........", &FitEditorUnitTesting::TestTreeND);
-
-      fprintf(out, "\nRemember to also check outputUnitTesting.txt for "
-              "more detailed information\n\n");
-
-      return result;
    }
 
    // This is a debuggin method used to print the parameter values
@@ -239,9 +149,9 @@ class FitEditorUnitTesting
    void PrintFuncPars()
    {
       static int counter = 0;
-      fprintf(out, "Printing the Func Pars (%d)\n", ++counter);
-      for ( unsigned int i = 0; i < f->fFuncPars.size(); ++i ) {
-         fprintf(out, "%30.20f %30.20f %30.20f\n", f->fFuncPars[i][0], f->fFuncPars[i][1], f->fFuncPars[i][2]);
+      fprintf(stdout, "Printing the Func Pars (%d)\n", ++counter);
+      for (unsigned int i = 0; i < f->fFuncPars.size(); ++i ) {
+         fprintf(stdout, "%30.20f %30.20f %30.20f\n", f->fFuncPars[i][0], f->fFuncPars[i][1], f->fFuncPars[i][2]);
       }
    }
 
@@ -256,7 +166,7 @@ class FitEditorUnitTesting
          for ( unsigned int j = 0; j < 3; ++j) {
             int internalStatus = equals(pars[i][j], f->fFuncPars[i][j]);
             if (internalStatus != 0) {
-                fprintf(out, "i: %d, j: %d, e: %d, diff %g\n", i, j, internalStatus, (pars[i][j] - f->fFuncPars[i][j]));
+                fprintf(stdout, "i: %d, j: %d, e: %d, diff %g\n", i, j, internalStatus, (pars[i][j] - f->fFuncPars[i][j]));
             }
             status += internalStatus;
          }
@@ -498,6 +408,73 @@ class FitEditorUnitTesting
 
       return CompareFuncPars(pars);
    }
+
+      // This is a generic method to make the output of all the tests
+   // consistent. T is a function pointer to one of the tests
+   // function. It has been implemented through templates to permit
+   // more test types than the originally designed.
+   // @ str : Name of the test
+   // @ func : Member function pointer to the real implementation of
+   // the test.
+   template <typename T>
+   int MakeTest(const char* str,  T func)
+   {
+      RedirectHandle_t gRH;
+
+      gSystem->RedirectOutput(gTmpfilename.Data(), "w", &gRH);
+
+      fprintf(stdout, "\n***** %s *****\n", str);
+
+      int status = (this->*func)();
+
+      gSystem->RedirectOutput(0, 0, &gRH);
+
+      fprintf(stdout, "%s..........%s\n", str, status == 0 ? "OK" : "FAILED");
+
+      return status;
+   }
+
+   // This is where all the tests are called. If the user wants to add
+   // new tests or avoid executing one of the existing ones, it is
+   // here where they should do it.
+   int UnitTesting()
+   {
+      int result = 0;
+
+      fprintf(stdout, "\n**STARTING TFitEditor Unit Tests**\n\n");
+
+      result += MakeTest("TestHistogramFit...", &FitEditorUnitTesting::TestHistogramFit);
+
+      result += MakeTest("TestGSLFit.........", &FitEditorUnitTesting::TestGSLFit);
+
+      result += MakeTest("TestUpdate.........", &FitEditorUnitTesting::TestUpdate);
+
+      result += MakeTest("TestGraph..........", &FitEditorUnitTesting::TestGraph);
+
+      result += MakeTest("TestGraphError.....", &FitEditorUnitTesting::TestGraphError);
+
+      result += MakeTest("TestGraph2D........", &FitEditorUnitTesting::TestGraph2D);
+
+      result += MakeTest("TestGraph2DError...", &FitEditorUnitTesting::TestGraph2DError);
+
+      result += MakeTest("TestUpdateTree.....", &FitEditorUnitTesting::TestUpdateTree);
+
+      // TODO: reenable in batch once stack smashing issue is fixed
+      if (!gROOT->IsBatch())
+         result += MakeTest("TestTree1D.........", &FitEditorUnitTesting::TestTree1D);
+
+      // TODO: reenable once fit results are fixed
+      // result += MakeTest("TestTree2D.........", &FitEditorUnitTesting::TestTree2D);
+
+      // TODO: reenable once fit results are fixed
+      // result += MakeTest("TestTreeND.........", &FitEditorUnitTesting::TestTreeND);
+
+      fprintf(stdout, "\nRemember to also check outputUnitTesting.txt for "
+              "more detailed information\n\n");
+
+      return result;
+   }
+
 };
 
 // Runs the  basic script  and pops  out the fit  panel. Then  it will
@@ -507,11 +484,21 @@ int UnitTesting()
 {
    gROOT->SetWebDisplay("off");
 
+   gTmpfilename = "UnitTesting.log";
+   auto f = gSystem->TempFileName(gTmpfilename);
+   fclose(f);
+
    FitEditorUnitTesting fUT;
 
-   return fUT.UnitTesting();
+   auto res = fUT.UnitTesting();
+
+   gSystem->Unlink(gTmpfilename.Data());
+
+   return res;
 }
 
+#ifndef __ROOTCLING__
+
 // The main function. It is VERY important that it is run using the
 // TApplication.
 int main(int argc, char** argv)
@@ -528,3 +515,5 @@ int main(int argc, char** argv)
 
    return ret;
 }
+
+#endif