r5062: return from san diego

[kmrcl.git] / tests.lisp

diff --git a/tests.lisp b/tests.lisp
index bdeaa27885a29e1e64864c8edfd655bc231955c5..f9df70328deb191d152555fdbf3ff6d5b7815a63 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,12 +7,13 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.14 2003/05/11 21:51:44 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,7 +21,6 @@
 (rem-all-tests)
 
 
-
 (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")
@@ -37,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")
@@ -94,10 +93,21 @@
 (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))
-                    '(0 1 2 3 4 5 6 7 8 9)) (1 3 5 7 9))
+(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*)))