Merge remote-tracking branch 'origin/sub_laptop_6' into main_laptop_1

This commit is contained in:
2026-10-01 20:03:32 +09:00
3 changed files with 30 additions and 22 deletions
+3 -6
View File
@@ -337,18 +337,15 @@ def _run(lg: dict, master, examples: dict | None = None) -> dict:
def test_값_메쌓기_value_는_calc_와_같음(master) -> None:
from M01_MasterData.LogicBuilder import M01_LB_Calc as lb
from M01_MasterData import M01_MasterData_Store as store
_, files = master
rows = {r["키"]: r for d in files.values() if d.get("그룹") == "로직" for r in d["줄"]}
raw = lambda k: json.loads(json.dumps(rows[k], default=_plain)) # noqa: E731
given = {v["name"]: v["example"] for v in SAMPLES["masonry"]["boxes"][0]["input"]["variables"]}
want = lb.calc(raw("GF000219"), {**given, "초과증가율": 80}, {})
want = store.calc("GF000219", {**given, "초과증가율": 80})
assert abs(_run(SAMPLES["masonry"], master)["노무비"] - float(want["sums"]["계"])) < 1
given = {v["name"]: v["example"] for v in SAMPLES["value"]["boxes"][0]["input"]["variables"]}
given["qt"] = given.pop("q")
assert _run(SAMPLES["value"], master)["시간당 작업량"] == float(
lb.calc(raw("GF000133"), given, {})["result"]
store.calc("GF000133", given)["result"]
)
+12
View File
@@ -143,3 +143,15 @@ def test_standardsList_목록() -> None:
(1, 0, "버림"),
(0.1, 1, "버림"),
]
def test_서버_표준_답이_처음_값과_같음() -> None:
"""서버(`M02_DF_Values.standards`) 답 = `_standard` 처음 값 · 그 답으로 만든 목록 = 번들 처음 값 목록"""
from M02_MasterTemplete.DataFlow import M02_DF_Values as dv
mine = STD.parent / "_data" / "시험-없는-폴더" # 만들지 않음 — 고친 것 없음 → 처음 값
assert not mine.exists()
got = dv.standards(STD, mine)
assert got == {"unit": UNIT, "money": MONEY, "saved": False}
server = _node(f"out(S.standardsList({json.dumps(got, ensure_ascii=False)}));")
assert server == _node("out(S.standardsList());")