Skip to content

Commit 252e856

Browse files
committed
split module version test into it's own file
1 parent 4cabc33 commit 252e856

File tree

3 files changed

+45
-18
lines changed

3 files changed

+45
-18
lines changed

test/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DB_OBJECTS_TEST_GROUPS=garmin_db_objects
1212
FILE_PARSE_TEST_GROUPS=fit_file tcx_loop tcx_file profile_file
1313
ALL_TEST_GROUPS=$(DB_TEST_GROUPS) $(DB_OBJECTS_TEST_GROUPS) $(FILE_PARSE_TEST_GROUPS)
1414
MANUAL_TEST_GROUPS=copy
15-
BASE_TESTGROUP=config
15+
BASE_TESTGROUP=config module_versions
1616
TEST_GROUPS=$(DB_TEST_GROUPS) $(DB_OBJECTS_TEST_GROUPS) $(FILE_PARSE_TEST_GROUPS) $(MANUAL_TEST_GROUPS) $(BASE_TESTGROUP)
1717

1818
#
@@ -28,7 +28,7 @@ file_parse: $(FILE_PARSE_TEST_GROUPS)
2828

2929
db_objects: $(DB_OBJECTS_TEST_GROUPS)
3030

31-
verify_commit: test_config.TestConfig.test_versions db_objects
31+
verify_commit: module_versions db_objects
3232

3333
clean:
3434
rm -f *.pyc

test/test_config.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
import sys
1111

1212
from garmindb import GarminConnectConfigManager
13-
import fitfile
14-
import idbutils
15-
import tcxfile
16-
17-
sys.path.append('..')
18-
from fitfile import version_string as fit_version_string
19-
from idbutils import version_string as utilities_version_string
20-
from tcxfile import version_string as tcx_version_string
2113

2214

2315
root_logger = logging.getLogger()
@@ -36,14 +28,6 @@ def setUpClass(cls):
3628
cls.gc_config = GarminConnectConfigManager()
3729
cls.homedir = os.path.expanduser('~')
3830

39-
def test_versions(self):
40-
print(f"fitfile version {fitfile.__version__}")
41-
self.assertEqual(fitfile.__version__, fit_version_string(), f'Fit version actual {fitfile.__version__} expected {fit_version_string()}')
42-
print(f"idbutils version {idbutils.__version__}")
43-
self.assertEqual(idbutils.__version__, utilities_version_string(), f'Utilities version actual {idbutils.__version__} expected {utilities_version_string()}')
44-
print(f"tcxfile version {tcxfile.__version__}")
45-
self.assertEqual(tcxfile.__version__, tcx_version_string(), f'Tcx version actual {tcxfile.__version__} expected {tcx_version_string()}')
46-
4731
def test_directories(self):
4832
# config_dir
4933
expected_config_dir = self.homedir + os.sep + '.GarminDb'

test/test_module_versions.py

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
"""Test config handling."""
2+
3+
__author__ = "Tom Goetz"
4+
__copyright__ = "Copyright Tom Goetz"
5+
__license__ = "GPL"
6+
7+
import os
8+
import unittest
9+
import logging
10+
import sys
11+
12+
import fitfile
13+
import idbutils
14+
import tcxfile
15+
16+
sys.path.append('..')
17+
from fitfile import version_string as fit_version_string
18+
from idbutils import version_string as utilities_version_string
19+
from tcxfile import version_string as tcx_version_string
20+
21+
22+
root_logger = logging.getLogger()
23+
handler = logging.FileHandler('copy.log', 'w')
24+
root_logger.addHandler(handler)
25+
root_logger.setLevel(logging.INFO)
26+
27+
logger = logging.getLogger(__name__)
28+
29+
30+
class TestModuleVersions(unittest.TestCase):
31+
"""Class for testing imported module versions match the source tree."""
32+
33+
def test_versions(self):
34+
print(f"fitfile version {fitfile.__version__}")
35+
self.assertEqual(fitfile.__version__, fit_version_string(), f'Fit version actual {fitfile.__version__} expected {fit_version_string()}')
36+
print(f"idbutils version {idbutils.__version__}")
37+
self.assertEqual(idbutils.__version__, utilities_version_string(), f'Utilities version actual {idbutils.__version__} expected {utilities_version_string()}')
38+
print(f"tcxfile version {tcxfile.__version__}")
39+
self.assertEqual(tcxfile.__version__, tcx_version_string(), f'Tcx version actual {tcxfile.__version__} expected {tcx_version_string()}')
40+
41+
42+
if __name__ == '__main__':
43+
unittest.main(verbosity=2)

0 commit comments

Comments
 (0)