diff --git a/tests/test_common.py b/tests/test_common.py index 0bf8f61..6fadc9d 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -7,6 +7,7 @@ from pandas.testing import assert_frame_equal import camelot from camelot.core import Table, TableList +from camelot.__version__ import generate_version from .data import * @@ -298,3 +299,18 @@ def test_table_order(): (1, 2), (1, 1), ] + + +def test_version_generation(): + version = (0, 7, 3) + assert generate_version(version, prerelease=None, revision=None) == "0.7.3" + + +def test_version_generation_with_prerelease_revision(): + version = (0, 7, 3) + prerelease = "alpha" + revision = 2 + assert ( + generate_version(version, prerelease=prerelease, revision=revision) + == "0.7.3-alpha.2" + ) diff --git a/tests/test_config.py b/tests/test_config.py deleted file mode 100644 index 71e2ccc..0000000 --- a/tests/test_config.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- - -import pytest - -from camelot.__version__ import generate_version - -def test_version_generation(): - version = (0, 7, 3) - assert generate_version(version, prerelease=None, revision=None) == '0.7.3' - -def test_version_generation_with_prerelease_revision(): - version = (0, 7, 3) - prerelease = 'alpha' - revision = 2 - assert generate_version(version, prerelease=prerelease, revision=revision) == '0.7.3-alpha.2' \ No newline at end of file