X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=f9df70328deb191d152555fdbf3ff6d5b7815a63;hb=4a5b626f01db51b02f969adb33ddad6aa9ee303a;hp=56eb2a574b8da402400189ada58fb748c7de53aa;hpb=4f21397f1d96da80fbac6f587cb384e56208b497;p=kmrcl.git

diff --git a/tests.lisp b/tests.lisp
index 56eb2a5..f9df703 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,12 +7,13 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.4 2003/04/29 00:49:09 kevin Exp $
+;;;; $Id: tests.lisp,v 1.15 2003/06/06 21:59:30 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
+(in-package #:cl)
 (defpackage #:kmrcl-tests
   (:use #:kmrcl #:cl #:rtest))
 (in-package #:kmrcl-tests)
@@ -20,11 +21,6 @@
 (rem-all-tests)
 
 
-(when (find-package '#:kmr-mop)
-  (pushnew :kmrtest-mop cl:*features*))
-
-(deftest p1 t t)
-
 (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")
@@ -41,7 +37,6 @@
 (deftest str.8 (escape-xml-string "abcd") "abcd")
 (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")
@@ -49,6 +44,74 @@
 (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 (delimited-string-to-list "ab|cd|ef" #\| t)
+					  ("ab" "cd" "ef"))
+(deftest str.20 (delimited-string-to-list "") (""))
+(deftest str.21 (delimited-string-to-list "" #\space t) (""))
+(deftest str.22 (delimited-string-to-list "ab") ("ab"))
+(deftest str.23 (delimited-string-to-list "ab" #\space t) ("ab"))
+(deftest str.24 (delimited-string-to-list "ab|" #\|) ("ab" ""))
+(deftest str.25 (delimited-string-to-list "ab|" #\| t) ("ab"))
+
+(deftest apsl.1 (append-sublists '((a b) (c d))) (a b c d))
+(deftest apsl.2 (append-sublists nil) nil)
+(deftest apsl.3 (append-sublists '((a b))) (a b))
+(deftest apsl.4 (append-sublists '((a))) (a))
+(deftest apsl.5 (append-sublists '((a) (b) (c d (e f g)))) (a b c d (e f g)))
+
+(deftest pss.0 (with-output-to-string (s) (print-separated-strings s "|" nil)) 
+  "")
+
+(deftest pss.1
+    (with-output-to-string (s) (print-separated-strings s "|" '("ab")) )
+  "ab")
+
+(deftest pss.2
+    (with-output-to-string (s) (print-separated-strings s "|" '("ab" "cd")))
+    "ab|cd")
+
+(deftest pss.3
+    (with-output-to-string (s) (print-separated-strings s "|" '("ab" "cd") nil))
+    "ab|cd")
+
+(deftest pss.4
+    (with-output-to-string (s)
+      (print-separated-strings s "|" '("ab" "cd") nil nil))
+    "ab|cd")
+
+(deftest pss.5
+    (with-output-to-string (s)
+      (print-separated-strings s "|" '("ab" "cd") nil '("ef") nil))
+    "ab|cd|ef")
+
+(deftest css.0 (concat-separated-strings "|" nil) "")
+(deftest css.1 (concat-separated-strings "|" nil nil) "")
+(deftest css.2 (concat-separated-strings "|" '("ab")) "ab")
+(deftest css.3 (concat-separated-strings "|" '("ab" "cd")) "ab|cd")
+(deftest css.4 (concat-separated-strings "|" '("ab" "cd") nil) "ab|cd")
+(deftest css.5 (concat-separated-strings "|" '("ab" "cd") nil '("ef")) "ab|cd|ef")
+
+(deftest f.1 (filter #'(lambda (x) (when (oddp x) (* x x)))
+		     '(0 1 2 3 4 5 6 7 8 9)) (1 9 25 49 81))
+(deftest an.1 (appendnew '(a b c d) '(c c e f)) (a b c d e f))
+
+
+(deftest pxml.1
+  (xml-tag-contents "tag1" "<tag>Test</tag>")
+  nil nil)
+
+(deftest pxml.1o
+  (kmrcl::xml-tag-contents-old "tag1" "<tag>Test</tag>")
+  nil nil)
+
+;;; MOP Testing
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-package '#:kmr-mop)
+    (pushnew :kmrtest-mop cl:*features*)))
+
 #+kmrtest-mop
 (progn
   (defclass credit-rating ()
@@ -87,4 +150,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*)))