Add tests for other criteria cases

phys/root/filter/test/Snakefile

@@ -1,15 +1,48 @@
-rule define_columns:
+rule filter_str:
     input:
         "ntuple0.root",
     output:
-        "ntuple0_output.root",
+        "ntuple0_str_output.root",
+    log:
+        "logs/filter/filter_str.log",
+    params:
+        input_tree_name="TestTree",
+        output_tree_name="TestTree",
+        criteria="pt > 1400",
+        branches_to_save=["pz", "pt", "p"],
+    threads: 2
+    wrapper:
+        "master/phys/root/filter"
+
+rule filter_list:
+    input:
+        "ntuple0.root",
+    output:
+        "ntuple0_list_output.root",
+    log:
+        "logs/filter/filter_list.log",
+    params:
+        input_tree_name="TestTree",
+        output_tree_name="TestTree",
+        criteria=["pt > 1400", "pz > 19000"],
+        branches_to_save=["pz", "pt", "p"],
+    threads: 2
+    wrapper:
+        "master/phys/root/filter"
+
+rule filter_dict:
+    input:
+        "ntuple0.root",
+    output:
+        "ntuple0_dict_output.root",
     log:
         "logs/filter/filter.log",
     params:
         input_tree_name="TestTree",
         output_tree_name="TestTree",
         criteria="pt > 1400",
         branches_to_save=["pz", "pt", "p"],
+        verbose=True
     threads: 2
     wrapper:
         "master/phys/root/filter"

test.py

@@ -6829,10 +6829,26 @@ def test_root_define_columns():
 
 
 @skip_if_not_modified
-def test_root_filter():
+def test_root_filter_str():
     run(
         "phys/root/filter",
-        ["snakemake", "--cores", "2", "--use-conda", "-F"],
+        ["snakemake", "--cores", "2", "--use-conda", "-F", "ntuple0_str_output.root"],
+    )
+
+
+@skip_if_not_modified
+def test_root_filter_list():
+    run(
+        "phys/root/filter",
+        ["snakemake", "--cores", "2", "--use-conda", "-F", "ntuple0_list_output.root"],
+    )
+
+
+@skip_if_not_modified
+def test_root_filter_dict():
+    run(
+        "phys/root/filter",
+        ["snakemake", "--cores", "2", "--use-conda", "-F", "ntuple0_dict_output.root"],
     )