[test] fix dictionary generation

Author: ferdymercury

tree/tree/test/CMakeLists.txt

@@ -6,13 +6,18 @@
 
 
 ROOT_GENERATE_DICTIONARY(ElementStructDict ElementStruct.h LINKDEF ElementStructLinkDef.h OPTIONS -inlineInputHeader)
+ROOT_GENERATE_DICTIONARY(TestRefObjDict TestRefObj.h LINKDEF TestRefObjLinkDef.h OPTIONS -inlineInputHeader)
 ROOT_ADD_GTEST(testTOffsetGeneration TOffsetGeneration.cxx ElementStruct.cxx ElementStructDict.cxx
   LIBRARIES RIO Tree MathCore
 )
+ROOT_ADD_GTEST(testClonesArray testClonesArray.cxx TestRefObj.cxx TestRefObjDict.cxx LIBRARIES RIO Tree)
 if(MSVC AND NOT CMAKE_GENERATOR MATCHES Ninja)
   add_custom_command(TARGET testTOffsetGeneration POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libElementStructDict_rdict.pcm
                                      ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libElementStructDict_rdict.pcm)
+  add_custom_command(TARGET testClonesArray POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libTestRefObjDict_rdict.pcm
+                                     ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/libTestRefObjDict_rdict.pcm)
 endif()
 target_include_directories(testTOffsetGeneration PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 ROOT_STANDARD_LIBRARY_PACKAGE(SillyStruct NO_INSTALL_HEADERS HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/SillyStruct.h SOURCES SillyStruct.cxx LINKDEF SillyStructLinkDef.h DEPENDENCIES RIO)
@@ -36,7 +41,6 @@ ROOT_ADD_GTEST(testTChainSaveAsCxx TChainSaveAsCxx.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(testTChainRegressions TChainRegressions.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(testTTreeTruncatedDatatypes TTreeTruncatedDatatypes.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(testTTreeRegressions TTreeRegressions.cxx LIBRARIES RIO Tree)
-ROOT_ADD_GTEST(testClonesArray testClonesArray.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(entrylist_addsublist entrylist_addsublist.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(chain_setentrylist chain_setentrylist.cxx LIBRARIES RIO Tree)
 ROOT_ADD_GTEST(entrylist_enter entrylist_enter.cxx LIBRARIES RIO Tree)

tree/tree/test/ElementStruct.h

@@ -1,3 +1,5 @@
+#ifndef ELEMENTSTRUCT_H
+#define ELEMENTSTRUCT_H
 /**
  * The ElementStruct has no purpose except to provide
  * inputs to the test cases.
@@ -8,3 +10,4 @@ class ElementStruct {
    int    i;
    double *d; //[i]
 };
+#endif

tree/tree/test/TestRefObj.cxx

@@ -0,0 +1 @@
+#include "TestRefObj.h"

tree/tree/test/TestRefObj.h

@@ -0,0 +1,22 @@
+#ifndef TESTREFOBJ_H
+#define TESTREFOBJ_H
+
+#include "TRef.h"
+#include "TRefArray.h"
+
+// https://its.cern.ch/jira/browse/ROOT-7249
+class TestRefObj : public TObject {
+protected:
+   TRefArray lChildren;
+    
+public:
+   TestRefObj() : lChildren() {}
+   virtual ~TestRefObj() {}
+   virtual void Clear(Option_t *opt = "C") { lChildren.Clear(opt); }
+   virtual void SetChild(TestRefObj *aChild) { lChildren.Add(aChild); }
+   virtual const TestRefObj *GetChild(Int_t idx = 0) const { return static_cast<TestRefObj *>(lChildren.At(idx)); }
+   virtual Bool_t HasChild() const { return (lChildren.GetEntriesFast() > 0); }
+   ClassDef(TestRefObj, 1);
+};
+
+#endif

tree/tree/test/TestRefObjLinkDef.h

@@ -0,0 +1,9 @@
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class TestRefObj+;
+
+#endif

tree/tree/test/testClonesArray.cxx

@@ -1,6 +1,5 @@
 #include "TObject.h"
-#include "TRef.h"
-#include "TRefArray.h"
+#include "TestRefObj.h"
 #include "TFile.h"
 #include "TTree.h"
 #include "TRandom.h"
@@ -11,19 +10,6 @@
 #include "gtest/gtest.h"
 
 // https://its.cern.ch/jira/browse/ROOT-7249
-class TestRefObj : public TObject {
-protected:
-   TRefArray lChildren;
-
-public:
-   TestRefObj() : lChildren() {}
-   virtual ~TestRefObj() {}
-   virtual void Clear(Option_t *opt = "C") { lChildren.Clear(opt); }
-   virtual void SetChild(TestRefObj *aChild) { lChildren.Add(aChild); }
-   virtual const TestRefObj *GetChild(Int_t idx = 0) const { return static_cast<TestRefObj *>(lChildren.At(idx)); }
-   virtual Bool_t HasChild() const { return (lChildren.GetEntriesFast() > 0); }
-   ClassDef(TestRefObj, 1);
-};
 TEST(TClonesArray, RefArrayClearChildren)
 {
    Bool_t resetObjectCount = kTRUE;