X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=tests.lisp;h=d5c079f7692867c1b292b54b55cc10c7ef68442a;hp=467a02da24c42556513db07366d10db5da3b84e8;hb=b30c91702a68ca81402b646bd7468bfc75c5a804;hpb=4de7f25a69c218303f170314ac26217770a531ed

diff --git a/tests.lisp b/tests.lisp
index 467a02d..d5c079f 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.2 2003/04/28 23:51:59 kevin Exp $
+;;;; $Id: tests.lisp,v 1.6 2003/05/04 14:52:10 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -20,21 +20,17 @@
 (rem-all-tests)
 
 
-(when (find-package '#:kmr-mop)
-  (pushnew :kmrtest-mop cl:*features*))
 
-(deftest p1 t t)
-
-(deftest str.0 (string-replace-chars-strings "" nil) "")
-(deftest str.1 (string-replace-chars-strings "abcd" nil) "abcd")
-(deftest str.2 (string-replace-chars-strings "abcd" nil) "abcd")
-(deftest str.3 (string-replace-chars-strings "abcd" '((#\j . "ef"))) "abcd")
-(deftest str.4 (string-replace-chars-strings "abcd" '((#\a . "ef"))) "efbcd")
+(deftest str.0 (substitute-chars-strings "" nil) "")
+(deftest str.1 (substitute-chars-strings "abcd" nil) "abcd")
+(deftest str.2 (substitute-chars-strings "abcd" nil) "abcd")
+(deftest str.3 (substitute-chars-strings "abcd" '((#\j . "ef"))) "abcd")
+(deftest str.4 (substitute-chars-strings "abcd" '((#\a . "ef"))) "efbcd")
 (deftest str.5
-    (string-replace-chars-strings "abcd" '((#\a . "ef") (#\j . "ghi")))
+    (substitute-chars-strings "abcd" '((#\a . "ef") (#\j . "ghi")))
   "efbcd")
 (deftest str.6
-    (string-replace-chars-strings "abcd" '((#\a . "ef") (#\d . "ghi")))
+    (substitute-chars-strings "abcd" '((#\a . "ef") (#\d . "ghi")))
   "efbcghi")
 
 (deftest str.7 (escape-xml-string "") "")
@@ -42,6 +38,25 @@
 (deftest str.9 (escape-xml-string "ab&cd") "ab&cd")
 (deftest str.10 (escape-xml-string "ab&cd<") "ab&amp;cd&lt;")
 (deftest str.11 (escape-xml-string "ab&c><") "ab&amp;c&gt;&lt;")
+(deftest str.12 (string-trim-last-character "") "")
+(deftest str.13 (string-trim-last-character "a") "")
+(deftest str.14 (string-trim-last-character "ab") "a")
+(deftest str.15 (nstring-trim-last-character "") "")
+(deftest str.16 (nstring-trim-last-character "a") "")
+(deftest str.17 (nstring-trim-last-character "ab") "a")
+
+(deftest str.18 (delimited-string-to-list "ab|cd|ef") '("ab" "cd" "ef"))
+(deftest str.19 (ndelimited-string-to-list "ab|cd|ef") '("ab" "cd" "ef"))
+(deftest str.20 (delimited-string-to-list "") nil)
+(deftest str.21 (ndelimited-string-to-list "") nil)
+(deftest str.22 (delimited-string-to-list "ab") '("ab"))
+(deftest str.23 (ndelimited-string-to-list "ab") '("ab"))
+(deftest str.24 (delimited-string-to-list "ab|") '("ab" ""))
+(deftest str.25 (ndelimited-string-to-list "ab|") '("ab" ""))
+  
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-package '#:kmr-mop)
+    (pushnew :kmrtest-mop cl:*features*)))
 
 #+kmrtest-mop
 (progn
@@ -81,4 +96,5 @@
   )   ;; kmrcl-mop
 
 #+kmrtest-mop
-(setq cl:*features* (delete :kmrtest-mop cl:*features*))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setq cl:*features* (delete :kmrtest-mop cl:*features*)))