Replace individual path properties with single paths function.

This is to support an upcoming change.

Author: cyphase

android/tests_backend/app.py

@@ -23,21 +23,13 @@ def __init__(self, app):
     def get_app_context(self):
         return self.native.getApplicationContext()
 
-    @property
-    def config_path(self):
-        return Path(self.get_app_context().getFilesDir().getPath()) / "config"
-
-    @property
-    def data_path(self):
-        return Path(self.get_app_context().getFilesDir().getPath()) / "data"
-
-    @property
-    def cache_path(self):
-        return Path(self.get_app_context().getCacheDir().getPath())
-
-    @property
-    def logs_path(self):
-        return Path(self.get_app_context().getFilesDir().getPath()) / "log"
+    def paths(self):
+        return {
+            "config": Path(self.get_app_context().getFilesDir().getPath()) / "config",
+            "data": Path(self.get_app_context().getFilesDir().getPath()) / "data",
+            "cache": Path(self.get_app_context().getCacheDir().getPath()),
+            "logs": Path(self.get_app_context().getFilesDir().getPath()) / "log",
+        }
 
     def assert_app_icon(self, icon):
         pytest.xfail("Android apps don't have app icons at runtime")

cocoa/tests_backend/app.py

@@ -33,21 +33,14 @@ def __init__(self, app):
         NSWindow.allowsAutomaticWindowTabbing = False
         assert isinstance(self.app._impl.native, NSApplication)
 
-    @property
-    def config_path(self):
-        return Path.home() / "Library/Preferences/org.beeware.toga.testbed"
-
-    @property
-    def data_path(self):
-        return Path.home() / "Library/Application Support/org.beeware.toga.testbed"
-
-    @property
-    def cache_path(self):
-        return Path.home() / "Library/Caches/org.beeware.toga.testbed"
-
-    @property
-    def logs_path(self):
-        return Path.home() / "Library/Logs/org.beeware.toga.testbed"
+    def paths(self):
+        return {
+            "config": Path.home() / "Library/Preferences/org.beeware.toga.testbed",
+            "data": Path.home()
+            / "Library/Application Support/org.beeware.toga.testbed",
+            "cache": Path.home() / "Library/Caches/org.beeware.toga.testbed",
+            "logs": Path.home() / "Library/Logs/org.beeware.toga.testbed",
+        }
 
     @property
     def is_cursor_visible(self):

gtk/tests_backend/app.py

@@ -24,21 +24,13 @@ def __init__(self, app):
         assert isinstance(self.app._impl.native, Gtk.Application)
         assert IS_WAYLAND is (os.environ.get("WAYLAND_DISPLAY", "") != "")
 
-    @property
-    def config_path(self):
-        return Path.home() / ".config/testbed"
-
-    @property
-    def data_path(self):
-        return Path.home() / ".local/share/testbed"
-
-    @property
-    def cache_path(self):
-        return Path.home() / ".cache/testbed"
-
-    @property
-    def logs_path(self):
-        return Path.home() / ".local/state/testbed/log"
+    def paths(self):
+        return {
+            "config": Path.home() / ".config/testbed",
+            "data": Path.home() / ".local/share/testbed",
+            "cache": Path.home() / ".cache/testbed",
+            "logs": Path.home() / ".local/state/testbed/log",
+        }
 
     @property
     def is_cursor_visible(self):

iOS/tests_backend/app.py

@@ -29,21 +29,14 @@ def get_path(self, search_path):
         )
         return Path(urls[0].path)
 
-    @property
-    def config_path(self):
-        return self.get_path(NSSearchPathDirectory.ApplicationSupport) / "Config"
-
-    @property
-    def data_path(self):
-        return self.get_path(NSSearchPathDirectory.Documents)
-
-    @property
-    def cache_path(self):
-        return self.get_path(NSSearchPathDirectory.Cache)
-
-    @property
-    def logs_path(self):
-        return self.get_path(NSSearchPathDirectory.ApplicationSupport) / "Logs"
+    def paths(self):
+        return {
+            "config": self.get_path(NSSearchPathDirectory.ApplicationSupport)
+            / "Config",
+            "data": self.get_path(NSSearchPathDirectory.Documents),
+            "cache": self.get_path(NSSearchPathDirectory.Cache),
+            "logs": self.get_path(NSSearchPathDirectory.ApplicationSupport) / "Logs",
+        }
 
     def assert_app_icon(self, icon):
         pytest.xfail("iOS apps don't have app icons at runtime")

testbed/tests/test_paths.py

@@ -8,7 +8,8 @@
 async def test_app_paths(app, app_probe, attr):
     """Platform paths are as expected."""
     path = getattr(app.paths, attr)
-    assert path == getattr(app_probe, f"{attr}_path")
+    expected_paths = app_probe.paths()
+    assert path == expected_paths[attr]
 
     try:
         # We can create a folder in the app path

winforms/tests_backend/app.py

@@ -27,35 +27,27 @@ def __init__(self, app):
         # The Winforms Application class is a singleton instance
         assert self.app._impl.native == Application
 
-    @property
-    def config_path(self):
-        return (
-            Path.home()
-            / "AppData"
-            / "Local"
-            / "Tiberius Yak"
-            / "Toga Testbed"
-            / "Config"
-        )
-
-    @property
-    def data_path(self):
-        return Path.home() / "AppData/Local/Tiberius Yak/Toga Testbed/Data"
-
-    @property
-    def cache_path(self):
-        return (
-            Path.home()
-            / "AppData"
-            / "Local"
-            / "Tiberius Yak"
-            / "Toga Testbed"
-            / "Cache"
-        )
-
-    @property
-    def logs_path(self):
-        return Path.home() / "AppData/Local/Tiberius Yak/Toga Testbed/Logs"
+    def paths(self):
+        return {
+            "config": (
+                Path.home()
+                / "AppData"
+                / "Local"
+                / "Tiberius Yak"
+                / "Toga Testbed"
+                / "Config"
+            ),
+            "data": Path.home() / "AppData/Local/Tiberius Yak/Toga Testbed/Data",
+            "cache": (
+                Path.home()
+                / "AppData"
+                / "Local"
+                / "Tiberius Yak"
+                / "Toga Testbed"
+                / "Cache"
+            ),
+            "logs": Path.home() / "AppData/Local/Tiberius Yak/Toga Testbed/Logs",
+        }
 
     @property
     def is_cursor_visible(self):