[roottest] refine root/io tests, part 1

roottest/root/io/abstractclass/CMakeLists.txt

@@ -8,33 +8,36 @@ ROOTTEST_GENERATE_DICTIONARY(libAbstractClasses
                              COMPILE_OPTIONS ${warnopt}
                              LINKDEF LinkDef.h
                              NO_ROOTMAP NO_CXXMODULE
-                             FIXTURES_SETUP abstractClasses_fixture)
+                             FIXTURES_SETUP root-io-abstractclass-dict-fixture)
 
 ROOTTEST_ADD_TEST(write_test
                   MACRO write_test.C
                   COPY_TO_BUILDDIR DataBlock1.h DataBlock2.h
-                  FIXTURES_REQUIRED abstractClasses_fixture
-                  FIXTURES_SETUP abstractClasses_write)
+                  FIXTURES_REQUIRED root-io-abstractclass-dict-fixture
+                  FIXTURES_SETUP root-io-abstractclass-write-fixture)
 
 ROOTTEST_ADD_TEST(read_test
                   MACRO read_test.C
                   OUTREF read_test.ref
-                  FIXTURES_REQUIRED abstractClasses_write)
+                  FIXTURES_REQUIRED root-io-abstractclass-write-fixture)
 
 ROOTTEST_ADD_TEST(read_test_v3_05_07
                   MACRO read_test.C
                   MACROARG "\"data_v3_05_07.root\""
                   OUTREF read_test.ref
                   COPY_TO_BUILDDIR data_v3_05_07.root
-                  FIXTURES_REQUIRED abstractClasses_write)
+                  FIXTURES_REQUIRED root-io-abstractclass-write-fixture)
 
 ROOTTEST_ADD_TEST(read_test_v4_00_02
                   MACRO read_test.C
                   MACROARG "\"data_v4_00_02.root\""
                   OUTREF read_test.ref
                   COPY_TO_BUILDDIR data_v4_00_02.root
-                  FIXTURES_REQUIRED abstractClasses_write)
+                  FIXTURES_REQUIRED root-io-abstractclass-write-fixture)
+
+ROOTTEST_COMPILE_MACRO(abstractInVector.C
+                       FIXTURES_SETUP root-io-abstractclass-abstractInVector-fixture)
 
 ROOTTEST_ADD_TEST(load_vector
                   MACRO load_vector.C
-                  COPY_TO_BUILDDIR abstractInVector.C)
+                  FIXTURES_REQUIRED root-io-abstractclass-abstractInVector-fixture)

roottest/root/io/arrayobject/CMakeLists.txt

@@ -1,7 +1,38 @@
-#-------------------------------------------------------------------------------
-#
-# Placeholder file to translate the tests to the new CTest system. Meanwhile we
-# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
-#
-#-------------------------------------------------------------------------------
-ROOTTEST_ADD_OLDTEST()
+ROOTTEST_COMPILE_MACRO(foo.C
+                       FIXTURES_SETUP root-io-arrayobject-foo-fixture)
+
+ROOTTEST_COMPILE_MACRO(bar.C
+                       BUILDLIB foo_C
+                       FIXTURES_REQUIRED root-io-arrayobject-foo-fixture
+                       FIXTURES_SETUP root-io-arrayobject-bar-fixture)
+
+ROOTTEST_COMPILE_MACRO(main.C
+                       BUILDLIB bar_C
+                       FIXTURES_REQUIRED root-io-arrayobject-bar-fixture
+                       FIXTURES_SETUP root-io-arrayobject-main-fixture)
+
+ROOTTEST_ADD_TEST(RealArraySave
+                  MACRO RealArraySave.C
+                  ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L main.C+\")"
+                  PASSRC 1
+                  OUTREF RealArraySave.ref
+                  FIXTURES_REQUIRED root-io-arrayobject-main-fixture
+                  FIXTURES_SETUP root-io-arrayobject-write-fixture)
+
+ROOTTEST_ADD_TEST(ReadBar
+                  MACRO Run.C
+                  MACROARG "\"Event.root\""
+                  ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L bar.C+\")"
+                  OUTREF ReadBar.ref
+                  COPY_TO_BUILDDIR Event.3.2.0.root
+                  FIXTURES_REQUIRED root-io-arrayobject-bar-fixture
+                                    root-io-arrayobject-write-fixture)
+
+# reading old version of bar class fails - while class not correctly equipt
+ROOTTEST_ADD_TEST(ReadBarOld
+                  MACRO Run.C
+                  ROOTEXE_OPTS -e "(void)gROOT->ProcessLine(\".L bar.C+\")"
+                  OUTREF ReadBarOld.ref
+                  COPY_TO_BUILDDIR Event.3.2.0.root
+                  WILLFAIL
+                  FIXTURES_REQUIRED root-io-arrayobject-bar-fixture)

