Skip to content

Commit

Permalink
Fix test file names
Browse files Browse the repository at this point in the history
  • Loading branch information
ariostas committed Nov 19, 2024
1 parent 09a0d93 commit a5659a8
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 20 deletions.
2 changes: 1 addition & 1 deletion tests/test_0013_rntuple_anchor.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def test():
filename = skhep_testdata.data_path("ntpl001_staff_rntuple_v1.root")
filename = skhep_testdata.data_path("ntpl001_staff_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["Staff"]
assert obj.member("fVersionEpoch") == 1
Expand Down
8 changes: 5 additions & 3 deletions tests/test_0630_rntuple_basics.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


def test_flat():
filename = skhep_testdata.data_path("test_int_float_rntuple_v1.root")
filename = skhep_testdata.data_path("test_int_float_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
R = f["ntuple"]
assert R.keys() == ["one_integers", "two_floats"]
Expand All @@ -32,7 +32,7 @@ def test_flat():
R.arrays(entry_start=1, entry_stop=3)["one_integers"] == numpy.array([8, 7])
)

filename = skhep_testdata.data_path("test_int_5e4_rntuple_v1.root")
filename = skhep_testdata.data_path("test_int_5e4_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
R = f["ntuple"]
assert all(
Expand All @@ -42,7 +42,9 @@ def test_flat():


def test_jagged():
filename = skhep_testdata.data_path("test_int_vfloat_tlv_vtlv_rntuple_v1.root")
filename = skhep_testdata.data_path(
"test_int_vfloat_tlv_vtlv_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
R = f["ntuple"]
assert R.keys() == ["one_integers", "two_v_floats", "three_LV", "four_v_LVs"]
2 changes: 1 addition & 1 deletion tests/test_0662_rntuple_stl_containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


def test_rntuple_stl_containers():
filename = skhep_testdata.data_path("test_stl_containers_rntuple_v1.root")
filename = skhep_testdata.data_path("test_stl_containers_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
R = f["ntuple"]
assert R.keys() == [
Expand Down
8 changes: 5 additions & 3 deletions tests/test_0962_rntuple_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@


def test_new_support_RNTuple_split_int32_reading():
with uproot.open(skhep_testdata.data_path("test_int_5e4_rntuple_v1.root")) as f:
with uproot.open(
skhep_testdata.data_path("test_int_5e4_rntuple_v1-0-0-0.root")
) as f:
obj = f["ntuple"]
df = obj.arrays()
assert len(df) == 5e4
Expand All @@ -17,15 +19,15 @@ def test_new_support_RNTuple_split_int32_reading():


def test_new_support_RNTuple_bit_bool_reading():
with uproot.open(skhep_testdata.data_path("test_bit_rntuple_v1.root")) as f:
with uproot.open(skhep_testdata.data_path("test_bit_rntuple_v1-0-0-0.root")) as f:
obj = f["ntuple"]
df = obj.arrays()
assert np.all(df.one_bit == np.asarray([1, 0, 0, 1, 0, 0, 1, 0, 0, 1]))


def test_new_support_RNTuple_split_int16_reading():
with uproot.open(
skhep_testdata.data_path("test_int_multicluster_rntuple_v1.root")
skhep_testdata.data_path("test_int_multicluster_rntuple_v1-0-0-0.root")
) as f:
obj = f["ntuple"]
df = obj.arrays()
Expand Down
8 changes: 4 additions & 4 deletions tests/test_1191_rntuple_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def test_schema_extension():
filename = skhep_testdata.data_path("test_extension_columns_rntuple_v1.root")
filename = skhep_testdata.data_path("test_extension_columns_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand All @@ -34,7 +34,7 @@ def test_schema_extension():

def test_rntuple_cardinality():
filename = skhep_testdata.data_path(
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1.root"
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["Events"]
Expand All @@ -43,7 +43,7 @@ def test_rntuple_cardinality():


def test_multiple_page_delta_encoding():
filename = skhep_testdata.data_path("test_index_multicluster_rntuple_v1.root")
filename = skhep_testdata.data_path("test_index_multicluster_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]
data = obj.read_col_page(0, 0)
Expand All @@ -53,7 +53,7 @@ def test_multiple_page_delta_encoding():

def test_split_encoding():
filename = skhep_testdata.data_path(
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1.root"
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["Events"]
Expand Down
12 changes: 8 additions & 4 deletions tests/test_1223_more_rntuple_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


def test_atomic():
filename = skhep_testdata.data_path("test_atomic_bitset_rntuple_v1.root")
filename = skhep_testdata.data_path("test_atomic_bitset_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand All @@ -16,7 +16,7 @@ def test_atomic():


def test_bitset():
filename = skhep_testdata.data_path("test_atomic_bitset_rntuple_v1.root")
filename = skhep_testdata.data_path("test_atomic_bitset_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand Down Expand Up @@ -67,7 +67,9 @@ def test_bitset():


def test_empty_struct():
filename = skhep_testdata.data_path("test_emptystruct_invalidvar_rntuple_v1.root")
filename = skhep_testdata.data_path(
"test_emptystruct_invalidvar_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand All @@ -77,7 +79,9 @@ def test_empty_struct():


def test_invalid_variant():
filename = skhep_testdata.data_path("test_emptystruct_invalidvar_rntuple_v1.root")
filename = skhep_testdata.data_path(
"test_emptystruct_invalidvar_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand Down
6 changes: 3 additions & 3 deletions tests/test_1250_rntuple_improvements.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def test_field_class():
filename = skhep_testdata.data_path("test_nested_structs_rntuple_v1.root")
filename = skhep_testdata.data_path("test_nested_structs_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]
my_struct = obj["my_struct"]
Expand All @@ -25,7 +25,7 @@ def test_field_class():

def test_array_methods():
filename = skhep_testdata.data_path(
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1.root"
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["Events"]
Expand All @@ -41,7 +41,7 @@ def test_array_methods():

def test_iterate():
filename = skhep_testdata.data_path(
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1.root"
"Run2012BC_DoubleMuParked_Muons_1000evts_rntuple_v1-0-0-0.root"
)
with uproot.open(filename) as f:
obj = f["Events"]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_1285_rntuple_multicluster_concatenation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def test_schema_extension():
filename = skhep_testdata.data_path("test_index_multicluster_rntuple_v1.root")
filename = skhep_testdata.data_path("test_index_multicluster_rntuple_v1-0-0-0.root")
with uproot.open(filename) as f:
obj = f["ntuple"]

Expand Down

0 comments on commit a5659a8

Please sign in to comment.