Improve printing of test parameters.

Add `pg-autotest-test-assert-full' for current buffer w/o file.

1 files changed, 11 insertions, 4 deletions

diff --git a/generic/pg-autotest.el b/generic/pg-autotest.el
index 6b3c6b4d..a4aed15c 100644
--- a/generic/pg-autotest.el
+++ b/generic/pg-autotest.el
@@ -34,7 +34,7 @@
 ;;; Some utilities
 
 (defun pg-autotest-find-file (file)
-  "Find FILE (relative to `proof-home-directory') and redisplay."
+  "Find FILE (relative to `proof-home-directory')."
   (let* ((name   (concat proof-home-directory file)))
     (if (file-exists-p name)
 	(find-file name)
@@ -64,7 +64,9 @@
 	    (if (fboundp scaffoldfn)
 		(apply scaffoldfn (list ,@args))
 	      (pg-autotest-message 
-	       (format "TEST:  %s" (cons (quote ,fn) (quote ,args))))
+ 	       (format "TEST:  %s" 
+		       (prin1-to-string (cons (quote ,fn) 
+					      (quote ,args)))))
 	      (apply (intern (concat "pg-autotest-test-" 
 				     (symbol-name (quote ,fn))))
 		     (list ,@args))))
@@ -178,10 +180,15 @@ completely processing the buffer as the last step."
 
 (defun pg-autotest-test-assert-processed (file)
   "Check that FILE has been fully processed."
-  (save-excursion
+  (save-excursion ;; TODO: also check on included files list
     (pg-autotest-find-file file)
+    (pg-autotest-test-assert-full)))
+
+(defun pg-autotest-test-assert-full ()
+  "Check that current buffer has been fully processed."
     (unless (proof-locked-region-full-p)
-      (error (format "Locked region in file `%s' is not full" file)))))
+      (error (format "Locked region in buffer `%s' is not full" 
+		     (buffer-name)))))
 
 (defun pg-autotest-test-assert-unprocessed (file)
   "Check that FILE has been fully unprocessed."