roottest/root/io/arrayobject/ReadBar.ref

@@ -0,0 +1,11 @@
+
+Processing Run.C("Event.root")...
+fop[0].i 1 fop[1].i 2
+fo [0].i 1 fo [1].i 2
+fp [0].i 1 fp [1].i 2
+f  [0].i 1 f  [1].i 2
+fov[0].i 0 fov[1].i 0
+fvop[0].i 1 fvop[1].i 2
+fv [0].i 0 fv [1].i 0
+fvp[0].i 1 fvp[1].i 2
+

roottest/root/io/arrayobject/ReadBarOld.ref

@@ -0,0 +1,11 @@
+
+Processing Run.C...
+fop[0].i 1 fop[1].i 2
+fo [0].i 1 fo [1].i 2
+fp [0].i 1 fp [1].i 2
+f  [0].i 1 f  [1].i 2
+fov[0].i 0 fov[1].i 0
+fvop[0].i 1 fvop[1].i 2
+fv [0].i 0 fv [1].i 0
+fvp[0].i 1 fvp[1].i 2
+

roottest/root/io/arrayobject/RealArraySave.C

@@ -1,6 +1,6 @@
 {
-   gROOT->ProcessLine(".L foo.C+");
-   gROOT->ProcessLine(".L bar.C+");
-   gROOT->ProcessLine(".L main.C+");
+   //gROOT->ProcessLine(".L foo.C+");
+   //gROOT->ProcessLine(".L bar.C+");
+   //gROOT->ProcessLine(".L main.C+");
    run();
 }

roottest/root/io/arrayobject/RealArraySave.ref

@@ -0,0 +1,38 @@
+
+Processing RealArraySave.C...
+fop[0].i 0 fop[1].i 0
+fo [0].i 0 fo [1].i 0
+fp [0].i 0 fp [1].i 0
+f  [0].i 0 f  [1].i 0
+fov[0].i 0 fov[1].i 0
+fvop[0].i 0 fvop[1].i 0
+fv [0].i 0 fv [1].i 0
+fvp[0].i 0 fvp[1].i 0
+
+fop[0].i 1 fop[1].i 2
+fo [0].i 1 fo [1].i 2
+fp [0].i 1 fp [1].i 2
+f  [0].i 1 f  [1].i 2
+fov[0].i 0 fov[1].i 0
+fvop[0].i 1 fvop[1].i 2
+fv [0].i 0 fv [1].i 0
+fvp[0].i 1 fvp[1].i 2
+
+fop[0].i 0 fop[1].i 0
+fo [0].i 0 fo [1].i 0
+fp [0].i 0 fp [1].i 0
+f  [0].i 0 f  [1].i 0
+fov[0].i 0 fov[1].i 0
+fvop[0].i 0 fvop[1].i 0
+fv [0].i 0 fv [1].i 0
+fvp[0].i 0 fvp[1].i 0
+
+fop[0].i 1 fop[1].i 2
+fo [0].i 1 fo [1].i 2
+fp [0].i 1 fp [1].i 2
+f  [0].i 1 f  [1].i 2
+fov[0].i 0 fov[1].i 0
+fvop[0].i 1 fvop[1].i 2
+fv [0].i 0 fv [1].i 0
+fvp[0].i 1 fvp[1].i 2
+

roottest/root/io/arrayobject/Run.C

