[Euslisp-commit] SF.net SVN: euslisp:[657] trunk/EusLisp/lib/llib/unittest.l

[<k-...@us...>]

Revision: 657
          http://sourceforge.net/p/euslisp/code/657
Author:   k-okada
Date:     2013-11-23 00:00:14 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
set number of test is number of assrt, https://sourceforge.net/p/jskeus/tickets/44/

Modified Paths:
--------------
    trunk/EusLisp/lib/llib/unittest.l

Modified: trunk/EusLisp/lib/llib/unittest.l
===================================================================
--- trunk/EusLisp/lib/llib/unittest.l	2013-11-22 23:34:02 UTC (rev 656)
+++ trunk/EusLisp/lib/llib/unittest.l	2013-11-23 00:00:14 UTC (rev 657)
@@ -56,7 +56,7 @@
   (:init (n) (setq name n tests nil failures nil time 0))
   (:tests () tests)
   (:num-tests () (length tests))
-  (:num-failures () (if failures 1 0)) ;; need fix
+  (:num-failures () (length failures))
   (:num-successes () (- (send self :num-tests) (send self :num-failures)))
   (:time () time)
   (:prin1
@@ -123,8 +123,7 @@
    (push (instance unit-test-result :init func-sym) result))
   (:clear-result ()
    (setq result nil)
-   (send self :init-result 'all-test)
-   (send self :increment-test 'all-test))
+   )
   ;;
   (:print-xml-result
    (&optional (strm t))
@@ -176,7 +175,6 @@
     (send *unit-test* :init-result func-sym)
     (format t "TEST-NAME: ~A~%" func-sym)
     (format t "  now testing...~%")
-    (send *unit-test* :increment-test func-sym)
     (setq tm (instance mtimer :init))
     (send tm :start)
     (funcall func)
@@ -213,6 +211,7 @@
 	  ;;	 (setq ret (lisp::step ,pred))
 	  ;;       (setq ret ,pred))
 	  ;;
+	  (send *unit-test* :increment-test ',pred)
 	  (if (not ret)
 	      ;; escape <> for xml
 	      (send *unit-test* :increment-failure ',pred (format nil ,message ,@args)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.