удаления еще раз

This commit is contained in:
2026-08-20 16:08:17 +03:00
parent 7d4f25991c
commit 9429659c14
7 changed files with 86 additions and 24 deletions

View File

@@ -62,5 +62,5 @@ def test_coincidental_penalties_do_not_fill_side_powerplay_labels():
value = HockeyDataService._strength_payload(settings, stage="regular", current_period="1", timer_state=timer_state, language="ru")
assert value["advantage_side"] == ""
assert value["state_key"] == "4x4"
assert value["home_label"] == "Удаление"
assert value["away_label"] == "Удаление"
assert value["home_label"] == "4 на 4"
assert value["away_label"] == "4 на 4"

View File

@@ -32,7 +32,7 @@ def test_complex_two_vs_one_keeps_real_strength_and_outputs_caption_on_advantage
)
assert value["strength_label"] == "3×4"
assert value["advantage_side"] == "away"
assert value["home_label"] == "Удаление"
assert value["home_label"] == "4 на 3"
assert value["away_label"] == "Играют в большинстве"
@@ -50,7 +50,7 @@ def test_single_remaining_penalty_outputs_pp_caption_on_opposite_team():
language="ru",
)
assert value["advantage_side"] == "away"
assert value["home_label"] == "Удаление"
assert value["home_label"] == "5 на 4"
assert value["away_label"] == "Играют в большинстве"

View File

@@ -32,8 +32,8 @@ def test_equal_coincidental_penalties_have_no_side_caption():
)
assert payload["strength_label"] == "4×4"
assert payload["advantage_side"] == ""
assert payload["home_label"] == "Удаление"
assert payload["away_label"] == "Удаление"
assert payload["home_label"] == "4 на 4"
assert payload["away_label"] == "4 на 4"
def test_two_vs_one_penalties_caption_only_advantage_team():
@@ -55,7 +55,7 @@ def test_two_vs_one_penalties_caption_only_advantage_team():
)
assert payload["strength_label"] == "3×4"
assert payload["advantage_side"] == "away"
assert payload["home_label"] == "Удаление"
assert payload["home_label"] == "4 на 3"
assert payload["away_label"] == "Играют в большинстве"

View File

@@ -54,7 +54,7 @@ def test_runtime_badge_is_server_build_version_placeholder():
assert "BUILD __UI_BUILDER_BUILD_VERSION__" in INDEX
assert '.replace("__UI_BUILDER_BUILD_VERSION__", str(build_version or asset_version))' in INTEGRATION
assert "build_version=BUILD_VERSION" in APP
assert 'BUILD_VERSION = "2026.08.20.12"' in APP
assert 'BUILD_VERSION = "2026.08.20.13"' in APP
def test_play_by_play_defaults_collapsed_until_operator_opens_it():
@@ -62,20 +62,20 @@ def test_play_by_play_defaults_collapsed_until_operator_opens_it():
assert ": true;" in APP_JS
def test_penalized_side_gets_penalty_caption_and_advantage_side_keeps_pp_caption():
def test_penalized_side_gets_numeric_condition_and_advantage_side_keeps_pp_caption():
payload = _strength(home=1, away=0)
assert payload["home_label"] == "Удаление"
assert payload["home_label"] == "5 на 4"
assert payload["away_label"] == "Играют в большинстве"
def test_equal_coincidental_penalties_expose_penalty_caption_on_both_mapping_sides():
def test_equal_coincidental_penalties_expose_numeric_condition_on_both_mapping_sides():
payload = _strength(home=1, away=1)
assert payload["advantage_side"] == ""
assert payload["home_label"] == "Удаление"
assert payload["away_label"] == "Удаление"
assert payload["home_label"] == "4 на 4"
assert payload["away_label"] == "4 на 4"
def test_english_penalty_caption():
def test_english_penalty_side_uses_numeric_condition():
payload = _strength(home=1, away=0, language="en")
assert payload["home_label"] == "Penalty"
assert payload["home_label"] == "5 on 4"
assert payload["away_label"] == "Power play"

View File

@@ -0,0 +1,57 @@
from hockey_data.service import HockeyDataService
def penalty(side):
return {
"side": side,
"infraction": {"id": "minor"},
"preset": "2m",
"durationMs": 120000,
"remainingMs": 120000,
"finished": False,
}
def payload(home, away, labels=None):
settings = {
"strength_regulation_skaters": 5,
"strength_regular_overtime_skaters": 3,
"strength_playoff_overtime_skaters": 5,
"strength_min_skaters": 3,
"strength_state_labels": labels or {
"regulation": {
"5x4": {"ru": "Играют в большинстве"},
"5x3": {"ru": "5 на 3"},
"4x4": {"ru": "4 на 4"},
"4x3": {"ru": "4 на 3"},
}
},
}
timer_state = {"penalty_board": {"penalties": [penalty("home") for _ in range(home)] + [penalty("away") for _ in range(away)]}}
return HockeyDataService._strength_payload(settings, stage="regular", current_period="1", timer_state=timer_state, language="ru")
def test_one_home_penalty_uses_5_on_4_on_penalized_side():
result = payload(1, 0)
assert result["home_label"] == "5 на 4"
assert result["away_label"] == "Играют в большинстве"
def test_two_home_penalties_use_5_on_3_condition():
result = payload(2, 0)
assert result["home_label"] == "5 на 3"
assert result["away_label"] == "5 на 3"
def test_equal_mutual_penalties_use_equal_numeric_condition_on_both_sides():
result = payload(1, 1)
assert result["home_label"] == "4 на 4"
assert result["away_label"] == "4 на 4"
def test_complex_two_vs_one_keeps_majority_caption_and_numeric_penalty_side():
labels = {"regulation": {"4x3": {"ru": "Большинство 4 на 3"}}}
result = payload(2, 1, labels)
assert result["advantage_side"] == "away"
assert result["home_label"] == "4 на 3"
assert result["away_label"] == "Большинство 4 на 3"