Changeset 4224 for trunk/library/lgtunit.lgt

Timestamp:

04/25/08 02:24:26 (6 months ago)

Author:

pmoura

Message:

Corrected a bug in the library object "lgtunit" when running "throws" tests (make sure the generated exception is subsumed by the expected exception). Added a "lgtunit_loader" loader utility file for loading the Logtalk unit test library.

Files:

• trunk/library/lgtunit.lgt (modified) (5 diffs)

trunk/library/lgtunit.lgt

@@ -3 +3 @@
 
     :- info([
-        version is 0.2,
+        version is 0.3,
         author is 'Paulo Moura',
-        date is 2007/08/27,
+        date is 2008/04/25,
         comment is 'Logtalk unit test framework.']).
+
+    :- uses(term, [subsumes/2]).
 
     :- public(succeeds/2).
@@ -12 +14 @@
     :- info(succeeds/2, [
         comment is 'Defines a test goal which is expected to succeed.',
-        argnames is ['Test', 'Goal']]).
+        argnames is ['Identifier', 'Goal']]).
 
     :- public(fails/2).
@@ -18 +20 @@
     :- info(fails/2, [
         comment is 'Defines a test goal which is expected to fail.',
-        argnames is ['Test', 'Goal']]).
+        argnames is ['Identifier', 'Goal']]).
 
     :- public(throws/3).
@@ -24 +26 @@
     :- info(throws/3, [
         comment is 'Defines a test goal which is expected to throw an error.',
-        argnames is ['Test', 'Goal', 'Error']]).
+        argnames is ['Identifier', 'Goal', 'Error']]).
 
     :- public(run/2).
@@ -83 +85 @@
 
     test_throws(Test, Goal, Error) :-
-        (   catch({Goal}, Ball, ((Ball = Error -> passed_test(Test, Goal); failed_test(Test, Goal)), Flag = error)) ->
+        (   catch({Goal}, Ball, ((subsumes(Error, Ball) -> passed_test(Test, Goal); failed_test(Test, Goal)), Flag = error)) ->
             (   var(Flag) ->
                 failed_test(Test, Goal)