X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests.lisp;h=48139dbb53fd6c59bdb68eb6bb5edeb15fb823c1;hb=e52c58412603bcb1517da095cbbc3ac2dd1d270f;hp=dd8035a6f8f5d456df37bf7998ea96eb4debe311;hpb=c03522d6e56c265fc5b7d859d0a8b324805ddf73;p=hyperobject.git

diff --git a/tests.lisp b/tests.lisp
index dd8035a..48139db 100644
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.6 2003/05/14 05:38:09 kevin Exp $
+;;;; $Id: tests.lisp,v 1.9 2003/07/29 20:49:05 kevin Exp $
 ;;;;
 ;;;; 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
@@ -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)
@@ -120,61 +122,8 @@
       Fax 123-0005
 ")
 
-(deftest p3 (view-to-string mary :category :compact-text-labels)
+(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 p5 (view-to-string mary :subobjects t  :category :xml-link-labels)
-  "<personlist><title>Person:</title> 
-<person><label>first-name</label> <first-name><![CDATA[Mary]]></first-name> <label>last-name</label> <xmllink xlink:type=\"simple\" xlink:href=\"disp-func1?func=FIND-PERSON-BY-LAST-NAME&amp;key=Jackson\"><![CDATA[Jackson]]></xmllink> <label>dob</label> <dob><![CDATA[Thu, 4 May 2000 03:02:01]]></dob> <label>resume</label> <resume><![CDATA[Style & Grace]]></resume>
-  <addresslist><title>Addresss:</title> 
-  <address><label>title</label> <title><![CDATA[Home]]></title> <label>street</label> <street><![CDATA[321 Shady Lane]]></street>
-    <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title><![CDATA[Voice]]></title> <label>phone-number</label> <phone-number><![CDATA[367-9812]]></phone-number>
-</phone>
-    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <phone-number><![CDATA[367-9813]]></phone-number>
-</phone>
-    </phonelist>
-</address>
-  <address><label>title</label> <title><![CDATA[Office]]></title> <label>street</label> <street><![CDATA[113 Main St.]]></street>
-    <phonelist><title>Phone Numbers:</title> 
-    <phone><label>title</label> <title><![CDATA[Main line]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0001]]></phone-number>
-</phone>
-    <phone><label>title</label> <title><![CDATA[Staff line]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0002]]></phone-number>
-</phone>
-    <phone><label>title</label> <title><![CDATA[Fax]]></title> <label>phone-number</label> <phone-number><![CDATA[123-0005]]></phone-number>
-</phone>
-    </phonelist>
-</address>
-  </addresslist>
-</person>
-</personlist>
-")