rbx.cp 0.5.48__py3-none-any.whl → 0.5.49__py3-none-any.whl

rbx/box/schema.py

@@ -356,8 +356,8 @@ class LimitModifiers(BaseModel):
 class ValidatorTest(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
-    input: pathlib.Path = Field(
-        description='The input file to be used as unit test input for the validator.'
+    glob: str = Field(
+        description='A glob pattern for the input files to be used as unit test input for the validator.'
     )
     outcome: ValidatorOutcome = Field(
         default=ValidatorOutcome.VALID,
@@ -373,17 +373,12 @@ class ValidatorTest(BaseModel):
 class CheckerTest(BaseModel):
     model_config = ConfigDict(extra='forbid')
 
-    input: Optional[pathlib.Path] = Field(
-        default=None,
-        description='The input file to be used as unit test input for the checker. If not specified, will pass an empty file.',
-    )
-    output: Optional[pathlib.Path] = Field(
-        default=None,
-        description='The solution output file to be used as unit test output for the checker. If not specified, will pass an empty file.',
-    )
-    answer: Optional[pathlib.Path] = Field(
-        default=None,
-        description='The answer file to be used as unit test answer for the checker. If not specified, will pass an empty file.',
+    glob: str = Field(
+        description="""
+A glob pattern for the files to be used as unit test input for the checker.
+This glob should simultaneously match the input, output, and answer files (.in, .out, .ans).
+If one of them is not present, an empty file will be used instead.
+""",
     )
 
     outcome: ExpectedOutcome = Field(

rbx/box/unit.py

@@ -1,14 +1,79 @@
-from typing import List, Optional
+import pathlib
+from typing import List, Optional, Set
 
 import syncer
+from pydantic import BaseModel
 
 from rbx import console
 from rbx.box import checkers, package, validators
-from rbx.box.schema import CodeItem, Testcase, ValidatorOutcome, ValidatorTest
+from rbx.box.schema import (
+    CheckerTest,
+    CodeItem,
+    ExpectedOutcome,
+    Testcase,
+    ValidatorOutcome,
+    ValidatorTest,
+)
 from rbx.utils import StatusProgress
 
 
-def _get_validator_for_test(test: ValidatorTest) -> Optional[CodeItem]:
+class ValidatorTestEntry(BaseModel):
+    input: pathlib.Path
+    outcome: ValidatorOutcome
+    validator: Optional[CodeItem]
+
+
+class CheckerTestEntry(BaseModel):
+    input: Optional[pathlib.Path] = None
+    output: Optional[pathlib.Path] = None
+    answer: Optional[pathlib.Path] = None
+    outcome: ExpectedOutcome
+
+
+def _extract_validator_test_entries(
+    tests: List[ValidatorTest],
+) -> List[ValidatorTestEntry]:
+    res: List[ValidatorTestEntry] = []
+    for test in tests:
+        for input in pathlib.Path().glob(str(test.glob)):
+            if not input.is_file():
+                continue
+            res.append(
+                ValidatorTestEntry(
+                    input=input, outcome=test.outcome, validator=test.validator
+                )
+            )
+    return sorted(res, key=lambda x: x.input.name)
+
+
+def _extract_checker_test_entries(tests: List[CheckerTest]) -> List[CheckerTestEntry]:
+    res: List[CheckerTestEntry] = []
+    seen: Set[pathlib.Path] = set()
+    for test in tests:
+        for file in pathlib.Path().glob(str(test.glob)):
+            if not file.is_file():
+                continue
+            if file.suffix not in ['.in', '.out', '.ans']:
+                continue
+            basefile = file.with_suffix('')
+            if basefile in seen:
+                continue
+            seen.add(basefile)
+            input = basefile.with_suffix('.in')
+            output = basefile.with_suffix('.out')
+            answer = basefile.with_suffix('.ans')
+            res.append(
+                CheckerTestEntry(
+                    input=input if input.is_file() else None,
+                    output=output if output.is_file() else None,
+                    answer=answer if answer.is_file() else None,
+                    outcome=test.outcome,
+                )
+            )
+    return res
+
+
+def _get_validator_for_test(test: ValidatorTestEntry) -> Optional[CodeItem]:
     pkg = package.find_problem_package_or_die()
     if test.validator is not None:
         return test.validator
@@ -18,8 +83,10 @@ def _get_validator_for_test(test: ValidatorTest) -> Optional[CodeItem]:
 async def run_validator_unit_tests(progress: StatusProgress):
     pkg = package.find_problem_package_or_die()
 
+    entries = _extract_validator_test_entries(pkg.unitTests.validator)
+
     vals: List[CodeItem] = []
-    for test in pkg.unitTests.validator:
+    for test in entries:
         val = _get_validator_for_test(test)
         if val is not None:
             vals.append(val)
@@ -31,7 +98,7 @@ async def run_validator_unit_tests(progress: StatusProgress):
 
     console.console.rule('Validator tests', style='info')
 
-    for i, test in enumerate(pkg.unitTests.validator):
+    for i, test in enumerate(entries):
         val = _get_validator_for_test(test)
         if val is None:
             console.console.print(
@@ -82,8 +149,9 @@ async def run_checker_unit_tests(progress: StatusProgress):
     console.console.rule('Checker tests', style='info')
 
     empty_file = package.get_empty_sentinel_path()
+    entries = _extract_checker_test_entries(pkg.unitTests.checker)
 
-    for i, test in enumerate(pkg.unitTests.checker):
+    for i, test in enumerate(entries):
         result = await checkers.check(
             compiled_digest,
             run_log=None,

{rbx_cp-0.5.48.dist-info → rbx_cp-0.5.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.48
+Version: 0.5.49
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.48.dist-info → rbx_cp-0.5.49.dist-info}/RECORD

@@ -44,7 +44,7 @@ rbx/box/presets/lock_schema.py,sha256=6sRPnyePOC8yy-5WcD5JRZdDJHf8loqbvpQ1IPiOU9
 rbx/box/presets/schema.py,sha256=mZmSPkQsw7eQM0lQN6er1MO_LiW1ObwwAZFDK0F5fxE,1962
 rbx/box/retries.py,sha256=tRk2K1bXw2xnwkAj2CsktRHTEhw7YKcPxMQTT6mCy-E,4707
 rbx/box/sanitizers/warning_stack.py,sha256=RI97_GJgdjTKIXY_r0EKp5h0qQQSDSdNDh5K7zINrqs,2861
-rbx/box/schema.py,sha256=P1jVaeqe4OcotAJOqu3T5WD8DR-amZyyq3cau5rPiM8,17086
+rbx/box/schema.py,sha256=tOQ1tLHqc_5V-UgrzM44aS8ULAkq-IkeErxjLCFVA8I,16778
 rbx/box/setter_config.py,sha256=s53talhwM6FTGDCcBhY7IlZ6_6mJ3PMp6V4kTtaSs50,4262
 rbx/box/solutions.py,sha256=b4P6JN4eSDFiUKjBYvI38jsf8wLxS8Wi-YwBmm25Rcg,42684
 rbx/box/solutions_test.py,sha256=TCowbxBG3SvDlFO5-qtBj_M_HrAHe0IJaI1XwoQ1d00,1718
@@ -70,7 +70,7 @@ rbx/box/ui/captured_log.py,sha256=ptICDPViVnz-_2NfrcB0SSBXNW5L74zI-vAZNN7kSok,11
 rbx/box/ui/css/app.tcss,sha256=apd5PkPEvl5jK3kE2qrxPyVED1VnvSsj08QQwzUPwEA,786
 rbx/box/ui/main.py,sha256=b0rHcBF42W4AOCv7WhtiGf_rUnY0yxpqO5oj3wfR4R4,984
 rbx/box/ui/run.py,sha256=wMEXrEFdQvMHz2hRKAFIithTnTtaL0kNQZu0jKmb8jI,7060
-rbx/box/unit.py,sha256=veyBuz_7AbDFbdWi02jq_zLwXEkmgt0djXgVJU-OYCU,3755
+rbx/box/unit.py,sha256=ziyfgU4gmmNqKucMYYiJksOHkp22pxYpgk7dpX2mSQM,5793
 rbx/box/validators.py,sha256=oqlNhw7jivbbH5l8g3xwihPRy76AM7MA3G4A8nyI_V0,10416
 rbx/box/validators_test.py,sha256=WY4Ho-wlsPHc0YNuz0KFVd6KQ9ouuiou3w5_zMOZ4Fs,362
 rbx/checker.py,sha256=pj1jO3my48ru-qugbER5onccANCjoR0-PaFe3H3VGEY,4118
@@ -188,8 +188,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=ZXMysGXpTtvS1lfLL38FuD5iSIyxi3ARjQePDrUmEtc,2067
 rbx/utils.py,sha256=6e1eXRzNE-52D0UVtqclePxqR4Haiqt8qWCrSVjnGuE,4585
-rbx_cp-0.5.48.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.48.dist-info/METADATA,sha256=LDeC-APwbLHB8kxUUmbWjS_pwbTSfIbOweMWlYRTU-M,3261
-rbx_cp-0.5.48.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.48.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.48.dist-info/RECORD,,
+rbx_cp-0.5.49.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.49.dist-info/METADATA,sha256=mNCg5KTbxOIcJGovPqYotTF3kFQXqxcJ-8TRjAK47Pg,3261
+rbx_cp-0.5.49.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.49.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.49.dist-info/RECORD,,