Better feedback from assert_gt/2 (etc) for expressions. Closes #29

Author: simonharris

plunit_assert.pl

@@ -259,7 +259,9 @@
     call_protected(A > B, fail_assert_gt(A, B)).
 
 fail_assert_gt(A, B) :-
-    feedback('Does not hold: ~w is not greater than ~w', [A, B]).
+    pretty_with_eval(A, PA),
+    pretty_with_eval(B, PB),
+    feedback('Comparison failed: ~w is not greater than ~', [PA, PB]).
 
 %! assert_lt(+A, +B) is semidet
 %
@@ -271,7 +273,9 @@
     call_protected(A < B, fail_assert_lt(A, B)).
 
 fail_assert_lt(A, B) :-
-    feedback('Does not hold: ~w is not less than than ~w', [A, B]).
+    pretty_with_eval(A, PA),
+    pretty_with_eval(B, PB),
+    feedback('Comparison failed: ~w is not less than ~w', [PA, PB]).
 
 %! assert_gte(+A, +B) is semidet
 %
@@ -283,7 +287,9 @@
     call_protected(A >= B, fail_assert_gte(A, B)).
 
 fail_assert_gte(A, B) :-
-    feedback('Does not hold: ~w is not greater than or equal to ~w', [A, B]).
+    pretty_with_eval(A, PA),
+    pretty_with_eval(B, PB),
+    feedback('Comparison failed: ~w is not greater than or equal to ~w', [PA, PB]).
 
 %! assert_lte(+A, +B) is semidet
 %
@@ -295,7 +301,9 @@
     call_protected(A =< B, fail_assert_lte(A, B)).
 
 fail_assert_lte(A, B) :-
-    feedback('Does not hold: ~w is not less than or equal to ~w', [A, B]).
+    pretty_with_eval(A, PA),
+    pretty_with_eval(B, PB),
+    feedback('Comparison failed: ~w is not less than or equal to ~w', [PA, PB]).
 
 %! assert_output(:Goal, +Vars:list, +Expected:list) is semidet
 %

tests/test_pa.pl

@@ -175,37 +175,41 @@
 test(pa_gt) :-
     assert_test_passes(assert_gt(9, 3)),
     assert_test_passes(assert_gt(9, 1+2)),
+    assert_test_passes(assert_gt(9^7, 1+2)),
     assert_test_passes(assert_gt(9, 3.0)),
     assert_test_fails(assert_gt(9, 9)),
     assert_test_fails(assert_gt(3, 9.2)),
     assert_test_fails(assert_gt(3, 8)),
     !.
 
 test(pa_lt) :-
+    assert_test_passes(assert_lt(3, 9.2)),
+    assert_test_passes(assert_lt(3, 8)),
     assert_test_fails(assert_lt(9, 3)),
     assert_test_fails(assert_lt(9, 1+2)),
     assert_test_fails(assert_lt(9, 3.0)),
     assert_test_fails(assert_lt(9, 9)),
-    assert_test_passes(assert_lt(3, 9.2)),
-    assert_test_passes(assert_lt(3, 8)),
+    assert_test_fails(assert_lt(3^7, 8-1)),
     !.
 
 test(pa_gte) :-
     assert_test_passes(assert_gte(9, 3)),
     assert_test_passes(assert_gte(9, 1+2)),
-    assert_test_passes(assert_gte(9, 3.0)),
+    assert_test_passes(assert_gte(9^7, 3.0)),
     assert_test_passes(assert_gte(9, 9)),
     assert_test_fails(assert_gte(3, 9.2)),
     assert_test_fails(assert_gte(3, 8)),
+    assert_test_fails(assert_gte(3, 2*8^3)),
     !.
 
 test(pa_lte) :-
-    assert_test_fails(assert_lte(9, 3)),
-    assert_test_fails(assert_lte(9, 1+2)),
-    assert_test_fails(assert_lte(9, 3.0)),
     assert_test_passes(assert_lte(9, 9)),
     assert_test_passes(assert_lte(3, 9.2)),
     assert_test_passes(assert_lte(3, 8)),
+    assert_test_passes(assert_lte(3^2, 8+1)),
+    assert_test_fails(assert_lte(9, 3)),
+    assert_test_fails(assert_lte(9, 1+2)),
+    assert_test_fails(assert_lte(9^2, 3.0)),
     !.
 
 test(pa_output) :-