X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=15dc08203d0a69c3debf75a8d337b6d5a27b8e01;hb=3a8891dc54f83ccdc16bd4094f75cab2cd3dab6e;hp=d31ac172f9582751ef36aa489cefaa3c52076335;hpb=04f829aab1e5caaefe60391f756e7a5db2d1282b;p=hyperobject.git

diff --git a/tests.lisp b/tests.lisp
index d31ac17..15dc082 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.5 2003/05/14 05:29:48 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -25,6 +25,7 @@
 	      :value-type (varchar 30)
 	      :value-constraint stringp
 	      :hyperlink find-person-by-last-name
+	      :hyperlink-parameters (("narrow" . "yes"))
 	      :null-allowed nil)
    (full-name :value-type string :stored nil)
    (dob :initarg :dob :accessor dob
@@ -39,7 +40,7 @@
    (addresses :initarg :addresses :accessor addresses
 	       :subobject t))
   (:metaclass hyperobject-class)
-  (:default-initargs :first-name "" :last-name "" :dob 0 :resume nil) 
+  (:default-initargs :first-name "" :last-name "" :dob 0 :resume nil)
   (:default-print-slots first-name last-name dob resume)
   (:user-name "Person")
   (:description "A Person")
@@ -57,7 +58,7 @@
    (phones :initarg :phones :accessor phones
 	    :subobject t))
   (:metaclass hyperobject-class)
-  (:default-initargs :title nil :street nil) 
+  (:default-initargs :title nil :street nil)
   (:user-name "Address" "Addresses")
   (:default-print-slots title street)
   (:description "An address"))
@@ -68,7 +69,8 @@
 	  :value-constraint stringp)
    (phone-number :initarg :phone-number :accessor phone-number
 		 :value-type (varchar 16)
-		 :value-constraint stringp))
+		 :value-constraint stringp
+		 :hyperlink search-phone-number))
   (:metaclass hyperobject-class)
   (:user-name "Phone Number")
   (:default-initargs :title nil :phone-number nil)
@@ -88,7 +90,7 @@
 (defparameter office (make-instance 'address :title "Office" :street "113 Main St."
 				    :phones (list office-phone-1 office-phone-2 office-phone-3)))
 
-			      
+
 (defparameter mary (make-instance 'person :first-name "Mary" :last-name "Jackson"
 			    :dob (encode-universal-time
 				  1 2 3 4 5 2000)
@@ -102,11 +104,11 @@
 
 (rem-all-tests)
 
-(deftest p1 (view-to-string mary) " Person:
+(deftest :p1 (view-to-string mary :vid :compact-text) "Person:
   Mary Jackson Thu, 4 May 2000 03:02:01 Style & Grace
 ")
 
-(deftest p2 (view-to-string mary :subobjects t) " Person:
+(deftest :p2 (view-to-string mary :subobjects t :vid :compact-text) "Person:
   Mary Jackson Thu, 4 May 2000 03:02:01 Style & Grace
   Addresses:
     Home 321 Shady Lane
@@ -120,61 +122,13 @@
       Fax 123-0005
 ")
 
-(deftest p3 (view-to-string mary :category :compact-text-labels)
-  " Person:
+(deftest :p3 (view-to-string mary :vid :compact-text-labels)
+  "Person:
   first-name Mary last-name Jackson dob Thu, 4 May 2000 03:02:01 resume Style & Grace
 ")
 
-(deftest p4 (view-to-string mary :subobjects t :category :html-labels)
-  " <p><b>Person:</b></p><div class=\"person\"><ul>
- <li> <span class=\"label\">first-name</span> <span class=\"first-name\">Mary</span> <span class=\"label\">last-name</span> <span class=\"last-name\">Jackson</span> <span class=\"label\">dob</span> <span class=\"dob\">Thu, 4 May 2000 03:02:01</span> <span class=\"label\">resume</span> <span class=\"resume\">Style & Grace</span>
-  <p><b>Addresss:</b></p><div class=\"address\"><ul>
-  <li> <span class=\"label\">title</span> <span class=\"title\">Home</span> <span class=\"label\">street</span> <span class=\"street\">321 Shady Lane</span>
-    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Voice</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9812</span>
-    </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">367-9813</span>
-    </li>
-    </ul></div>
-  </li>
-  <li> <span class=\"label\">title</span> <span class=\"title\">Office</span> <span class=\"label\">street</span> <span class=\"street\">113 Main St.</span>
-    <p><b>Phone Numbers:</b></p><div class=\"phone\"><ul>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Main line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0001</span>
-    </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Staff line</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0002</span>
-    </li>
-    <li> <span class=\"label\">title</span> <span class=\"title\">Fax</span> <span class=\"label\">phone-number</span> <span class=\"phone-number\">123-0005</span>
-    </li>
-    </ul></div>
-  </li>
-  </ul></div>
- </li>
- </ul></div>
+(deftest :p4 (view-to-string mary :vid :compact-text)
+"Person:
+  Mary Jackson Thu, 4 May 2000 03:02:01 Style & Grace
 ")
 
-(deftest p5 (view-to-string mary :subobjects t  :category :xml-link-labels)
-  " <personlist><title>Person:</title> 
- <person><label>first-name</label> <first-name>Mary</first-name> <label>last-name</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson\">Jackson</xmllink> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume>Style & Grace</resume>
-  <addresslist><title>Addresss:</title> 
-  <address><label>title</label> <title>Home</title> <label>street</label> <street>321 Shady Lane</street>
-    <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title>Voice</title> <label>phone-number</label> <phone-number>367-9812</phone-number>
-</phone>
-    <phone><label>title</label> <title>Fax</title> <label>phone-number</label> <phone-number>367-9813</phone-number>
-</phone>
-    </phonelist>
-</address>
-  <address><label>title</label> <title>Office</title> <label>street</label> <street>113 Main St.</street>
-    <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title>Main line</title> <label>phone-number</label> <phone-number>123-0001</phone-number>
-</phone>
-    <phone><label>title</label> <title>Staff line</title> <label>phone-number</label> <phone-number>123-0002</phone-number>
-</phone>
-    <phone><label>title</label> <title>Fax</title> <label>phone-number</label> <phone-number>123-0005</phone-number>
-</phone>
-    </phonelist>
-</address>
-  </addresslist>
-</person>
- </personlist>
-")