Skip to content

Commit 9ae09ac

Browse files
committed
Add back commented out test that I had to fix. Fixed so it "kind of" does not care if it is run from a script, the command line, or from inside of Pycharm
#60
1 parent 0e9422f commit 9ae09ac

File tree

3 files changed

+39
-9
lines changed

3 files changed

+39
-9
lines changed

test/RunTests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def main():
2222
suite.addTest(testLoader.loadTestsFromTestCase(TestFindResources))
2323
suite.addTest(testLoader.loadTestsFromTestCase(TestPredictor))
2424
suite.addTest(testLoader.loadTestsFromTestCase(TestReferences))
25-
# suite.addTest(testLoader.loadTestsFromTestCase(TestResourceUtility))
25+
suite.addTest(testLoader.loadTestsFromTestCase(TestResourceUtility))
2626
suite.addTest(testLoader.loadTestsFromTestCase(TestScheduledCall))
2727
suite.addTest(testLoader.loadTestsFromTestCase(TestTheme))
2828
suite.addTest(testLoader.loadTestsFromTestCase(TestThemeProperty))

test/TestResourceUtility.py

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11

22
import os
33

4-
import logging
4+
from os import sep as osSep
5+
from os import path as osPath
6+
from os import getcwd
7+
from os import chdir
8+
59
from logging import Logger
10+
from logging import getLogger
611

7-
import unittest
12+
from unittest import main as unitTestMain
13+
from unittest import expectedFailure
814

915
from test.TestBase import TestBase
1016

1117
from albow.core.ResourceUtility import ResourceUtility
1218

13-
TEST_SOUND_RELATIVE_PATH = "testresources/TestSound.mp3"
19+
UNIT_TEST_DIR_NAME: str = 'test'
20+
RESOURCE_DIR_NAME: str = 'testresources'
21+
TEST_SOUND_RELATIVE_PATH: str = f'{RESOURCE_DIR_NAME}{osSep}TestSound.mp3'
1422

1523

1624
class TestResourceUtility(TestBase):
@@ -24,10 +32,10 @@ def setUpClass(cls):
2432

2533
def setUp(self):
2634
""""""
27-
TestResourceUtility.ourLogger = logging.getLogger(__name__)
35+
TestResourceUtility.ourLogger = getLogger(__name__)
2836
self.logger = TestResourceUtility.ourLogger
2937

30-
@unittest.expectedFailure
38+
@expectedFailure
3139
def testFindResourceDirFailure(self):
3240
ResourceUtility.find_resource_dir()
3341

@@ -50,21 +58,36 @@ def testLoadSound(self):
5058
import pygame
5159
pygame.init()
5260

53-
dummySound = ResourceUtility.load_sound("%s" % TEST_SOUND_RELATIVE_PATH)
61+
self._findTestResourceDirectory()
62+
63+
dummySound = ResourceUtility.load_sound(TEST_SOUND_RELATIVE_PATH)
5464
self.logger.info(f"{dummySound}")
5565

5666
def testLoadSoundFail(self):
5767

68+
self._findTestResourceDirectory()
69+
5870
ResourceUtility.sound_cache = None
5971
dummySound = ResourceUtility.load_sound(TEST_SOUND_RELATIVE_PATH)
6072

6173
self.assertEqual(first=ResourceUtility.dummy_sound, second=dummySound, msg="Did not get the dummy sound")
6274

63-
@unittest.expectedFailure
75+
@expectedFailure
6476
def testGetImageFail(self):
6577

6678
ResourceUtility.get_image("")
6779

80+
def _findTestResourceDirectory(self):
81+
82+
self.logger.info(f'current directory: {getcwd()}')
83+
if osPath.isdir(f'{UNIT_TEST_DIR_NAME}{osSep}{RESOURCE_DIR_NAME}'):
84+
chdir(f'{UNIT_TEST_DIR_NAME}')
85+
if osPath.isdir(RESOURCE_DIR_NAME):
86+
return
87+
else:
88+
chdir("../")
89+
return self._findTestResourceDirectory()
90+
6891

6992
if __name__ == '__main__':
70-
unittest.main()
93+
unitTestMain()

test/testLoggingConfig.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@
3737
"consoleHandler"
3838
],
3939
"propagate": "False"
40+
},
41+
"TestResourceUtility": {
42+
"level": "INFO",
43+
"handlers": [
44+
"consoleHandler"
45+
],
46+
"propagate": "False"
4047
}
4148
}
4249
}

0 commit comments

Comments
 (0)