diff --git a/resources/tester/test_627_sheet_sk.py b/resources/tester/test_627_sheet_sk.py index 65bd93327..7b031662e 100644 --- a/resources/tester/test_627_sheet_sk.py +++ b/resources/tester/test_627_sheet_sk.py @@ -3,18 +3,14 @@ 서버 없이 잡음: 탭(역할) 따라 판 바꿈(일위대가표 = 호표 목록 · 단가산출 탭 = 단가산출 목록 · 칸은 처음 한 번만 지음) · 시트 행 → 목록 강조 · 목록 줄 → 지금 탭의 블록 자리 + 개인 층 가져온 식 모달(835-1 · [내 단가산출로] 단추 걷음) · 줄 끝 [가져온 식으로 열기](809-1 · 판정 블록 판 걷음) · -[끝내기] = 막지 않고 물음창 글만 · -화면 = 부품 상자만 · 700 줄. +[끝내기] = 막지 않고 물음창 글만. """ import json import os -import re import subprocess -from pathlib import Path HERE = os.path.dirname(__file__) -M02 = Path(__file__).resolve().parents[2] / "M02_MasterTemplete" def _node(payload: dict) -> dict: @@ -59,7 +55,9 @@ def test_판_바꿈_목록_지음_강조_뛰기(): assert got["opened"] == [{"no": 8, "canWrite": True, "to": "personal"}] * 6 rows = {r["label"]: r for r in got["rows"]} assert rows["단산8 거푸집"]["sub"] == "㎡ · M02_JudgeCalls 1" - assert rows["단산8 거푸집"]["tail"] == [] # 만들 층 = 개인 → [가져온 식으로 열기] 숨김 · 저장 단추 없음 + assert ( + rows["단산8 거푸집"]["tail"] == [] + ) # 만들 층 = 개인 → [가져온 식으로 열기] 숨김 · 저장 단추 없음 assert rows["단산9 잡석"]["sub"] == "㎥ · M02_JudgeOutside" assert rows["단산10 운반"]["tail"] == ["success:M02_JudgeMade SK-000001"] assert got["count"] == {"블록": 2, "밖": 1, "줄": 0} # 만든 SK 뺌 @@ -71,37 +69,3 @@ def test_권한_그대로_넘김(): {"no": 8, "canWrite": True, "to": "personal"}, {"no": 8, "canWrite": False, "to": "company"}, ] - - -def _src(name: str) -> str: - return (M02 / f"M02_MasterTemplete_Hopyo_{name}.ts").read_text(encoding="utf-8") - - -def test_캐시_공유_알림_칠_다시(): - sheet = _src("Sheet") - assert "createSheetSk(" in sheet and "sk?.at(s);" in sheet - side = _src("SheetSk") - assert "readHopyoMarks(opt.scope, opt.key, opt.target)" in side # 809-1 블록 칠 재료 목록 - assert ( - "createJudgeBlock" not in side and "createJudgeMove" not in side - ) # 판정 블록 판 · 옮기기 걷음 - nav = _src("SheetNav") - assert "blockAt(sheet: string, row: number)" in nav and "spotOf(no: number, role: Role)" in nav - wizard = _src("Import") - assert ( - 'L("M02_SkUnmoved")' in wizard and "leftCount" not in wizard - ) # 밖 = 안 막음 · 옛 남은 줄 막음 걷음 - tone = (M02 / "logic" / "M02_MasterTemplete_Hopyo_SheetMap.ts").read_text(encoding="utf-8") - assert '글: "일위대가 밖"' in tone - - -def test_부품_상자만_700줄(): - for name in ("SheetSk", "Sheet", "SheetNav", "Import", "Side"): - src = _src(name) - assert len(src.splitlines()) <= 700, name - assert not re.search(r"#[0-9a-fA-F]{3,6}\b|rgb\(", src), name - for name in ("SheetSk", "Import"): - assert not re.search(r'el\("(button|input|select)"| str: - return (M02 / f"M02_MasterTemplete_Hopyo_{name}.ts").read_text(encoding="utf-8") - - -def test_가운데_상세_페이지_없음(): - assert not (M02 / "M02_MasterTemplete_Hopyo_Wizard.ts").exists() - every = "\n".join(p.read_text(encoding="utf-8") for p in M02.glob("*.ts")) - for gone in ("buildHopyoWizard", "HopyoWizard", "wantSangeun", "M02_WizSkCheck", "STEPS"): - assert gone not in every, gone - for key in ("M02_WizSkHead", "M02_WizIlwiHead", "M02_SkHint"): - assert key not in (ROOT / "ui_template" / "ui_template_locale_m2.ts").read_text("utf-8") - - -def test_누름_하나_바로_엑셀(): - side = _src("Side") - choose = side.split("async function choose()")[1].split("input.addEventListener")[0] - assert "input.click();" in choose # [불러오기] = 바로 파일 고르기 창 - change = side.split('input.addEventListener("change"')[1].split("async function leaveOk")[0] - assert "uploadHopyo(MINE, file)" in change and "return show(got, true);" in change - show = side.split("async function show(")[1].split("async function showLedger")[0] - assert "buildHopyoImport({" in show and "opt.show(" in show # 올림 뒤 본 칸 바로 - imp = _src("Import") - assert "m.buildHopyoSheet({" in imp and "headExtra: [finish]" in imp - - -def test_층_가르기_없음_늘_개인(): # 837-1 · 요구 855 — 예전 「결과 층 고름」 걷음 - side, imp = _src("Side"), _src("Import") - for gone in ("createSegment", "writableLayers", "LAYERS", "layerText", "seg.hidden", "pick"): - assert gone not in side, gone - for gone in ("LAYERS", "layerText", "writableLayers", "layerNote", "createBadge"): - assert gone not in imp, gone - assert 'export const MINE: HopyoScope = { layer: "personal", owner: null };' in imp - - -def test_끝내기_머리_막대_끝냄_뒤_빈_본_칸(): - imp = _src("Import") - end = imp.split("async function end()")[1] - assert ( - "skCount()" in end.split("showConfirmDialog(")[0] - ) # 안 만든 단가산출 = 물음 글만(막지 않음) - assert "deleteHopyo(scope, file.키)" in end and "a.onEnded();" in end - side = _src("Side") - assert "onEnded: () => {" in side and "void refresh();" in side - sheet = _src("Sheet") - assert "dropButton" not in sheet and "onDeleted" not in sheet # [삭제] 걷음 - - -def test_부품_상자만_700줄_늘리지_않음(): - for name in ("Import", "Side", "Sheet", "SheetSk"): - src = _src(name) - assert len(src.splitlines()) <= 700, name - assert not re.search(r"#[0-9a-fA-F]{3,6}\b|rgb\(", src), name # 색 = 공통 값 - for name in ("Import", "SheetSk"): - assert not re.search(r'el\("(button|input|select)"| body?.matDirty()" in _src("Import") - assert "location.hash" not in _src("Import") + _src("Side") # 새 해시 열쇠 없음 diff --git a/resources/tester/test_793_3b_import_screen.py b/resources/tester/test_793_3b_import_screen.py index 02986b756..435bfbf35 100644 --- a/resources/tester/test_793_3b_import_screen.py +++ b/resources/tester/test_793_3b_import_screen.py @@ -5,16 +5,10 @@ 블록 → 793-2a 내보내기 → 793-2 가져온 식 SK(만들 층 · 엑셀 단가 그대로 · 검산 = 엑셀) · 같은 내용 = 그 SK 다시 씀 · 산근 없는 옛 HP = 409 · HP 지우면 산근도 지움 · STmate 블록 끝전 = 엑셀 계와 맞는 쪽 -- 화면 소스 — 단가산출 탭 목록 [가져온 식으로 열기](`Hopyo_SheetSk`) · 시트 모달 - (`Sangeun_Detail`) · 머리 판(검산 · [우리 단가로] / [엑셀 단가로] · [원본 글 보기] · - [이음 고르기] · 소요량 이음) · 부품 상자만 · 700 줄 - 809-1 걷음(요구 703) — [우리 기초로 바꾸기] · 근거 세 단 · 입력 필요 · [이 줄에 잇기] · 옮기기 판정 길 없음 임시 storage(`client` 마당) · M01 원본 그대로. """ -import re -from pathlib import Path - import helper_m02_hopyo_golden as golden import pytest @@ -26,15 +20,8 @@ from M02_MasterTemplete import M02_Template_Layers as layers # ruff: noqa: F811 from resources.tester.test_m02_hopyo_excel import _post, client, master_hash # noqa: F401 -ROOT = Path(__file__).resolve().parents[2] -M02 = ROOT / "M02_MasterTemplete" API = "/api/m02/layers/personal" KEY = "HP-000001" -MINE = ("Hopyo_Imported", "Hopyo_ImportedPanel", "Hopyo_SheetSk", "Hopyo_View") - - -def _src(name: str) -> str: - return (M02 / f"M02_MasterTemplete_{name}.ts").read_text(encoding="utf-8") def _skcount() -> int: @@ -97,44 +84,3 @@ def test_STmate_끝전_엑셀_계와_맞는_쪽(tag, code, rule): got = sx.read(path.name, path.read_bytes()) assert got["옵션"]["SAN_TYP"] == xs.RULE[rule] assert any(b["코드"] == code for b in got["산근"]) - - -# ── 화면 소스 ───────────────────────────────────────────────────────── -def test_단산_줄_길_잇기(): - sk, view = _src("Hopyo_SheetSk"), _src("Hopyo_View") - assert "openImported({" in sk and "dataset.skOpen" in sk # 단가산출 탭 목록 = 가져온 식 모달 - assert ( - '"/sangeun/from-hopyo"' not in view and "openImported({" in view - ) # [수정] 단산 줄 = 가져온 식 모달(미리 보기 · 835-1) - imp = _src("Hopyo_Imported") - assert '"/sangeun/from-hopyo/preview"' in imp and '"/sangeun/from-hopyo"' in imp - assert "/sangeun/imported/${how}" in imp - assert "mountSangeunDetail(" in imp and "saveTemplate(" in imp and "openModal({" in imp - for how in ('run("price"', 'run("link"'): - assert how in imp, how - for gone in ("to-base", "toBase", "onLink", "skPick", "checkJudge", "readJudgeBlock"): - assert gone not in imp, gone # 809-1 · 요구 703 - # 옛 M02 수식 나무 화면(「엑셀 원래」 위 줄) 걷음 — 수식 탭 = 공용 수식 문서 화면(802-4b-2) - assert not (M02 / "M02_MasterTemplete_Sangeun_Equation.ts").exists() - - -def test_머리_판_기초_없음(): - panel = _src("Hopyo_ImportedPanel") - for word in ("ToOurs", "ToExcel", "Source", "Link", "Same", "Diff"): - assert f'tx("{word}")' in panel, word - for gone in ("ToBase", "PickBase", "data-basis-tiers", "우리 기초로 바꾸기", "근거 제안"): - assert gone not in panel, gone - model = (M02 / "logic/M02_Hopyo_Imported_Model.ts").read_text(encoding="utf-8") - assert "BasisCand" not in model and "skPick" not in model and "근거후보" not in model - assert not re.search(r"from \"@ui|document\.|fetch\(|sessionStorage\.", model) # 순수 - - -def test_부품상자만_700줄_공용_안_고침(): - for name in MINE: - text = _src(name) - assert len(text.splitlines()) <= 700, name - assert not re.search(r"""\bel\(\s*["'](button|input|select)["']""", text), name - assert not re.search(r"""createElement\(\s*["'](button|input|select)["']""", text), name - assert "#" not in "".join(re.findall(r"color:\s*[^;]+", text)), name - for name in ("Labor_Rows", "Labor_SkEdit", "Sangeun_Detail", "Sangeun_Tabs"): - assert "Hopyo_Imported" not in _src(name), name # 공용 쪽은 새 모달을 모름 diff --git a/resources/tester/test_807_1_import_doc_one.py b/resources/tester/test_807_1_import_doc_one.py index 6c648a3b1..a7dec4b82 100644 --- a/resources/tester/test_807_1_import_doc_one.py +++ b/resources/tester/test_807_1_import_doc_one.py @@ -145,16 +145,3 @@ def test_origin_card_and_clauses(world) -> None: ("임도품셈", "5-1-2", 4), ] assert plain is None # 우리 SK = 카드 없음(원문 먼저) - - -def test_source_find_on_m01_and_m02_panels() -> None: - m02 = (ROOT / "M02_MasterTemplete/M02_MasterTemplete_Sangeun_Side.ts").read_text("utf-8") - m01 = (ROOT / "M01_MasterData/M01_MasterData_UI_LogicLab_Side.ts").read_text("utf-8") - assert "createSourceFind" in m02 and "createSourceFind" in m01 - assert "originOf" in m02 - sheet = (ROOT / "M02_MasterTemplete/M02_MasterTemplete_Hopyo_Mine.ts").read_text("utf-8") - block = (ROOT / "M02_MasterTemplete/M02_MasterTemplete_Hopyo_SheetSk.ts").read_text("utf-8") - assert "/hopyo-build-all" in sheet and "번: h.번" in sheet - assert '{ layer: "personal", owner: null }' in block and "openImported" in block - detail = (ROOT / "M02_MasterTemplete/M02_MasterTemplete_Sangeun_Detail.ts").read_text("utf-8") - assert "], doc);" in detail # 원문 패널에 SK 문서(가져온 머리 · 810-4 가져온보관)를 넘김 diff --git a/resources/tester/test_837_1_import_personal_only.py b/resources/tester/test_837_1_import_personal_only.py index 96d23093d..aa50e77b3 100644 --- a/resources/tester/test_837_1_import_personal_only.py +++ b/resources/tester/test_837_1_import_personal_only.py @@ -21,26 +21,3 @@ def test_불러오기_길_층_고정(monkeypatch): hopyo._root({}, layer, owner, write=True) hopyo._root({}, layer, owner) assert seen == [("personal", None, True), ("personal", None, False)] * 3 - - -def test_라우터_루트_모두_고정_함수(): - src = (ROOT / "M02_MasterTemplete" / "M02_Hopyo_Router.py").read_text(encoding="utf-8") - assert "import _root as _layer_root" in src - assert "_layer_root(" in src.split("def _root(")[1].split("\n\n")[0] - assert src.count("_layer_root(") == 1 # 층 고르는 길은 이 한 곳뿐 - - -def test_단산_블록_만들기_개인_층만(): - src = (ROOT / "M02_MasterTemplete" / "M02_Sangeun_Router.py").read_text(encoding="utf-8") - for fn in ("def sangeun_from_hopyo(", "def sangeun_from_hopyo_preview("): - body = src.split(fn)[1].split("\n@router")[0] - assert "body.층" not in body and "_root(session, layer" not in body, fn - assert '_root(session, "personal", None' in body, fn - - -def test_화면_층_고름_없음(): - m02 = ROOT / "M02_MasterTemplete" - side = (m02 / "M02_MasterTemplete_Hopyo_Side.ts").read_text(encoding="utf-8") - imp = (m02 / "M02_MasterTemplete_Hopyo_Import.ts").read_text(encoding="utf-8") - assert "createSegment" not in side and "writableLayers" not in side + imp - assert '"회사"' not in side + imp and '"마스터"' not in side + imp diff --git a/resources/tester/test_m02_hopyo_screen.py b/resources/tester/test_m02_hopyo_screen.py deleted file mode 100644 index eed03d6c1..000000000 --- a/resources/tester/test_m02_hopyo_screen.py +++ /dev/null @@ -1,58 +0,0 @@ -"""일위대가 실무자료 화면(PLAN 324-4 · 718-1 · 785-4) — 좌측 판 자리 · 권한 · 불러오기 본 칸 · [끝내기] · 떠남. - -옛 확인 창 · 고르기 창 · [로직 추가] 「실무 호표」 · 엑셀 보기 모달 시험은 785-7 에서 지움(판정 화면 = `test_642_6_screen`). -""" - -import os -from pathlib import Path - -HERE = os.path.dirname(os.path.abspath(__file__)) -M02 = Path(HERE).parents[1] / "M02_MasterTemplete" - - -def _text(name: str) -> str: - return (M02 / name).read_text(encoding="utf-8") - - -def test_좌측_판_자리와_권한(): - side = _text("M02_MasterTemplete_UI_Side.ts") - assert 'import { buildHopyoSection } from "./M02_MasterTemplete_Hopyo_Side";' in side - host = side.split('className: "m02-side__lists ui-sidebar-panel"')[1] - # 716-3 차례 — 일위대가 › 구조물 조합 › 구분선 › 일위대가 불러오기 › 도면 양식 - order = ("precomboSec,", "summary,", "createDivider(),", "section(hopyo.title, hopyo.body),") - assert [host.index(k) for k in order] == sorted(host.index(k) for k in order) - assert host.index("section(hopyo.title, hopyo.body),") < host.index("drawing,") - assert "canWrite: opt.canWrite," not in side # 옛 [별칭 장부] 걷음(815-2) - assert "hopyo.paint();" in side.split("function paint(): void {")[1] - hopyo_side = _text("M02_MasterTemplete_Hopyo_Side.ts") - # 718-1 · 785-4 — 제목 = 화면 글 키 · [불러오기] = 구조물 조합 층 단추 꼴 → 바로 파일 고르기 → 본 칸 불러오기 보기 - assert 'L("M02_HopyoImport")' in hopyo_side and "일위대가 실무자료" not in hopyo_side - start = hopyo_side.split("const start = createButton({")[1].split("start.title")[0] - assert 'label: "불러오기"' in start and 'start.classList.add("m02-layers__btn");' in start - assert "buildHopyoImport({" in hopyo_side and "Hopyo_Wizard" not in hopyo_side - assert not (M02 / "M02_MasterTemplete_Hopyo_Wizard.ts").exists() # 가운데 상세 페이지 없음 - assert "uploadHopyo(" in hopyo_side and "openHopyoSheet" not in hopyo_side - assert "buildHopyoLedger" not in hopyo_side and "data-hopyo-ledger" not in hopyo_side - assert not (M02 / "M02_MasterTemplete_Hopyo_Ledger.ts").exists() # 옛 [별칭 장부] 걷음(815-2) - imp = _text("M02_MasterTemplete_Hopyo_Import.ts") - assert 'accept: ".xls,.xlsx,.estx,.stc"' in hopyo_side # 810-3 · 814-1 원파일도 - assert "input.hidden = true;" in hopyo_side - choose = hopyo_side.split("async function choose()")[1].split("input.addEventListener")[0] - assert "input.click();" in choose # 누름 하나 — 바로 파일 고르기 창 - assert "writableLayers" not in imp + hopyo_side # 837-1 층 고름 걷음 — 늘 개인 층 - assert "uploadHopyo(MINE, file)" in hopyo_side - for gone in ("wantSangeun", "STEPS", "second(", "steps.set", "data-hopyo-sangeun"): - assert gone not in imp + hopyo_side, gone # 중간 걸음 · 단가산출 체크 없음 - - -def test_372_2_저장은_개인_층에_삭제는_화면_층_권한(): - """718-1 — 만들 층 = 올린 층 · [끝내기] 로 올린 파일 지움 → 빈 본 칸(785-4: 엑셀 보기 [삭제] 걷음) · - 743-1 — 떠남(화면 바뀜 · 페이지 닫음) = 쥔 파일 지움.""" - imp = _text("M02_MasterTemplete_Hopyo_Import.ts") - open_ = imp.split("m.buildHopyoSheet({")[1].split("});")[0] - assert "target: scope," in open_ and "canWrite: true," in open_ - assert "onDeleted" not in imp and "dropButton" not in _text("M02_MasterTemplete_Hopyo_Sheet.ts") - assert "a.onEnded();" in imp and "held = false;" in imp - assert 'addEventListener("pagehide", leave)' in imp and " leave,\n" in imp - panel = _text("M02_MasterTemplete_Hopyo_Side.ts") - assert panel.count("open?.imp?.leave()") == 1 and panel.count("open.imp?.leave()") == 1