@@ -1,12 +1,10 @@
-void Run(char* file= "Event.3.2.0.root") {
-gROOT->ProcessLine(".L libFoo.so");
-
-  TFile *h = new TFile(file, "READ");
-  TTree * tree = (TTree*)h->Get("T");
-  bar *b = 0;
+void Run(const char* filename = "Event.3.2.0.root")
+{
+  auto f = TFile::Open(filename);
+  TTree * tree = (TTree*) f->Get("T");
+  bar *b = nullptr;
   tree->SetBranchAddress("a/b",&b);
-  
+
   tree->GetEntry(3);
   b->print();
-
 }

roottest/root/io/arrayobject/bar.h

@@ -28,36 +28,36 @@ class bar: public TObject {
     fvp = new foo[vp];
 
   }
-  ~bar() {}
+  ~bar() override {}
 
   void print() {
     std::cerr
 
-      <<  "fop[0].i " << fop[0]->i 
+      <<  "fop[0].i " << fop[0]->i
       << " fop[1].i " << fop[1]->i << std::endl
 
-      << "fo [0].i "  << fo [0].i 
+      << "fo [0].i "  << fo [0].i
       << " fo [1].i " << fo [1].i << std::endl
 
-      << "fp [0].i "  << fp [0]->i 
+      << "fp [0].i "  << fp [0]->i
       << " fp [1].i " << fp [1]->i << std::endl
 
-      << "f  [0].i "  << f  [0].i 
+      << "f  [0].i "  << f  [0].i
       << " f  [1].i " << f  [1].i << std::endl
-
 
-      <<  "fov[0].i " << fov[0].i 
+
+      <<  "fov[0].i " << fov[0].i
       << " fov[1].i " << fov[1].i << std::endl
 
-      << "fvop[0].i "  << fvop[0].i 
+      << "fvop[0].i "  << fvop[0].i
       << " fvop[1].i " << fvop[1].i << std::endl
 
-      << "fv [0].i "  << fv [0].i 
+      << "fv [0].i "  << fv [0].i
       << " fv [1].i " << fv [1].i << std::endl
 
-      << "fvp[0].i "  << fvp[0].i 
+      << "fvp[0].i "  << fvp[0].i
       << " fvp[1].i " << fvp[1].i << std::endl
-      
+
       << std::endl;
   }
 
@@ -71,18 +71,18 @@ class bar: public TObject {
   foo    f  [2]; //
 
   foobj *fov;    //! fixed size is not supported [2]
-  int    vop;     
+  int    vop;
   foobj *fvop;   //[vop]
 
   foo   *fv;     //! fixed size is not supported [2]
-  int    vp;     
+  int    vp;
   foo  *fvp;     //[vp]
 #endif
-  
+
   int Getfp_is() {
     return fp[0]->i + fp[1]->i;
   };
 
-  ClassDef(bar,2)
+  ClassDefOverride(bar, 3)
 };
 #endif

roottest/root/io/arrayobject/barLinkdef.h

@@ -1,4 +1,4 @@
-#ifdef __CINT__
+#ifdef __ROOTCLING__
 
 #pragma link off all globals;
 #pragma link off all classes;

roottest/root/io/arrayobject/foo.h

@@ -8,11 +8,11 @@ class foobj : public TObject {
 public:
   foobj() { i = 0; f = 0; }
   foobj(Int_t I) {i = I; f = 2*i; }
-  virtual ~foobj() {}
+  ~foobj() override {}
 
   Int_t i;
   Float_t f;
-  
+
   ClassDefOverride(foobj,1)
 };
 
@@ -24,15 +24,15 @@ class foo {
 
   Int_t i;
   Float_t f;
-  
+
   ClassDef(foo,1)
 };
 
 //_______________________________________________________________________
 inline TBuffer &operator>>(TBuffer &buf, foo *&obj)
 {
    // Read foo object from buffer. Declared in ClassDef.
-  
+
    if (!obj) obj = new foo;
    obj->IsA()->ReadBuffer(buf,(void*)obj);
    return buf;
@@ -41,7 +41,7 @@ inline TBuffer &operator>>(TBuffer &buf, foo *&obj)
 inline TBuffer &operator<<(TBuffer &buf, foo *&obj)
 {
    // Read foo object from buffer. Declared in ClassDef.
-  
+
   //   if (!obj) obj = new foo;
    obj->IsA()->WriteBuffer(buf,(void*)obj);
    return buf;