diff --git a/resources/tester/test_714_1_sheet_line.py b/resources/tester/test_714_1_sheet_line.py deleted file mode 100644 index 66b6195d3..000000000 --- a/resources/tester/test_714_1_sheet_line.py +++ /dev/null @@ -1,60 +0,0 @@ -"""714-1 지킴 — 계산서 줄 덧칸(쓰는 입력 · 묶음 · 기준단위 · 환산 근거) — M01 `/text`. -(M02 `/logic-lib/sheet` 는 855-C 부터 문서 셈 · `master_doc_text` 글 — `test_855_c4_doc_text`.)""" - -from __future__ import annotations - -import sys -from pathlib import Path - -ROOT = Path(__file__).resolve().parents[2] -sys.path.insert(0, str(ROOT)) - -import helper_855_old_engine_routes as sheet # noqa: E402 — 옛 `/text` 몸(855 2-E1 · 시험 전용) - -msl = sheet.msl - - -def _text(key: str) -> dict: - auto = {k: v for k, v in sheet.auto(key)["값"].items() if v is not None} - return sheet.text(key, auto) - - -def _lines(got: dict, groups: str = "groups") -> list[dict]: - return [line for g in got[groups] for line in g["줄"]] - - -def test_line_keys_and_bundle(): - got = _text("GF000103") # 구조물터파기 — 인력 + 굴착기 기계경비 줄 - assert got["ok"] and got["기준단위"] == "㎥" - lines = _lines(got) - assert all({"쓰는입력", "묶음", "기준단위", "환산근거"} <= set(line) for line in lines) - machine = [line for line in lines if line.get("장비")] - assert machine and all(line["묶음"] == "경비" for line in machine) - assert {"지역", "보정작업"} <= set(machine[0]["쓰는입력"]) - assert any(line["묶음"] == "인력" for line in lines) - - -def test_machine_spread(): - """714-1b — 장비 줄 「펼침」 = 부른 기계경비 로직 계산서(조종원 · 연료 · 손료) · 시간당 계.""" - lines = _lines(_text("GF000103")) - spread = next(line for line in lines if line.get("장비"))["펼침"] - assert spread["키"].startswith("GC0002") and spread["단위"] == "시간" - names = " ".join(one["이름"] for one in spread["줄"]) - assert "조종원" in names and "손료" in names - sums = [v for v in spread["소계"].values() if v is not None] - assert spread["계"] == sum(sums) and spread["계"] > 0 - assert not any(line.get("펼침") for line in lines if not line.get("장비")) - - -def test_uses_follow_middle_values(): - """중간값을 거슬러 입력까지 — 돌쌓기 석공 품은 높이 · 쌓기 · 돌 입력을 씀.""" - lines = _lines(_text("GF000219")) - assert {"높이", "쌓기", "돌"} <= set(lines[0]["쓰는입력"]) - - -def test_basis_note_tenfold(): - """표 10㎡당 → 결과 원/㎡ 「÷10」 · 결과도 원/10㎡ 면 근거 없음.""" - one = _lines(_text("GC000037")) - assert one[0]["기준단위"] == "10㎡" and one[0]["환산근거"] == "10㎡당 → 1㎡당 ÷10" - ten = _text("GF000124") - assert ten["기준단위"] == "10㎡" and all(not x["환산근거"] for x in _lines(ten)) diff --git a/resources/tester/test_751_3_money_cut.py b/resources/tester/test_751_3_money_cut.py index 9dd6b1f68..b0770703b 100644 --- a/resources/tester/test_751_3_money_cut.py +++ b/resources/tester/test_751_3_money_cut.py @@ -1,18 +1,22 @@ """751-3 셈 끝수 = 품셈 1-2-2(줄 0.1 원 · 소계 1 원 미만버림) — `master_cut` 지킴 시험. -M01 시험 계산 · 읽는 식 · M02 단가산출(SK) · 일위대가 반영이 B09 끝수(`rounddown`)와 같은 값 · -줄 합 = 소계(비목마다 ROUNDDOWN(Σ 줄, 0)) · B09 는 엔진 날 값(`raw`)을 받아 제 단가로 다시 버림. +M01 문서 셈 · 계산서 글(`master_doc_text.sheet_groups`) · M02 단가산출(SK) · 일위대가 반영이 B09 +끝수(`rounddown`)와 같은 값 · 줄 합 = 소계(비목마다 ROUNDDOWN(Σ 줄, 0)). +(옛 M01 `/calc` · `/text` 엔진 대조는 855-E 2-E4 에서 문서 셈으로 바꿈.) """ +import importlib from decimal import Decimal +import helper_855_engine as h + from M01_MasterData import M01_MasterData_Store as m01 -import helper_855_old_engine_routes as old_engine # noqa: E402 — 옛 셈 몸(855 2-E1 · 시험 전용) from M02_MasterTemplete import M02_Labor_Doc as labor from M02_MasterTemplete import M02_Sangeun_Calc as calc from M02_MasterTemplete import M02_Sangeun_Doc as sd -mcut, mf = labor.mcut, labor.mf # scripts 길은 `m01` 이 둠 +mcut = importlib.import_module("master_cut") # scripts 길은 `m01` 이 둠 +mdt = importlib.import_module("master_doc_text") KEY = "GC000211" # 합판거푸집(테스트1 바탕) — 인력 · 재료 · % 덧줄 둘 COSTS = ("노무비", "재료비", "경비") @@ -40,12 +44,11 @@ def test_화면_넷_같은_값_SK_시험계산_읽는식(): {"키": "SK-000000", "이름": "끝수", "단위": "㎡", "바탕": {"로직": KEY}}, None, whole ) sk = calc.run(doc, whole)["기준"] - auto = {k: v for k, v in (old_engine.auto(KEY)["값"] or {}).items() if v is not None} - m1 = old_engine.calc(KEY, auto) - text = old_engine.text(KEY, auto) - assert float(sk["계"]) == m1["sums"]["계"] == float(text["계"]) - assert {g["비목"]: float(g["소계"]) for g in text["groups"]} == {k: float(sk[k]) for k in COSTS} - line = next(x for g in text["groups"] for x in g["줄"] if x["이름"].startswith("형틀")) + m1 = h.calc(KEY) + groups = mdt.sheet_groups(h.world()[1][KEY], m1, h.world()[2]) + assert float(sk["계"]) == float(m1["계"]) + assert {g["비목"]: float(g["소계"]) for g in groups} == {k: float(sk[k]) for k in COSTS} + line = next(x for g in groups for x in g["줄"] if x["이름"].startswith("형틀")) assert line["글"].endswith(" = " + _line_text(line["금액"])) and line["글"].endswith(".9")