diff --git a/resources/tester/helper_855_engine.py b/resources/tester/helper_855_engine.py index 9595012bd..01d48de18 100644 --- a/resources/tester/helper_855_engine.py +++ b/resources/tester/helper_855_engine.py @@ -7,6 +7,7 @@ from __future__ import annotations +import copy import hashlib import importlib import json @@ -29,6 +30,19 @@ def world(): return whole, docs, ml.Links(whole, docs) +def master_files(names: list[str]) -> dict[str, dict]: + """`check_master.load(names)` 꼴 — 옛 로직 파일 이름은 같은 장 수식 문서 줄(M01 문서 관문 + `M01_MasterData_Doc.logic_files` · 로직 JSON 걷은 뒤 855-E L3).""" + import check_master as cm + + from M01_MasterData import M01_MasterData_Doc as doc_store + + logic = doc_store.logic_files() + other = [n for n in names if n not in logic] + loaded = cm.load(other) if other else {} + return {n: copy.deepcopy(logic[n]) if n in logic else loaded[n] for n in names} + + def doc_cases(doc: dict, options: bool) -> list[tuple[str, dict | None]]: """(옵션 글, 새 문서에 넘길 바뀐 입력) — 수식 문서 변수(선택 목록 · 기본값)에서.""" out: list[tuple[str, dict | None]] = [("", None)] diff --git a/resources/tester/test_713_4_source_match.py b/resources/tester/test_713_4_source_match.py index ae78c9f00..8cdaca0dd 100644 --- a/resources/tester/test_713_4_source_match.py +++ b/resources/tester/test_713_4_source_match.py @@ -58,10 +58,12 @@ def test_지운_키는_어디에도_없음() -> None: def test_조종원_시간환산_세_계수() -> None: - rows = _rows(cm.load()) + import helper_855_engine as h + + docs = h.world()[1] # 수식 문서(로직 JSON 걷은 뒤 855-E L3) for key in MACHINE: - text = str(rows[key]["중간"]) - assert "'시간환산'" in text and "상여계수" in text and "휴지계수" in text, key + text = json.dumps(docs[key], ensure_ascii=False, default=str) + assert "시간환산" in text and "상여계수" in text and "휴지계수" in text, key def test_방제_열_여덟_플랜트_한_표() -> None: @@ -73,8 +75,4 @@ def test_방제_열_여덟_플랜트_한_표() -> None: "배관용 탄소강관 KSD3507", "압력배관용 탄소강관 KSD3562 SCH#40", } - whole = cm.mf.Master(files) - passed, stuck, skipped = cm.calc_all(files, whole) - assert not stuck and passed + len(skipped) == sum( - 1 for d in files.values() if d.get("그룹") == "로직" for _ in d["줄"] - ) + # 옛 로직 일괄 시험계산(check_master.calc_all)은 855-E 걷음 — 문서 셈 금액 = test_855_golden diff --git a/resources/tester/test_782_1_carry_127.py b/resources/tester/test_782_1_carry_127.py index 6ded71ee0..9936379c4 100644 --- a/resources/tester/test_782_1_carry_127.py +++ b/resources/tester/test_782_1_carry_127.py @@ -91,9 +91,10 @@ def test_기계설비_벽돌(whole): def test_check_master(): - files, whole = cm.load([COEF, LOGIC]), cm.master() - found = [x for name, data in files.items() for x in cm.check_form(name, data)] - found += cm.check_body(files) + cm.check_logics(files, whole) + files, whole = h.master_files([COEF, LOGIC]), cm.master() # 로직 = 문서 줄 + own = {k: v for k, v in files.items() if not k.startswith("로직_")} # 문서 줄 = check_docs 몫 + found = [x for name, data in own.items() for x in cm.check_form(name, data)] + found += cm.check_body(own) + cm.check_docs(own, whole) assert found == [] keys = {t["키"] for t in files[COEF]["표"] if t["원문번호"] == "1-2-7"} assert keys == {f"CC000{n}" for n in range(341, 349)} diff --git a/resources/tester/test_782_2_common_ch1.py b/resources/tester/test_782_2_common_ch1.py index b64ab3114..8b98cc8e8 100644 --- a/resources/tester/test_782_2_common_ch1.py +++ b/resources/tester/test_782_2_common_ch1.py @@ -26,7 +26,7 @@ def whole(): @pytest.fixture(scope="module") def files(): - return cm.load([COEF, LOGIC]) + return h.master_files([COEF, LOGIC]) # 로직 = 같은 장 수식 문서 줄 def result(whole, key, **given) -> Decimal: @@ -119,8 +119,9 @@ def test_성격(files): def test_check_master(files, whole): - found = [x for name, data in files.items() for x in cm.check_form(name, data)] - found += cm.check_body(files) + cm.check_logics(files, whole) + toc.check_toc(files) + own = {k: v for k, v in files.items() if not k.startswith("로직_")} # 문서 줄 = check_docs 몫 + found = [x for name, data in own.items() for x in cm.check_form(name, data)] + found += cm.check_body(own) + cm.check_docs(own, whole) + toc.check_toc(files) assert found == [] diff --git a/resources/tester/test_782_3_capacity_82.py b/resources/tester/test_782_3_capacity_82.py index 476080455..a361e5d61 100644 --- a/resources/tester/test_782_3_capacity_82.py +++ b/resources/tester/test_782_3_capacity_82.py @@ -227,9 +227,10 @@ def test_아세틸렌(whole): def test_check_master(): - files, whole = cm.load([COEF, LOGIC, LOGIC13, "기계.json"]), cm.master() - found = [x for name, data in files.items() for x in cm.check_form(name, data)] - found += cm.check_body(files) + cm.check_logics(files, whole) + files, whole = h.master_files([COEF, LOGIC, LOGIC13, "기계.json"]), cm.master() + own = {k: v for k, v in files.items() if not k.startswith("로직_")} # 문서 줄 = check_docs 몫 + found = [x for name, data in own.items() for x in cm.check_form(name, data)] + found += cm.check_body(own) + cm.check_docs(own, whole) assert found == [] new = [t["키"] for t in files[COEF]["표"] if "CC000349" <= t["키"] <= "CC000494"] assert len(new) == 146 @@ -240,4 +241,4 @@ def test_check_master(): for name in (LOGIC, LOGIC13): for row in files[name]["줄"]: if "GC001143" <= row["키"] <= "GC001191": - h.calc(row["키"], cm.시험입력(row)) # 시험 입력으로 멈춤 없음 + assert h.calc(row["키"])["셈됨"], row["키"] # 문서 기본 입력으로 멈춤 없음 diff --git a/resources/tester/test_855_l2b_copy_plain.py b/resources/tester/test_855_l2b_copy_plain.py index 8f4a1a1e4..4dd291aca 100644 --- a/resources/tester/test_855_l2b_copy_plain.py +++ b/resources/tester/test_855_l2b_copy_plain.py @@ -8,7 +8,6 @@ from __future__ import annotations import copy -import json from decimal import Decimal from M01_MasterData import M01_MasterData_Store as m01 @@ -43,8 +42,10 @@ def test_옛_저장본_로직줄은_안_읽음(world): sk = _doc(me, _sk(me, 바탕={"로직": PCT})) was = _sum(me, sk) old = copy.deepcopy(sk) # 옛 꼴 — 값 사본에 바탕 로직 줄(값을 틀리게 바꾼 것) - row = json.loads(json.dumps(m01.loaded()[1].logic(PCT), default=str)) - row["호표"] = row["호표"][:1] + row = { # 옛 로직 줄 꼴(로직 JSON 걷은 뒤 855-E L3 — 견본만) + "키": PCT, + "호표": [{"종류": "인력", "요소": "LB000002", "수량": "1", "비목": "노무비"}], + } old["수식"]["로직"] = [*old["수식"]["로직"], row] assert skc.held(old)["로직"] == skc.held(sk)["로직"] assert _sum(me, old) == was