r4691: Auto commit for Debian build

diff --git a/debian/changelog b/debian/changelog
index 4d87fc01323365b53b60f9b07567f7f966a3ac66..6ba7b3c07481ea07e221f8d5357ccc778ba37390 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ cl-hyperobject (2.7.0-1) unstable; urgency=low
   * Add regression testing
   * Depend on cl-rt package
   * Use compat file rather than DH_COMPAT
-
+  * Rework compute-effective-slot-definition
+  
  -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 28 Apr 2003 11:40:27 -0600
 
 cl-hyperobject (2.6.5-1) unstable; urgency=low

diff --git a/tests.lisp b/tests.lisp
index 8ff7fba4a2d30b1f2b877021d7bc340cf1e4a744..10f98bf6a747f3e2d024216439245b92d7e92916 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.3 2003/04/28 21:11:55 kevin Exp $
+;;;; $Id: tests.lisp,v 1.4 2003/04/29 09:47:10 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -120,11 +120,61 @@
       Fax 123-0005
 ")
 
-(deftest p3 (view-to-string mary :category t)
-  "")
+(deftest p3 (view-to-string mary :category :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 t)
-  "")
+(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>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>
+")