ASDF package definition changes.

The changes here are done out of frustration and desperation. SLIME
was in a right mess (caching issue I assume) so I started changing
things in here to try and fix it. This was before I stumbled on the
'restart Emacs/SLIIME' solution. Becuase it's now working, I've just
kept the changes in place. The relief of getting 'asdf:test-system'
working after about two hours of faffing was enough for me to not
touch this file again. I might come back to this at a later date --
see if/how it needs cleaning up. I might just skip it and start a new
project -- this is a learning exercise after all.

ritherdon-rest.asd

@@ -7,11 +7,12 @@
   :license  "MIT"
   :version "0.0.1"
   :serial t
-  :in-order-to ((test-op (test-op "ritherdon-rest/tests")))
-  :depends-on (:drakma :cl-json)
+  :depends-on (:drakma
+	       :cl-json)
   :pathname "src/"
   :components ((:file "package")
-               (:file "ritherdon-rest")))
+	       (:file "ritherdon-rest"))
+  :in-order-to ((test-op (test-op :ritherdon-rest/tests))))
 
 ;; The use of '...rest/tests' was because of a warning when trying to
 ;; run the code in SLIME.
@@ -20,11 +21,13 @@
   :author "craig@craigoates.net"
   :license  "MIT"
   :version "0.0.1"
-  :depends-on (:ritherdon-rest :fiveam)
+  :serial t
+  :depends-on (:ritherdon-rest
+	       :fiveam)
+  :pathname "tests/"
+  :components ((:file "package")
+	       (:file "main"))  
   :perform (test-op (o s)
-		    (uiop:symbol-call :fiveam :run!
-		    'ritherdon-rest-tests:all-tests))
-  :components ((:module "tests"
-		:serial t
-		:components ((:file "package")
-			     (:file "ritherdon-rest-tests")))))
+		    (uiop:symbol-call :ritherdon-rest-tests :test-quasi)))
+
+			     

tests/package.lisp

@@ -1,6 +1,7 @@
-;;;; package.lisp
+;;;; tests/package.lisp
 
 (defpackage #:ritherdon-rest-tests
   (:use #:cl #:fiveam)
   (:export #:run!
-	   #:all-tests))
+	   #:all-tests
+	   #:test-quasi))

tests/ritherdon-rest-tests.lisp

@@ -1,35 +0,0 @@
-;;;; ritherdon-rest-tests.lisp
-
-(in-package #:ritherdon-rest-tests)
-
-(def-suite all-tests
-  :description "The master suite of all ritherdon-rest tests.")
-
-(in-suite all-tests)
-
-;; These two examples show the 'full' call to the fiveAm test
-;; functions. This is just for reference. The 'namespace' is already
-;; 'imported' in 'package.lisp'.
-
-;; (fiveam:test sum-1
-;;   (fiveam:is (= 3 (+ 1 2))))
-
-;; (fiveam:run!)
-
-;; How you would normally create the tests -- with fiveAM already
-;; set-up in 'package.lisp' and not needing to be explicit about it
-;; here. This is similar to 'using static' in C#.
-
-(defun test-quasi()
-  (run! 'all-tests))
-
-(test dummy-tests
-  "Just a placeholder."
-  (is (listp (list 1 2)))
-  (is (= 5 (+ 2 3)))
-  (is (< 4 (+ 100 400))))
-
-(test dummy-tests-two
-  "This is another placeholder test.
-This is just to make sure everything is set-up properly."
-  (is (equal 4 4)))