X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpackages.lisp;h=747b094488de68d89d3998321c1b58985aaa20a4;hb=916f77e439bc09067ef611ab11c9f3630b80b4f5;hp=53e30ae65e65988bc4b5db4975df23d9b7be59e5;hpb=5d375b445b191c9e1089eeddbef1e541db7e65f9;p=fiveam.git

diff --git a/src/packages.lisp b/src/packages.lisp
index 53e30ae..747b094 100644
--- a/src/packages.lisp
+++ b/src/packages.lisp
@@ -2,8 +2,6 @@
 
 ;;;; * Introduction
 
-;;;; FiveAM is A simple Common Lisp unit testing library.
-
 ;;;; FiveAM is a testing framework. It takes care of all the boring
 ;;;; bookkeeping associated with managing a test framework allowing
 ;;;; the developer to focus on writing tests and code.
@@ -11,13 +9,13 @@
 ;;;; FiveAM was designed with the following premises:
 
 ;;;; - Defining tests should be about writing tests, not
-;;;;   infrastructure. The developer should be able to focus on what
-;;;;   they're testing, not the testing framework.
+;;;; infrastructure. The developer should be able to focus on what
+;;;; they're testing, not the testing framework.
 
 ;;;; - Interactive testing is the norm. Common Lisp is an interactive
-;;;;  development environment, the testing environment should allow
-;;;;  the developer to quickly and easily redefine, change, remove
-;;;;  and run tests.
+;;;; development environment, the testing environment should allow the
+;;;; developer to quickly and easily redefine, change, remove and run
+;;;; tests.
 
 (defpackage :it.bese.FiveAM
   (:use :common-lisp :it.bese.arnesi)
@@ -26,10 +24,12 @@
            #:make-suite
 	   #:def-suite
 	   #:in-suite
+	   #:in-suite*
 	   #:make-test
 	   #:test
 	   #:get-test
 	   #:rem-test
+           #:test-names
 	   ;; fixtures
 	   #:make-fixture
 	   #:def-fixture
@@ -38,6 +38,7 @@
 	   #:rem-fixture
 	   ;; running checks
            #:is
+           #:is-every
            #:is-true
            #:is-false
            #:signals
@@ -46,14 +47,24 @@
 	   #:pass
 	   #:fail
 	   #:*test-dribble*
+           #:for-all
+           #:gen-integer
+           #:gen-float
+           #:gen-character
+           #:gen-string
+           #:gen-list
+           #:gen-buffer
+           #:gen-one-element
 	   ;; running tests
            #:run
            #:run-all-tests
            #:explain
+           #:explain!
            #:run!
            #:!
            #:!!
            #:!!!
+           #:*run-test-when-defined*
 	   #:*debug-on-error*
            #:*debug-on-failure*
            #:*verbose-failures*))
@@ -66,40 +77,18 @@
 
 ;;;;@include "check.lisp"
 
-;;;;@include "test.lisp"
+;;;;@include "random.lisp"
 
 ;;;;@include "fixture.lisp"
 
+;;;;@include "test.lisp"
+
 ;;;;@include "suite.lisp"
 
 ;;;;@include "run.lisp"
 
 ;;;;@include "explain.lisp"
 
-;;;; * Examples
-
-#| (def-suite my-suite :description "My Example Suite")
-
- (in-suite my-suite)
-
- (test my-tests
-  "Example"
-  (is (= 4 (+ 2 2)) "2 plus 2 wasn't equal to 4 (using #'= to test equality)")
-  (is (= 0 (+ -1 1)))
-  (throws (error "Trying to add 4 to FOO didn't signal an error")
-     (+ 'foo 4))
-  (is (= 0 (+ 1 1)) "this should have failed"))
-
- (run! 'my-suite)
-;; Running suite MY-SUITE
-..F.
-Suite My Example Suite ran 4 tests (3/0/1) - 1 FAILED -
-Failed Tests:
-MY-TESTS FAILED: (+ 1 1) was not = to 0 (returned 2 instead)
-   Description: Example.
-   Message:     this should have failed
-NIL |#
-
 ;;;; * Colophon
 
 ;;;; This documentaion was written by Edward Marco Baringer