[Rust] Complete checker for tasks 1&3 with rust unit tests

Author: TrifanBogdan24

rust-method/checker.py

@@ -2,9 +2,9 @@
 import sys
 from pathlib import Path
 
-def run_cargo():
+def run_cargo_build():
     """Compileaza si ruleaza cargo pentru a verifica daca exista erori."""
-    print("Compiling Rust project...")
+    print("========== Compiling Rust project ==========")
     result = subprocess.run(
         ["cargo", "build"], 
         stdout=subprocess.PIPE, 
@@ -18,7 +18,25 @@ def run_cargo():
         print("Eroare la compilare! Oprire program.")
         sys.exit(1)
 
-def run_test(db_file, test_idx):
+
+def run_cargo_test():
+    """Ruleaza testele unitare (pentru Task 1 si Task 2)"""
+    print("========== Running Rust unit tests ==========")
+    result = subprocess.run(
+        ["cargo", "test"], 
+        stdout=subprocess.PIPE, 
+        stderr=subprocess.PIPE,
+        text=True
+    )
+    # Afiseaza warning-uri si erori
+    print(result.stdout)
+    print(result.stderr)
+    if result.returncode != 0:
+        print("Eroare la rularea testelor unitare! Oprire program.")
+        sys.exit(1)
+    return result.stdout
+
+def run_task2_test(db_file, test_idx):
     """Ruleaza un singur test si returneaza True daca trece, False altfel."""
     input_file = Path(f"../tests/input/test{test_idx}.in")
     output_dir = Path("../tests/output-rust-method")
@@ -52,19 +70,67 @@ def run_test(db_file, test_idx):
     else:
         print(f"Test {test_idx} cu {db_file.name}: FAILED")
         return False
+    
 
-def main():
-    run_cargo()
+def test_task2():
+    print("========== TASK 3 ==========")
+    score = 0
     db_files = [Path("../tests/db/small.db"), Path("../tests/db/big.db")]
-    total_score = 0
     points_per_test = 3.5
     for db_file in db_files:
         print(f"\n--- Testare pentru {db_file.name} ---")
         for i in range(1, 11):
-            if run_test(db_file, i):
-                total_score += points_per_test
+            if run_task2_test(db_file, i):
+                score += points_per_test
+    print()
+    return score
+    
+def test_task1(stdout_result):
+    """stdout_result -> rezultatul testelor unitare, rulate cu `cargo test`"""
+    print("========== TASK 1 ==========")
+    score = 0
+
+    print("Verificare task 1.1 [citire_secretariat]: ", end='')
+    if stdout_result.find("test_citire_secretariat ... ok") >= 0:
+        score += 7
+        print("OK")
+    else:
+        print("FAIL")
+
+    print("Verificare task 1.2 [adauga_student]: ", end='')
+    if stdout_result.find("test_adauga_student ... ok") >= 0:
+        score += 3
+        print("OK")
+    else:
+        print("FAIL")
 
-    print(f"\nScor total: {total_score}/70")
+    print()
+    return score
+
+def test_task3(stdout_result):
+    """stdout_result -> rezultatul testelor unitare, rulate cu `cargo test`"""
+    print("========== TASK 1 ==========")
+    score = 0
+
+    for i in range(1, 6):
+        print(f"Test with `test{i}`.db: ", end='')
+        if stdout_result.find(f"test_cripteaza_studenti::case_{i} ... ok") >= 0:
+            score += 4
+            print("OK")
+        else:
+            print("FAIL")
+    return score
+    
+
+
+def main():
+    run_cargo_build()
+    unit_tests_results = run_cargo_test()
+    total_score = 0
+    total_score += test_task1(unit_tests_results)
+    total_score += test_task2()
+    total_score += test_task3(unit_tests_results)
+    print(f"\nScor total: {total_score}/100")
 
 if __name__ == '__main__':
     main()

rust-method/src/tests/test_task3.rs

@@ -1,7 +1,6 @@
 #![cfg(test)]
 
 use std::fs;
-use crate::structuri::Secretariat;
 use crate::task1::citeste_secretariat;
 use crate::task3::cripteaza_studenti;
 use rstest::rstest;