https://github.com/hasii2011/albow-python-3/issues/61

Author: hasii2011

.gitignore

@@ -8,4 +8,6 @@ __pycache__/
 /python3_albow.egg-info/
 /site/
 /docs/
-/venv-pyenv-3.7.7-system/
+/venv-pyenv-3.7.7/
+/venv-pyenv-3.8.5/
+

albow/demo/AlbowDemo.py

@@ -44,7 +44,7 @@ def main():
     from albow.demo.AlbowDemoShell import AlbowDemoShell
 
     pygame.init()
-    pygame.display.set_caption("%s" % DEMO_WINDOW_TITLE)
+    pygame.display.set_caption(f'{DEMO_WINDOW_TITLE}')
 
     # "file_handler": {
     #   "class": "logging.FileHandler",

albow/dialog/FileDialog.py

@@ -28,6 +28,9 @@ def __init__(self, prompt=None, suffixes=None, **kwds):
         label         = None
         d             = self.margin
         self.suffixes = suffixes or ()
+        if self.up_button_text is None:
+            self.up_button_text = ''
+
         up_button     = Button(self.up_button_text, action=self.go_up)
         dir_box       = DirectoryPathView(self.box_width - up_button.width - 10, self)
         self.dir_box  = dir_box

requirements.txt

@@ -1 +1,2 @@
 pygame==1.9.6
+jsonpickle==1.4.1

test/DummyVehicle.py

@@ -54,3 +54,7 @@ def __eq__(self, theOtherOne):
                 return True
         else:
             return False
+
+    def __repr__(self):
+        return f'{self.velocity=} {self.weight=} {self.width=} {self.height=}'
+

test/TestBase.py

@@ -14,6 +14,8 @@ class TestBase(TestCase):
     A base unit test class to initialize some logging stuff we need
     """
 
+    RESOURCES_PACKAGE_NAME: str = 'test.testresources'
+
     @classmethod
     def setUpLogging(cls):
         """"""

test/TestReferences.py

@@ -69,17 +69,16 @@ def testBadBItemRefInsertion(self):
         #
         try:
             velocityControl.set_value(500)
-            self.assertTrue(velocityControl.get_value() == vehicleList[TEST_ITEM_INDEX].velocity,
-                            "Control did not update reference")
+            self.assertTrue(velocityControl.get_value() == vehicleList[TEST_ITEM_INDEX].velocity, "Control did not update reference")
         except ItemRefInsertionException as e:
-            self.logger.error("%s", e.message)
+            self.logger.error(f"{e.message}")
 
     def testBasicItemRefRetrieval(self):
 
         vehicleList = self.getVehicleList()
 
         itemRef = ItemRef(base=vehicleList, index=TEST_ITEM_INDEX)
-        self.logger.info("Created %s", itemRef)
+        self.logger.info(f"Created {itemRef=}")
 
         velocityControl: DummyControl = DummyControl(ref=itemRef)
         self.logger.info("Created velocity control %s", velocityControl)

test/TestResourceUtility.py

@@ -1,24 +1,21 @@
 
 import os
 
-from os import sep as osSep
-from os import path as osPath
-from os import getcwd
-from os import chdir
-
 from logging import Logger
 from logging import getLogger
 
 from unittest import main as unitTestMain
 from unittest import expectedFailure
 
+from pkg_resources import resource_filename
+
 from test.TestBase import TestBase
 
 from albow.core.ResourceUtility import ResourceUtility
 
 UNIT_TEST_DIR_NAME:       str = 'test'
 RESOURCE_DIR_NAME:        str = 'testresources'
-TEST_SOUND_RELATIVE_PATH: str = f'{RESOURCE_DIR_NAME}{osSep}TestSound.mp3'
+TEST_SOUND_RELATIVE_PATH: str = f'TestSound.mp3'
 
 
 class TestResourceUtility(TestBase):
@@ -58,17 +55,17 @@ def testLoadSound(self):
         import pygame
         pygame.init()
 
-        self._findTestResourceDirectory()
+        fqFileName: str = self.getFullResourcePath(TEST_SOUND_RELATIVE_PATH)
 
-        dummySound = ResourceUtility.load_sound(TEST_SOUND_RELATIVE_PATH)
+        dummySound = ResourceUtility.load_sound(fqFileName)
         self.logger.info(f"{dummySound}")
 
     def testLoadSoundFail(self):
 
-        self._findTestResourceDirectory()
+        fqFileName: str = self.getFullResourcePath(TEST_SOUND_RELATIVE_PATH)
 
         ResourceUtility.sound_cache = None
-        dummySound = ResourceUtility.load_sound(TEST_SOUND_RELATIVE_PATH)
+        dummySound = ResourceUtility.load_sound(fqFileName)
 
         self.assertEqual(first=ResourceUtility.dummy_sound, second=dummySound, msg="Did not get the dummy sound")
 
@@ -77,16 +74,11 @@ def testGetImageFail(self):
 
         ResourceUtility.get_image("")
 
-    def _findTestResourceDirectory(self):
+    def getFullResourcePath(self, filename: str) -> str:
+
+        fqFileName:str = resource_filename(TestBase.RESOURCES_PACKAGE_NAME, filename)
 
-        self.logger.info(f'current directory: {getcwd()}')
-        if osPath.isdir(f'{UNIT_TEST_DIR_NAME}{osSep}{RESOURCE_DIR_NAME}'):
-            chdir(f'{UNIT_TEST_DIR_NAME}')
-        if osPath.isdir(RESOURCE_DIR_NAME):
-            return
-        else:
-            chdir("../")
-            return self._findTestResourceDirectory()
+        return fqFileName
 
 
 if __name__ == '__main__':