examples/failing-spec.lisp @@ -6,7 +6,8 @@ tests.rb bdd-example.lisp outtakes.lisp +agenda.txt # output files *.fasl -spec.html +examples/*.html .gitignore @@ -1,6 +1,6 @@ (define-specification "plus" () ("should add two numbers" - (=> (+ 1 2) should = 4)) + (=> (+ 1 2) should = 3)) ("should add three numbers" (=> (+ 1 2 3) should = 6)) ("should be commutative" examples/plus-spec.lisp @@ -4,6 +4,11 @@ ;;; Formatters ;;; +(defvar *html-spec-parameter-pathname* + (merge-pathnames "template.html" *load-pathname*) + "The :FORMAT 'HTML option to RUN-SPECIFICATION starts with this.") + + (define-class specification-formatter) (define-class text-specification-formatter (specification-formatter)) @@ -15,7 +20,8 @@ (format t "~%~%") (loop for result in (specification-results-failures results) for i upfrom 1 - do (format output-stream "~D)~%~A~%~A~%~%" i (ref1 result :condition) pathname)) + do (format output-stream "~D)~%~S FAILED~%~A~%~A~%~%" + i (ref1 result :name) (ref1 result :condition) pathname)) (format output-stream "Finished in ~F seconds~%~%" (specification-results-elapsed-time results)) (format output-stream "~D example~:P, ~D failure~:P" @@ -24,14 +30,10 @@ (define-class html-specification-formatter (specification-formatter)) -(defvar *html-spec-parameter-pathname* - (merge-pathnames "template.html" *load-pathname*) - "The :FORMAT 'HTML option to RUN-SPECIFICATION starts with this.") - (define-method (format-specification-results (formatter html-specification-formatter) results - &key + &key pathname &allow-other-keys) ;; for now, the group hierarchy must be exactly one deep (labels ((translate-results (results depth) @@ -49,7 +51,9 @@ elapsed-time) :basename 'specification-results))) (setf (rref dict 'name) - (specification-name (specification-results-specification (first (specification-results-children results)))) + (specification-name + (specification-results-specification + (first (specification-results-children results)))) (rref dict 'children) (loop for child in (specification-results-children results) collect (translate-results child (1+ depth)))) @@ -71,5 +75,5 @@ ;; it's already in dictionary form example)) (copy-template *html-spec-parameter-pathname* - (merge-pathnames "spec.html" *html-spec-parameter-pathname*) + (merge-pathnames (make-pathname :type "html") pathname) (translate-results results 0)))) formatters.lisp @@ -157,7 +157,7 @@ show incremental progress during execution." (*run-specifications* nil) (*specifications* nil)) ,@body - *specifications*)) + (nreverse *specifications*))) ;; FIXME: this shouldn't be in the same gf as the method on SPECIFICATION (define-method (run-specification (pathname pathname) specify.lisp @@ -108,7 +108,7 @@ </head> <body> <div class="clspec-report"> - <div id="clspec-header" class="failed"> + <div id="clspec-header" class="${~[passed~;~:;failed~] | failures-count}"> <h1>CL-spec Results</h1> <div id="summary"> @@ -121,17 +121,13 @@ ${children => <div class="example_group"> <dl> - <dt class="failed">${name}</dt> + <dt class="${~[passed~;~:;failed~] | failures-count}">${name}</dt> ${examples => - <dd class="spec passed"><span class="passed_spec_name">${name}</span></dd> -$} - <dd class="spec failed"> - <span class="failed_spec_name">should fail</span> - <div class="failure" id="failure_1"> - <div class="message"><pre>expected: 2, - got: 1 (using ==)</pre></div> - </div> + <dd class="spec ${~:[failed~;passed~] | success}"> + <span>${name}</span> + <div class="message"><pre>${~@[~A~] | condition}</pre></div> </dd> +$} </dl> </div> $} template.html specs/fail-spec.lisp 25a9d6585673e18268f395d16c7328483180a0b2 Oliver Steele steele@osteele.com http://github.com/osteele/cl-spec/commit/c269ea24852e1bb6bfa3624bdb3bb5e505cbbe80 c269ea24852e1bb6bfa3624bdb3bb5e505cbbe80

2008-01-07T20:01:39-08:00

html output works now 1bdd36d575bcb9a20f2e72d6c10881399dae2617 Oliver Steele steele@osteele.com