Update UT to use built-in testing framework

Author: hurufu

src/tests/reif.pl

@@ -1,57 +1,74 @@
 :- module(reif_tests, []).
 
 :- use_module(library(reif)).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Unit tests
-
-% indexing_dif_* tests are just sanity checks – examples from the paper, to
-% make sure I haven't messed up.
-t(true, (
-    indexing_dif_p6_e1 :-
-        findall(X-Fs, tfilter(=(X),[1,2,3,2,3,3],Fs), [1-[1], 2-[2,2], 3-[3,3,3], Y-[]]),
-        maplist(dif(Y), [1,2,3])
+:- use_module(library(lists)).
+:- use_module(library(dif)).
+:- use_module(library(loader)).
+:- use_module(test_framework).
+
+% Those tests are just sanity checks – examples from the paper, to make sure
+% I haven't messed up.
+test("indexing dif/2 p6#1", (
+    findall(X-Fs, tfilter(=(X),[1,2,3,2,3,3],Fs), [1-[1], 2-[2,2], 3-[3,3,3], Y-[]]),
+    maplist(dif(Y), [1,2,3])
 )).
-t(true, (indexing_dif_p6_e2 :- findall(X, duplicate(X,[1,2,3,2,3,3]), [2,3]))).
-t(true, (indexing_dif_p7_e1 :- firstduplicate(1, [1,2,3,1]))).
-t(true, (indexing_dif_p7_e2 :- firstduplicate(X, [1,2,3,1]), X == 1)).
-t(true, (indexing_dif_p7_e3 :-
+test("indexing dif/2 p6#2", findall(X, duplicate(X,[1,2,3,2,3,3]), [2,3])).
+test("indexing dif/2 p7#1", firstduplicate(1, [1,2,3,1])).
+test("indexing dif/2 p7#2",(
+    firstduplicate(X, [1,2,3,1]),
+    X == 1
+)).
+test("indexing dif/2 p7#3", (
     findall(Y-A-B-C, firstduplicate(Y,[A,B,C]), [X-X-X-_, X-X-B1-X, X-A2-X-X]),
     dif(B1,X),
     dif(A2,X)
 )).
 
-t(true, (doesnt_modify_free_variables :- user:goal_expanded(A,B), A == B, var(A))).
-t(true, (expands_call1 :- user:goal_expanded(call(a), a))).
-t(true, (expands_call1_for_modules :- user:goal_expanded(call(a:b(1)), a:b(1)))).
-t(true, (expands_call2_for_modules :- user:goal_expanded(call(a:b,c), a:b(c)))).
-t(true, (doesnt_expand_call2 :- user:goal_expanded(call(b,c), call(b,c)))).
-t(true, (doesnt_expand_cyclic_terms :- X=a(X), user:goal_expanded(call(X), Y), call(X) == Y)).
-t(true, (doesnt_expand_cyclic_call1 :- X=call(X), user:goal_expanded(X, Y), X == Y)).
-t(true, (doesnt_expand_higher_order_predicates :- X = maplist(=(1), _), user:goal_expanded(X, Y), X == Y)).
+test("doesnt modify free variables", (reif:goal_expanded(A,B), A == B, var(A))).
+test("expands call/1", reif:goal_expanded(call(a), a)).
+test("expands call/1 for modules", reif:goal_expanded(call(a:b(1)), a:b(1))).
+test("expands call/2 for modules", reif:goal_expanded(call(a:b,c), a:b(c))).
+test("doesn't expand call/2", reif:goal_expanded(call(b,c), call(b,c))).
+test("doesn't expand cyclic terms", (
+    X=a(X),
+    reif:goal_expanded(call(X), Y),
+    call(X) == Y
+)).
+test("doesn't expand cyclic call/1", (
+    X=call(X),
+    reif:goal_expanded(X, Y),
+    X == Y
+)).
+test("doesn't expand higher order predicates", (
+    X = maplist(=(1), _),
+    reif:goal_expanded(X, Y),
+    X == Y
+)).
 
 % This test fails, and I don't know if goal_expanded/2 should be recursive or not,
 % and what properties it shall maintain (is idempotence even desirable?).
-t(skip, (second_expansion_doesnt_modify_goal :-
-    findall(G==Gxx, test_expand_goal_twice(G,Gxx), Goals), maplist(call, Goals)
-)).
+%test("second expansion doesnt modify goal", (
+%    findall(G==Gxx, test_expand_goal_twice(G,Gxx), Goals),
+%    maplist(call, Goals)
+%)).
 
-t(true, (ge1(X) :-
-    user:goal_expansion(if_(1=2,false,true), X))).
+test("ge1", (
+    loader:goal_expansion(if_(1=2,false,true), reif_tests, _)
+)).
 
 test_expand_goal_twice(G, Gxx) :-
-    test_goal(G), goal_expanded(G,Gx), goal_expanded(Gx, Gxx).
+    test_goal(G),
+    reif:goal_expanded(G,Gx),
+    reif:goal_expanded(Gx, Gxx).
+
 test_goal(_).
 test_goal(call(a)).
 test_goal(call(a:b(1))).
 test_goal(call(a:b,c)).
 test_goal(call(call(a))).
 test_goal(call(call(a:b))).
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Extras from the paper
-
+% Extra predicates from the paper
 duplicate(X, Xs) :-
     tfilter(=(X), Xs, [_,_|_]).
 
@@ -67,79 +84,3 @@
     dif(E,F),
     tree_non_member(E, L),
     tree_non_member(E, R).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Unit test support (probably should be moved to another module)
-
-:- use_module(library(iso_ext)).
-:- use_module(library(lists)).
-
-:- dynamic([t/2]).
-
-%% testall.
-%
-% Fails if at least one test doesn't pass, but still executes all of them no
-% matter what while printing report line for each unit test.
-%
-% Report looks like the following:
-%
-% ```
-% true:[test_name,...]
-% false:test_name
-% skip:test_name
-% error(ErrorTerm):test_name
-% ```
-%
-% Test succeeds if it perfroms according to its expected outcome. Test may
-% succeed multiple times.
-%
-% Test definition looks like this:
-%
-% ```
-% t(ExpectedOutcome, (TestName :- TestBody)).
-% ```
-%
-% Where:
-%   `ExpectedOutcome` is either `true`, `false` or `error(ErrorTerm)` when an exception is expected.
-%   `TestName` is a term describing the test (usually an atom)
-%   `TestBody` is an actual test case
-%
-% TODO: Write tips for writting tests
-% FIXME: There some quirks when using inside modules, because of (:)/2.
-testall :- findall(C, testsingle(C), Cs), maplist(pass, Cs).
-
-pass(true).
-pass(skip).
-
-%% testsingle(-TestResult).
-%
-% Retrieves unit tests and executes it. Always succeeds.
-testsingle(C) :-
-    gettest(D, G),
-    asserta(D),
-    call_cleanup(runtest(G,C), retract(D)).
-
-%% gettest(-TestPredicate, -TestQuery).
-%
-% Retrieves unit test from the datebase, fails if no tests were found or test
-% definition is incorrect.
-%
-% TODO: Throw exception, don't fail.
-% FIXME: Handle modules correctly
-gettest((H:-B), G) :- t(E, (H:-B)), expectation_goal(E, H, G).
-expectation_goal(true, H, H).
-expectation_goal(false, H, \+reif:H).
-expectation_goal(error(E), H, catch(reif:H, error(E, _), true)).
-expectation_goal(skip, H, true(H)).
-true(_).
-
-%% runtest(+Goal, -ResultCode).
-%
-% Try to collect all solutions and print predicate outcome no matter what.
-% Always succeeds.
-runtest(G, C) :- catch(findall(G,G,S), E, S = x(E)), what_to_print(S, G, C:R), write(C:R), nl.
-what_to_print([],          G, false:G).
-what_to_print([true(H)|_], _,  skip:H).
-what_to_print([H|T],       _,  true:[H|T]) :- H \= true(_).
-what_to_print(x(E),        G,     E:G).

tests/scryer/cli/src_tests/reif_tests.stdout

@@ -0,0 +1 @@
+All tests passed

tests/scryer/cli/src_tests/reif_tests.toml

@@ -1 +1,7 @@
-args = ["-f", "--no-add-history", "src/tests/reif.pl", "-f", "-g", "use_module(library(reif_tests)),reif_tests:testall,halt"]
+args = [
+    "-f",
+    "--no-add-history",
+    "-g",
+    "use_module(library(reif_tests)),use_module(library(reif)),use_module(library(dif)),reif_tests:main_quiet(reif_tests)",
+    "src/tests/reif.pl"
+]