xfail properly, all tests would be working now

ModischFabrications · Apr 14, 2024 · 6193b84 · 6193b84
1 parent f759840
commit 6193b84
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/tests/solver/data/test_Job.py b/tests/solver/data/test_Job.py
@@ -75,25 +75,25 @@ def test_combinations():
               )
     assert job.n_combinations() == 72
 
-    # TODO test combined
+    # TODO test combined once grouping works
 
 
-@pytest.mark.skip(reason="bug #73")
+@pytest.mark.xfail(reason="bug #73")
 def test_group_required():
     job = Job(stocks=(INS(length=1000),), cut_width=10, required=(
         QNS(length=88, quantity=2), QNS(length=88, quantity=1), QNS(length=88, quantity=1))
               )
     assert job.n_combinations_required() == 1
 
 
-@pytest.mark.skip(reason="bug #73")
+@pytest.mark.xfail(reason="bug #73")
 def test_group_stocks():
     job = Job(stocks=(INS(length=1000, quantity=2), INS(length=1000, quantity=2)), cut_width=10,
               required=(QNS(length=100, quantity=2),))
     assert job.n_combinations_stocks() == 1
 
 
-@pytest.mark.skip(reason="bug #73")
+@pytest.mark.xfail(reason="bug #73")
 def test_group_stocks_infinite():
     job = Job(stocks=(INS(length=1000, quantity=2), INS(length=1000)), cut_width=10,
               required=(QNS(length=100, quantity=2),))

diff --git a/tests/solver/test_large.py b/tests/solver/test_large.py
@@ -36,13 +36,25 @@ def test_m_multi(solver):
 
     solved = solver(testjob_m)
 
-    assert solved == (
+    trimmings = sum(lt.trimming for lt in solved)
+
+    perfect_trimmings = 520
+    perfect_result = (
         ResultEntry(stock=NS(length=500), cuts=(NS(length=500),), trimming=0),
         ResultEntry(stock=NS(length=500), cuts=(NS(length=300),), trimming=190),
         ResultEntry(stock=NS(length=900), cuts=(NS(length=500), NS(length=300)), trimming=80),
         ResultEntry(stock=NS(length=900), cuts=(NS(length=500), NS(length=300)), trimming=80),
         ResultEntry(stock=NS(length=900), cuts=(NS(length=500), NS(length=100), NS(length=100)), trimming=170))
 
+    if solver == _solve_bruteforce:
+        assert trimmings == perfect_trimmings
+        assert solved == perfect_result
+    else:
+        if solved != perfect_result:
+            pytest.xfail("heuristic has worse result")
+        if trimmings != perfect_trimmings:
+            pytest.xfail(f"heuristics has worse trimmings: {trimmings} != {perfect_trimmings}")
+
 
 @pytest.mark.parametrize("solver", [_solve_FFD, _solve_gapfill])
 def test_l(solver):

diff --git a/tests/solver/test_multi.py b/tests/solver/test_multi.py
@@ -42,7 +42,7 @@ def test_solver_single(solver):
     )
 
 
-# @pytest.mark.skip(reason="bug #52")
+# @pytest.mark.xfail(reason="bug #52")
 @pytest.mark.parametrize("solver", [_solve_bruteforce, _solve_FFD, _solve_gapfill])
 def test_solver_multi(solver):
     job = Job(stocks=(INS(length=1100), INS(length=500, quantity=2)), cut_width=10,

diff --git a/tests/solver/test_special.py b/tests/solver/test_special.py
@@ -8,7 +8,7 @@
 )
 
 
-# @pytest.mark.skip(reason="bug #63")
+# @pytest.mark.xfail(reason="bug #63")
 @pytest.mark.parametrize("solver", [_solve_bruteforce, _solve_FFD, _solve_gapfill])
 def test_cuts(solver):
     testjob_cuts = Job(stocks=(INS(length=1010),), cut_width=10, required=(QNS(length=500, quantity=4),))
@@ -20,7 +20,7 @@ def test_cuts(solver):
     )
 
 
-# @pytest.mark.skip(reason="bug #59")
+# @pytest.mark.xfail(reason="bug #59")
 @pytest.mark.parametrize("solver", [_solve_bruteforce, _solve_FFD, _solve_gapfill])
 def test_zero_width_cuts(solver):
     testjob_zero_cuts = Job(stocks=(INS(length=1000),), cut_width=0, required=(QNS(length=500, quantity=4),))
@@ -47,7 +47,7 @@ def test_smaller_cuts(solver):
         ResultEntry(stock=NS(length=100), cuts=(NS(length=95),), trimming=0))
 
 
-# @pytest.mark.skip(reason="bug #64")
+# @pytest.mark.xfail(reason="bug #64")
 @pytest.mark.parametrize("solver", [_solve_bruteforce, _solve_FFD, _solve_gapfill])
 def test_no_cuts(solver):
     testjob_equal = Job(stocks=(INS(length=1000),), cut_width=10, required=(QNS(length=1000, quantity=4),))