r5097: *** empty log message ***

[kmrcl.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index d61d4391d7c939a3a204be8c6e2c0736414283a8..b419fed4a70619f043d2d58104f295167d322940 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.17 2003/06/07 05:45:14 kevin Exp $
+;;;; $Id: tests.lisp,v 1.18 2003/06/12 11:10:38 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -102,10 +102,6 @@
   (xml-tag-contents "tag1" "<tag>Test</tag>")
   nil nil nil)
 
-(deftest pxml.1o
-  (kmrcl::xml-tag-contents-old "tag1" "<tag>Test</tag>")
-  nil nil)
-
 (deftest pxml.2
   (xml-tag-contents "tag" "<tag>Test</tag>")
   "Test" 15 nil)
@@ -162,6 +158,17 @@
 (deftest stlsd.9 (string-to-list-skip-delimiter "ab,,c,," #\,) ("ab" "c"))
 (deftest stlsd.10 (string-to-list-skip-delimiter " ab") ("ab"))
 
+(deftest csc.1 (count-string-char "" #\a) 0)
+(deftest csc.2 (count-string-char "abc" #\d) 0)
+(deftest csc.3 (count-string-char "abc" #\b) 1)
+(deftest csc.4 (count-string-char "abcb" #\b) 2)
+
+(deftest duqs.1 (decode-uri-query-string "") "")
+(deftest duqs.2 (decode-uri-query-string "abc") "abc")
+(deftest duqs.3 (decode-uri-query-string "abc+") "abc ")
+(deftest duqs.4 (decode-uri-query-string "abc+d") "abc d")
+(deftest duqs.5 (decode-uri-query-string "abc%20d") "abc d")
+
 ;;; MOP Testing
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -170,35 +177,33 @@
 
 #+kmrtest-mop
 (progn
+  (makunbound 'credit-rating)
+  (makunbound 'monitored-credit-rating)
+  
   (defclass credit-rating ()
     ((level :attributes (date-set time-set))
      (id :attributes (person-setting)))
     (:metaclass attributes-class))
-  (defparameter cr nil)
   
   (defclass monitored-credit-rating (credit-rating)
     ((level :attributes (last-checked interval date-set))
      (cc :initarg :cc)
      (id :attributes (verified)))
     (:metaclass attributes-class))
-  (defparameter mcr (make-instance 'monitored-credit-rating))
 
   (deftest attrib.mop.1
-      (progn
-       (setq cr (make-instance 'credit-rating))
+      (let ((cr (make-instance 'credit-rating)))
        (slot-attribute cr 'level 'date-set))
       nil)
 
   (deftest attrib.mop.2
-      (progn
-       (setq cr (make-instance 'credit-rating))
+      (let ((cr (make-instance 'credit-rating)))
        (setf (slot-attribute cr 'level 'date-set) "12/15/1990")
        (slot-attribute cr 'level 'date-set))
     "12/15/1990")
 
   (deftest attrib.mop.3
-      (progn
-       (setq mcr (make-instance 'monitored-credit-rating))
+      (let ((mcr (make-instance 'monitored-credit-rating)))
        (setf (slot-attribute mcr 'level 'date-set) "01/05/2002")
        (slot-attribute mcr 'level 'date-set))
     "01/05/2002")