diff --git a/tests/fixtures/cpp/meta1.cpp b/tests/fixtures/cpp/mod1/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta1.cpp rename to tests/fixtures/cpp/mod1/meta.cpp diff --git a/tests/fixtures/cpp/meta2.cpp b/tests/fixtures/cpp/mod2/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta2.cpp rename to tests/fixtures/cpp/mod2/meta.cpp diff --git a/tests/fixtures/cpp/meta3.cpp b/tests/fixtures/cpp/mod3/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta3.cpp rename to tests/fixtures/cpp/mod3/meta.cpp diff --git a/tests/fixtures/cpp/meta4.cpp b/tests/fixtures/cpp/mod4/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta4.cpp rename to tests/fixtures/cpp/mod4/meta.cpp diff --git a/tests/fixtures/cpp/meta5.cpp b/tests/fixtures/cpp/mod5/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta5.cpp rename to tests/fixtures/cpp/mod5/meta.cpp diff --git a/tests/fixtures/cpp/meta6.cpp b/tests/fixtures/cpp/mod6/meta.cpp similarity index 100% rename from tests/fixtures/cpp/meta6.cpp rename to tests/fixtures/cpp/mod6/meta.cpp diff --git a/tests/fixtures/cpp/test.py b/tests/fixtures/cpp/test.py deleted file mode 100644 index 453b6d7..0000000 --- a/tests/fixtures/cpp/test.py +++ /dev/null @@ -1,3 +0,0 @@ -from dzgui.api.mods import tokenize - -print(tokenize("meta4.cpp")) diff --git a/tests/fixtures/dztuirc_one b/tests/fixtures/dztuirc_3 similarity index 94% rename from tests/fixtures/dztuirc_one rename to tests/fixtures/dztuirc_3 index 9ba40aa..c7a32f4 100644 --- a/tests/fixtures/dztuirc_one +++ b/tests/fixtures/dztuirc_3 @@ -23,9 +23,6 @@ debug="1" #Toggle stable/testing branch branch="testing" -#Start in fullscreen -fullscreen="false" - #Steam API key steam_api="" diff --git a/tests/fixtures/dztuirc_two b/tests/fixtures/dztuirc_two deleted file mode 100644 index 6869f4a..0000000 --- a/tests/fixtures/dztuirc_two +++ /dev/null @@ -1,45 +0,0 @@ -#Path to DayZ installation -steam_path="/tmp" - -#Battlemetrics API key -api_key="" - -#Favorited server IP:PORT array -ip_list=( -) - -#Favorite server to fast-connect to (limit one) -fav_server="" - -#Favorite server label (human readable) -fav_label="" - -#Custom player name (optional, required by some servers) -name="" - -#Set to 1 to perform dry-run and print launch options -debug="" - -#Toggle stable/testing branch -branch="testing" - -#Start in fullscreen -fullscreen="false" - -#Steam API key -steam_api="" - -#Auto-install mods -auto_install="0" - -#Automod staging directory -staging_dir="/tmp" - -#Path to default Steam client -default_steam_path="/tmp" - -#Preferred Steam launch command (for Flatpak support) -preferred_client="steam" - -#DZGUI source path -src_path="" diff --git a/tests/test_modmeta.py b/tests/test_modmeta.py index f2f4ca4..8002825 100644 --- a/tests/test_modmeta.py +++ b/tests/test_modmeta.py @@ -1,17 +1,13 @@ import pytest +from pathlib import Path + from dzgui.api.mods import tokenize from tests.fixtures import fixture_path @pytest.mark.mods -@pytest.mark.parametrize("fixture", [ - fixture_path("cpp/meta1.cpp"), - fixture_path("cpp/meta2.cpp"), - fixture_path("cpp/meta3.cpp"), - fixture_path("cpp/meta4.cpp"), - fixture_path("cpp/meta5.cpp"), - fixture_path("cpp/meta6.cpp"), - ] -) -def test_modmeta(fixture: str) -> None: - meta = tokenize(fixture) +@pytest.mark.parametrize("i", range(1, 7)) +def test_modmeta(i: int) -> None: + fixture = fixture_path(f"cpp/mod{i}") + path = Path(fixture) + meta = tokenize(path) assert meta["name"] == "ModName"