From 3b40bee13cf3be46712a97fff7021bfecf08aeed Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Tue, 4 Mar 2025 15:23:46 -0500 Subject: [PATCH] test: use tests/convert as root --- tests/convert/basic/task.json | 8 ++++---- tests/convert/diff/task.json | 8 ++++---- tests/convert/utils.py | 16 ++++++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tests/convert/basic/task.json b/tests/convert/basic/task.json index 2889357..3a1145e 100644 --- a/tests/convert/basic/task.json +++ b/tests/convert/basic/task.json @@ -706,7 +706,7 @@ "cases": [ { "stdin": { - "src": "/home/tt/.config/joj/case0.in" + "src": "/home/tt/.config/joj/basic/case0.in" }, "cpuLimit": 500000000, "clockLimit": 1000000000, @@ -715,7 +715,7 @@ }, { "stdin": { - "src": "/home/tt/.config/joj/case1.in" + "src": "/home/tt/.config/joj/basic/case1.in" }, "cpuLimit": 1234567890, "clockLimit": 2469135780, @@ -736,7 +736,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "/home/tt/.config/joj/case0.out", + "answerPath": "/home/tt/.config/joj/basic/case0.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -748,7 +748,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "/home/tt/.config/joj/case1.out", + "answerPath": "/home/tt/.config/joj/basic/case1.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false diff --git a/tests/convert/diff/task.json b/tests/convert/diff/task.json index 9f1f1da..c1aa514 100644 --- a/tests/convert/diff/task.json +++ b/tests/convert/diff/task.json @@ -64,7 +64,7 @@ "cases": [ { "stdin": { - "src": "/home/tt/.config/joj/case0.in" + "src": "/home/tt/.config/joj/diff/case0.in" }, "cpuLimit": 1000000000, "clockLimit": 2000000000, @@ -73,7 +73,7 @@ }, { "stdin": { - "src": "/home/tt/.config/joj/case1.in" + "src": "/home/tt/.config/joj/diff/case1.in" }, "cpuLimit": 2000000000, "clockLimit": 4000000000, @@ -94,7 +94,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "/home/tt/.config/joj/case0.out", + "answerPath": "/home/tt/.config/joj/diff/case0.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false @@ -106,7 +106,7 @@ { "score": 5, "fileName": "stdout", - "answerPath": "/home/tt/.config/joj/case1.out", + "answerPath": "/home/tt/.config/joj/diff/case1.out", "forceQuitOnDiff": false, "alwaysHide": false, "compareSpace": false diff --git a/tests/convert/utils.py b/tests/convert/utils.py index 0a458a1..e1a748b 100644 --- a/tests/convert/utils.py +++ b/tests/convert/utils.py @@ -11,15 +11,19 @@ from joj3_config_generator.models import repo, task def read_convert_files( case_name: str, ) -> Tuple[repo.Config, task.Config, Dict[str, Any]]: - root = Path(__file__).resolve().parent / case_name - repo_toml_path = root / "repo.toml" + root = Path(__file__).resolve().parent + repo_toml_path = root / case_name / "repo.toml" repo_toml = repo_toml_path.read_text() if repo_toml_path.exists() else "" - task_toml_path = root / "task.toml" + task_toml_path = root / case_name / "task.toml" task_toml = task_toml_path.read_text() if task_toml_path.exists() else "" - result = json.loads((root / "task.json").read_text()) + result = json.loads((root / case_name / "task.json").read_text()) return ( - repo.Config(root=root, **rtoml.loads(repo_toml)), - task.Config(root=root, **rtoml.loads(task_toml)), + repo.Config( + root=root, path=repo_toml_path.relative_to(root), **rtoml.loads(repo_toml) + ), + task.Config( + root=root, path=task_toml_path.relative_to(root), **rtoml.loads(task_toml) + ), result, )