Skip to content

Commit b41cbed

Browse files
committed
Adjust existing tests
1 parent a804ebe commit b41cbed

File tree

4 files changed

+22
-3
lines changed

4 files changed

+22
-3
lines changed

tests/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,7 @@ def config(request, tmpdir):
109109
'db_path': ':memory:',
110110
'autocomplete_activities_range': 30,
111111
'autocomplete_split_activity': False,
112+
'tracking_show_recent_activities': True,
113+
'tracking_recent_activities_items': 6,
112114
}
113115
return config

tests/preferences/conftest.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,24 @@ def autocomplete_split_activity_parametrized(request):
8080
return request.param
8181

8282

83+
@pytest.fixture(params=(True, False))
84+
def tracking_show_recent_activities_parametrized(request):
85+
"""Return a parametrized tracking_show_recent_activities_parametrized value."""
86+
return request.param
87+
88+
89+
@pytest.fixture(params=(0, 1, 5, 15))
90+
def tracking_recent_activities_items_parametrized(request):
91+
"""Return a parametrized tracking_recent_activities_items_parametrized value."""
92+
return request.param
93+
94+
8395
@pytest.fixture
8496
def config_parametrized(request, store_parametrized, day_start_parametrized,
8597
fact_min_delta_parametrized, tmpfile_path_parametrized, db_engine_parametrized,
8698
db_path_parametrized, autocomplete_activities_range_parametrized,
87-
autocomplete_split_activity_parametrized):
99+
autocomplete_split_activity_parametrized, tracking_show_recent_activities_parametrized,
100+
tracking_recent_activities_items_parametrized):
88101
"""Return a config fixture with heavily parametrized config values."""
89102
return {
90103
'store': store_parametrized,
@@ -95,6 +108,8 @@ def config_parametrized(request, store_parametrized, day_start_parametrized,
95108
'db_path': db_path_parametrized,
96109
'autocomplete_activities_range': autocomplete_activities_range_parametrized,
97110
'autocomplete_split_activity': autocomplete_split_activity_parametrized,
111+
'tracking_show_recent_activities': tracking_show_recent_activities_parametrized,
112+
'tracking_recent_activities_items': tracking_recent_activities_items_parametrized,
98113
}
99114

100115

tests/preferences/test_preferences_dialog.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ def test_init(self, dummy_window, app, config, empty_initial):
1919
grids = result.get_content_area().get_children()[0].get_children()
2020
# This assumes 2 children per config entry (label and widget).
2121
grid_entry_counts = [len(g.get_children()) / 2 for g in grids]
22-
assert sum(grid_entry_counts) == 8
22+
assert sum(grid_entry_counts) == 10
2323

24+
@pytest.mark.slowtest
2425
def test_get_config(self, preferences_dialog, config_parametrized):
2526
"""
2627
Make sure retrieval of field values works as expected.
@@ -32,6 +33,7 @@ def test_get_config(self, preferences_dialog, config_parametrized):
3233
result = preferences_dialog.get_config()
3334
assert result == config_parametrized
3435

36+
@pytest.mark.slowtest
3537
def test_set_config(self, preferences_dialog, config_parametrized):
3638
"""Make sure setting the field values works as expected."""
3739
preferences_dialog._set_config(config_parametrized)

tests/test_hamster-gtk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test__reload_config(self, app, config, mocker):
2929
def test__get_default_config(self, app, appdirs):
3030
"""Make sure the defaults use appdirs for relevant paths."""
3131
result = app._get_default_config()
32-
assert len(result) == 8
32+
assert len(result) == 10
3333
assert os.path.dirname(result['tmpfile_path']) == appdirs.user_data_dir
3434
assert os.path.dirname(result['db_path']) == appdirs.user_data_dir
3535

0 commit comments

Comments
 (0)