Skip to content

Commit 1a48f3d

Browse files
committed
Revise test function to improve readability
1 parent 9ba634b commit 1a48f3d

File tree

1 file changed

+23
-26
lines changed

1 file changed

+23
-26
lines changed

tests/test_cache.py

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,51 +10,48 @@
1010

1111
def test_cache_save():
1212
def get_cache_fnames_ref():
13-
cache._clear()
13+
cache.clear()
1414
cache._enable()
1515
stump(np.random.rand(10), 3)
16-
cache_data_fnames = [
17-
fname for fname in cache._get_cache() if fname.endswith(".nbc")
18-
]
19-
cache_index_fnames = [
20-
fname for fname in cache._get_cache() if fname.endswith(".nbi")
21-
]
22-
cache._clear()
23-
return cache_data_fnames, cache_index_fnames
16+
cache_files = cache._get_cache()
17+
cache.clear()
18+
return cache_files
2419

2520
def get_cache_fnames_comp():
26-
cache._clear()
27-
cache._save()
21+
cache.clear()
22+
cache.save()
2823
stump(np.random.rand(10), 3)
29-
cache_data_fnames = [
30-
fname for fname in cache._get_cache() if fname.endswith(".nbc")
31-
]
32-
cache_index_fnames = [
33-
fname for fname in cache._get_cache() if fname.endswith(".nbi")
34-
]
35-
cache._clear()
36-
return cache_data_fnames, cache_index_fnames
24+
cache_files = cache._get_cache()
25+
cache.clear()
26+
return cache_files
3727

38-
ref_data, ref_index = get_cache_fnames_ref()
39-
comp_data, comp_index = get_cache_fnames_comp()
28+
ref_cache_files = get_cache_fnames_ref()
29+
comp_cache_files = get_cache_fnames_comp()
4030

41-
assert sorted(ref_data) == sorted(comp_data)
42-
assert set(ref_index).issubset(comp_index)
31+
# check nbc files
32+
ref_nbc = [fname for fname in ref_cache_files if fname.endswith(".nbc")]
33+
comp_nbc = [fname for fname in comp_cache_files if fname.endswith(".nbc")]
34+
assert sorted(ref_nbc) == sorted(comp_nbc)
35+
36+
# check nbi files
37+
ref_nbi = [fname for fname in ref_cache_files if fname.endswith(".nbi")]
38+
comp_nbi = [fname for fname in comp_cache_files if fname.endswith(".nbi")]
39+
assert set(ref_nbi).issubset(comp_nbi)
4340

4441

4542
def test_cache_save_after_clear():
4643
T = np.random.rand(10)
4744
m = 3
4845
stump(T, m)
4946

50-
cache._save()
47+
cache.save()
5148
ref_cache = cache._get_cache()
5249

53-
cache._clear()
50+
cache.clear()
5451
# testing cache._clear()
5552
assert len(cache._get_cache()) == 0
5653

57-
cache._save()
54+
cache.save()
5855
comp_cache = cache._get_cache()
5956

6057
# testing cache._save() after cache._clear()

0 commit comments

Comments
 (0)