[TDF] Trigger event loop and check results in test_read_leaves[_nodict]

ashlaban · Mar 16, 2018 · 28e38e8 · 28e38e8
1 parent 9d3963e
commit 28e38e8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/root/dataframe/test_read_leaves.cxx b/root/dataframe/test_read_leaves.cxx
@@ -3,6 +3,7 @@
 #include <TTree.h>
 #include <TFile.h>
 #include <TSystem.h>
+#include <cassert>
 
 #include "test_read_leaves.h"
 
@@ -26,7 +27,13 @@ int main()
    }
 
    TDataFrame d("t", "test_read_leaves.root");
-   d.Filter(check_a_b, {"v.a", "v.b"}).Report();
+   auto check_a_b = [](int a, int b) {
+      assert(a == 1);
+      assert(b == 2);
+      return true;
+   };
+   auto c = d.Filter(check_a_b, {"v.a", "v.b"}).Count();
+   assert(*c == 1u);
    gSystem->Unlink("test_read_leaves.root");
    return 0;
 }

diff --git a/root/dataframe/test_read_leaves.h b/root/dataframe/test_read_leaves.h
@@ -5,10 +5,3 @@ struct V {
 struct W {
    V v;
 };
-
-
-// checkers
-bool check_a_b (int , int )
-{
-   return true;
-}
diff --git a/root/dataframe/test_read_leaves_nodict.cxx b/root/dataframe/test_read_leaves_nodict.cxx
@@ -26,7 +26,13 @@ int main()
    }
 
    TDataFrame d("t", "test_read_leaves_nodict.root");
-   d.Filter(check_a_b, {"v.a", "v.b"}).Report();
+   auto check_a_b = [](int a, int b) {
+      assert(a == 1);
+      assert(b == 2);
+      return true;
+   };
+   auto c = d.Filter(check_a_b, {"v.a", "v.b"}).Count();
+   assert(*c == 1u);
    gSystem->Unlink("test_read_leaves_nodict.root");
    return 0;
 }