Skip to content

Commit

Permalink
Fixed some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@coordt
coordt committed Jan 6, 2024
1 parent 0ac2cd8 commit 593a4ee
Show file tree
Hide file tree
Showing 4 changed files with 137 additions and 285 deletions.
4 changes: 2 additions & 2 deletions bumpversion/versioning/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class VersionComponentConfig(BaseModel):
# source: Optional[str] = None # Name of environment variable or context variable to use as the source for value
depends_on: Optional[str] = None # The name of the component this component depends on

def generate_component(self, value: Union[str, int, None] = None) -> VersionComponent:
def create_component(self, value: Union[str, int, None] = None) -> VersionComponent:
"""Generate a version component from the configuration."""
return VersionComponent(
values=self.values,
Expand Down Expand Up @@ -147,7 +147,7 @@ def __init__(self, components: Dict[str, VersionComponentConfig], order: Optiona
def create_version(self, values: Dict[str, str]) -> "Version":
"""Generate a version from the given values."""
components = {
key: comp_config.generate_component(value=values.get(key))
key: comp_config.create_component(value=values.get(key))
for key, comp_config in self.component_configs.items()
}
return Version(version_spec=self, components=components)
Expand Down
213 changes: 0 additions & 213 deletions tests/test_version_part.py
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import logging
from pathlib import Path

import pytest
from click import UsageError
from pytest import LogCaptureFixture, param

from bumpversion import exceptions
from bumpversion.utils import get_context
Expand Down Expand Up @@ -76,153 +74,6 @@ def test_serialize_with_environment_var():
del os.environ["BUILD_NUMBER"]


def test_serialize_with_newlines():
overrides = {
"current_version": "MAJOR=31\nMINOR=0\nPATCH=3\n",
"parse": r"MAJOR=(?P<major>\d+)\nMINOR=(?P<minor>\d+)\nPATCH=(?P<patch>\d+)\n",
"serialize": ["MAJOR={major}\nMINOR={minor}\nPATCH={patch}\n"],
}
conf, version_config, current_version = get_config_data(overrides)
new_version = current_version.bump("major")
assert version_config.serialize(new_version, get_context(conf)) == "MAJOR=32\nMINOR=0\nPATCH=0\n"


@pytest.mark.parametrize(
["bump_type", "expected"],
[
param("patch", "0.9.1", id="patch"),
param("minor", "0.10", id="minor"),
param("major", "1", id="major"),
],
)
def test_serialize_three_part(bump_type: str, expected: str):
overrides = {
"current_version": "0.9",
"parse": r"(?P<major>\d+)(\.(?P<minor>\d+)(\.(?P<patch>\d+))?)?",
"serialize": ["{major}.{minor}.{patch}", "{major}.{minor}", "{major}"],
}
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump(bump_type)
assert version_config.serialize(new_version, get_context(conf)) == expected


@pytest.mark.parametrize(
["initial", "bump_type", "expected"],
[
param("1.5.dev", "release", "1.5", id="release"),
param("1.5", "minor", "1.6.dev", id="minor"),
],
)
def test_bump_non_numeric_parts(initial: str, bump_type: str, expected: str):
overrides = {
"current_version": initial,
"parse": r"(?P<major>\d+)\.(?P<minor>\d+)(\.(?P<release>[a-z]+))?",
"serialize": ["{major}.{minor}.{release}", "{major}.{minor}"],
"parts": {
"release": {
"optional_value": "gamma",
"values": ["dev", "gamma"],
},
},
}
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump(bump_type)
assert version_config.serialize(new_version, get_context(conf)) == expected


@pytest.mark.parametrize(
["initial", "bump_type", "expected"],
[
param("1.alpha", "release", "1.beta", id="alpha-to-beta-release"),
param("1.beta", "release", "1", id="beta-to-release"),
],
)
def test_optional_value(initial: str, bump_type: str, expected: str):
overrides = {
"current_version": initial,
"parse": r"(?P<num>\d+)(\.(?P<release>.*))?(\.)?",
"serialize": ["{num}.{release}", "{num}"],
"parts": {
"release": {
"optional_value": "gamma",
"values": ["alpha", "beta", "gamma"],
},
},
}
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump(bump_type)
assert version_config.serialize(new_version, get_context(conf)) == expected


@pytest.mark.parametrize(
["initial", "bump_type", "expected"],
[
param("1.0a", "prerel", "1.0b", id="a-to-b-release"),
param("1.0b", "prerelversion", "1.0b1", id="prerelease-version"),
param("1.0b1", "prerelversion", "1.0b2", id="prerelease-version2"),
param("1.0b2", "prerel", "1.0c", id="b2-to-c-release"),
param("1.0c", "prerel", "1.0rc", id="c-to-rc-release"),
param("1.0rc", "prerel", "1.0", id="rc-to-d-release"),
param("1.0", "minor", "1.1dev", id="minor-release"),
param("1.1dev", "prerel", "1.1a", id="dev-to-a-release"),
],
)
def test_python_pre_release_release_post_release(initial: str, bump_type: str, expected: str):
# adapted from http://legacy.python.org/dev/peps/pep-0386/#the-new-versioning-algorithm
overrides = {
"current_version": initial,
"parse": r"""^
(?P<major>\d+)\.(?P<minor>\d+) # minimum 'N.N'
(?:
(?P<prerel>[abc]|rc|dev) # 'a' = alpha, 'b' = beta
# 'c' or 'rc' = release candidate
(?:
(?P<prerelversion>\d+(?:\.\d+)*)
)?
)?
(?P<postdev>(\.post(?P<post>\d+))?(\.dev(?P<dev>\d+))?)?""",
"serialize": [
"{major}.{minor}{prerel}{prerelversion}",
"{major}.{minor}{prerel}",
"{major}.{minor}",
],
"parts": {
"prerel": {
"optional_value": "d",
"values": ["dev", "a", "b", "c", "rc", "d"],
},
},
}
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump(bump_type)
assert version_config.serialize(new_version, get_context(conf)) == expected


@pytest.mark.parametrize(
["initial", "bump_type", "expected"],
[
param("0.9.4", "major", "1.1.0", id="first-value-1"),
],
)
def test_part_first_value(initial: str, bump_type: str, expected: str):
overrides = {
"current_version": initial,
"parts": {
"minor": {
"first_value": "1",
},
},
}
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump(bump_type)
assert version_config.serialize(new_version, get_context(conf)) == expected


def test_version_part_invalid_regex_exit(tmp_path: Path) -> None:
"""A version part with an invalid regex should raise an exception."""
# Arrange
Expand All @@ -233,67 +84,3 @@ def test_version_part_invalid_regex_exit(tmp_path: Path) -> None:
with inside_dir(tmp_path):
with pytest.raises(UsageError):
get_config_data(overrides)


def test_part_does_not_revert_to_zero_if_optional(tmp_path: Path) -> None:
"""A non-numeric part with the optional value should not revert to zero."""
# From https://github.com/c4urself/bump2version/issues/248
# Arrange
overrides = {
"current_version": "0.3.1",
"parse": r"(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>\D+)(?P<build>\d*))?",
"serialize": [
"{major}.{minor}.{patch}{release}{build}",
"{major}.{minor}.{patch}{release}",
"{major}.{minor}.{patch}",
],
"parts": {
"release": {
"optional_value": "g",
"first_value": "g",
"values": [
"dev",
"a",
"b",
"g",
],
},
},
}
with inside_dir(tmp_path):
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump("build")
assert version_config.serialize(new_version, get_context(conf)) == "0.3.1g1"


def test_order_of_serialization(tmp_path: Path, caplog: LogCaptureFixture) -> None:
"""The order of serialization should be as specified in the config."""
caplog.set_level(logging.DEBUG)
overrides = {
"current_version": "3.16.dev1",
"parse": r"(?P<major>\d+)\.(?P<minor>\d+)\.(?P<release>[a-z]+)?(?P<patch>\d+)?",
"serialize": [
"{major}.{minor}.{release}{patch}",
"{major}.{minor}.{release}",
"{major}.{minor}.{patch}",
],
"parts": {
"release": {
"optional_value": "prod",
"first_value": "dev",
"values": [
"dev",
"prod",
],
},
},
}
with inside_dir(tmp_path):
conf, version_config, current_version = get_config_data(overrides)

new_version = current_version.bump("release")
new_version_str = version_config.serialize(new_version, get_context(conf))
for msg in caplog.messages:
print(msg)
assert new_version_str == "3.16.prod"
34 changes: 16 additions & 18 deletions tests/test_versioning/test_models_versioncomponent.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,59 @@

@pytest.fixture(
params=[
None,
("0", "1", "2"),
("0", "3"),
{"optional_value": "0", "first_value": "0"},
{"first_value": "1"},
{"values": ["alpha", "beta", "gamma"]},
{"values": ["alpha", "gamma"]},
]
)
def version_component_config(request):
"""Return a three-part and a two-part version part configuration."""
if request.param is None:
return VersionComponentConfig(optional_value="0", first_value="0")
else:
return VersionComponentConfig(values=request.param)
return VersionComponentConfig(**request.param)


class TestVersionComponent:
class TestCreation:
def test_none_value_uses_optional_value(self, version_component_config):
vp = version_component_config.generate_component()
vp = version_component_config.create_component()
assert vp.value == vp.func.optional_value
assert vp._value is None

def test_config_with_values_selects_values_function(self):
values = ["0", "1", "2"]
vp = VersionComponentConfig(values=values).generate_component()
vp = VersionComponentConfig(values=values).create_component()
assert isinstance(vp.func, ValuesFunction)

def test_config_without_values_selects_numeric_function(self):
vp = VersionComponentConfig().generate_component()
vp = VersionComponentConfig().create_component()
assert isinstance(vp.func, NumericFunction)

def test_copy_returns_new_version_part(self, version_component_config):
vp = version_component_config.generate_component(version_component_config.first_value)
vp = version_component_config.create_component(version_component_config.first_value)
vc = vp.copy()
assert vp.value == vc.value
assert id(vp) != id(vc)

def test_bump_increments_value(self, version_component_config):
vp = version_component_config.generate_component(version_component_config.first_value)
vp = version_component_config.create_component(version_component_config.first_value)
vc = vp.bump()
if version_component_config.values:
assert vc.value == str(version_component_config.values[1])
else:
assert vc.value == "1"
assert vc.value == str(int(version_component_config.first_value) + 1)

def test_non_first_value_is_not_optional(self, version_component_config):
assert not version_component_config.generate_component(version_component_config.first_value).bump().is_optional
assert not version_component_config.create_component(version_component_config.first_value).bump().is_optional

def test_first_value_is_optional(self, version_component_config):
assert version_component_config.generate_component(version_component_config.first_value).is_optional
assert version_component_config.create_component(version_component_config.first_value).is_optional

def test_versionparts_with_same_settings_are_equal(self, version_component_config):
version1 = version_component_config.generate_component(version_component_config.first_value)
version2 = version_component_config.generate_component(version_component_config.first_value)
version1 = version_component_config.create_component(version_component_config.first_value)
version2 = version_component_config.create_component(version_component_config.first_value)
assert version1 == version2

def test_null_resets_value_to_first_value(self, version_component_config):
version1 = version_component_config.generate_component(version_component_config.first_value)
version1 = version_component_config.create_component(version_component_config.first_value)
version2 = version1.bump().null()
assert version2 == version1
Loading

0 comments on commit 593a4ee

Please sign in to comment.