[ntuple] Add basic reading tests

Author: silverweed

tree/ntuple/src/RNTupleAttrReading.cxx

@@ -8,6 +8,7 @@
 #include <ROOT/RNTupleAttrReading.hxx>
 #include <ROOT/RNTupleAttrUtils.hxx>
 #include <ROOT/RNTupleReader.hxx>
+#include <ROOT/RNTupleModel.hxx>
 
 using namespace ROOT::Experimental::Internal::RNTupleAttributes;
 
@@ -81,3 +82,4 @@ std::unique_ptr<ROOT::REntry> ROOT::Experimental::RNTupleAttrSetReader::CreateEn
 {
    return fUserModel->CreateEntry();
 }
+

tree/ntuple/src/RNTupleReader.cxx

@@ -15,7 +15,7 @@
 
 #include <ROOT/RField.hxx>
 #include <ROOT/RFieldVisitor.hxx>
-#include <ROOT/RNTupleAttributes.hxx>
+#include <ROOT/RNTupleAttrReading.hxx>
 #include <ROOT/RNTupleImtTaskScheduler.hxx>
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>

tree/ntuple/test/ntuple_attributes.cxx

@@ -1,5 +1,6 @@
 #include "ntuple_test.hxx"
 #include <ROOT/RNTupleAttrWriting.hxx>
+#include <ROOT/RNTupleAttrReading.hxx>
 
 TEST(RNTupleAttributes, CreateWriter)
 {
@@ -63,33 +64,36 @@ TEST(RNTupleAttributes, AttributeSetDuplicateName)
    }
 }
 
-TEST(RNTupleAttributes, BasicWriting)
+TEST(RNTupleAttributes, BasicReadingWriting)
 {
-   FileRaii fileGuard("ntuple_attr_basic_writing.root");
+   FileRaii fileGuard("ntuple_attr_basic_readwriting.root");
 
    ROOT::TestSupport::CheckDiagsRAII diagsRaii;
    diagsRaii.requiredDiag(kWarning, "ROOT.NTuple", "RNTuple Attributes are experimental", false);
 
-   auto file = std::unique_ptr<TFile>(TFile::Open(fileGuard.GetPath().c_str(), "RECREATE"));
-   auto model = RNTupleModel::Create();
-   auto pInt = model->MakeField<int>("int");
-   auto writer = RNTupleWriter::Append(std::move(model), "ntuple", *file);
+   /// Writing
+   {
+      auto file = std::unique_ptr<TFile>(TFile::Open(fileGuard.GetPath().c_str(), "RECREATE"));
+      auto model = RNTupleModel::Create();
+      auto pInt = model->MakeField<int>("int");
+      auto writer = RNTupleWriter::Append(std::move(model), "ntuple", *file);
 
-   auto attrModel = RNTupleModel::Create();
-   auto pAttr = attrModel->MakeField<std::string>("attr");
-   auto attrSetWriter = writer->CreateAttributeSet(std::move(attrModel), "AttrSet1");
+      auto attrModel = RNTupleModel::Create();
+      auto pAttr = attrModel->MakeField<std::string>("attr");
+      auto attrSetWriter = writer->CreateAttributeSet(std::move(attrModel), "AttrSet1");
 
-   auto attrRange = attrSetWriter->BeginRange();
-   *pAttr = "My Attribute";
-   for (int i = 0; i < 100; ++i) {
-      *pInt = i;
-      writer->Fill();
-   }
-   attrSetWriter->CommitRange(std::move(attrRange));
-   writer.reset();
+      auto attrRange = attrSetWriter->BeginRange();
+      *pAttr = "My Attribute";
+      for (int i = 0; i < 100; ++i) {
+         *pInt = i;
+         writer->Fill();
+      }
+      attrSetWriter->CommitRange(std::move(attrRange));
+      writer.reset();
 
-   // Cannot create new ranges after closing the main writer
-   EXPECT_THROW((attrRange = attrSetWriter->BeginRange()), ROOT::RException);
+      // Cannot create new ranges after closing the main writer
+      EXPECT_THROW((attrRange = attrSetWriter->BeginRange()), ROOT::RException);
+   }
 
    // Cannot directly fetch the attribute RNTuple from the TFile
    {
@@ -147,6 +151,9 @@ TEST(RNTupleAttributes, BasicWritingWithExplicitEntry)
    for (const auto &attrSetIt : reader->GetDescriptor().GetAttrSetIterable()) {
       EXPECT_EQ(attrSetIt.GetName(), "AttrSet1");
    }
+
+   auto attrSetReader = reader->OpenAttributeSet("AttrSet1");
+   EXPECT_EQ(attrSetReader->GetNAttrEntries(), 1);
 }
 
 TEST(RNTupleAttributes, NoCommitRange)
@@ -185,6 +192,7 @@ TEST(RNTupleAttributes, MultipleSets)
    ROOT::TestSupport::CheckDiagsRAII diagsRaii;
    diagsRaii.requiredDiag(kWarning, "ROOT.NTuple", "RNTuple Attributes are experimental", false);
 
+   /// Writing
    {
       auto model = RNTupleModel::Create();
       auto pInt = model->MakeField<int>("int");
@@ -211,13 +219,18 @@ TEST(RNTupleAttributes, MultipleSets)
       attrSet2->CommitRange(std::move(attrRange2));
    }
 
+   /// Reading
    auto reader = RNTupleReader::Open("ntpl", fileGuard.GetPath());
    EXPECT_EQ(reader->GetDescriptor().GetNAttributeSets(), 2);
-   int n = 1;
-   for (const auto &attrSetIt : reader->GetDescriptor().GetAttrSetIterable()) {
-      EXPECT_EQ(attrSetIt.GetName(), "MyAttrSet" + std::to_string(n));
-      ++n;
-   }
+   auto sets = reader->GetDescriptor().GetAttrSetIterable();
+   // NOTE: there is no guaranteed order in which the attribute sets appear in the iterable
+   EXPECT_NE(std::find_if(sets.begin(), sets.end(), [](auto &&s) { return s.GetName() == "MyAttrSet1"; }), sets.end());
+   EXPECT_NE(std::find_if(sets.begin(), sets.end(), [](auto &&s) { return s.GetName() == "MyAttrSet2"; }), sets.end());
+
+   auto attrSetReader1 = reader->OpenAttributeSet("MyAttrSet1");
+   EXPECT_EQ(attrSetReader1->GetNAttrEntries(), 100);
+   auto attrSetReader2 = reader->OpenAttributeSet("MyAttrSet2");
+   EXPECT_EQ(attrSetReader2->GetNAttrEntries(), 1);
 }
 
 TEST(RNTupleAttributes, AttributeInvalidModel)