From bd34097f9dcc26469f64fb5f91bbf2f5f03d25b4 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Tue, 2 Apr 2002 21:42:11 +0000
Subject: [PATCH] r1721: *** empty log message ***

---
 examples/gethostname.cl | 22 ++++++++++++++++---
 test-examples.cl        | 48 +++++++++++++++++++++--------------------
 tests/gethostname.cl    | 22 ++++++++++++++++---
 3 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/examples/gethostname.cl b/examples/gethostname.cl
index 8d005b3..49ed9de 100644
--- a/examples/gethostname.cl
+++ b/examples/gethostname.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: gethostname.cl,v 1.10 2002/04/02 21:29:45 kevin Exp $
+;;;; $Id: gethostname.cl,v 1.11 2002/04/02 21:42:11 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,6 +44,22 @@
 	(error "gethostname() failed."))))
 
 #+examples-uffi
-(format t "~&Hostname (technique 1): ~A" (gethostname))
-(format t "~&Hostname (technique 2): ~A" (gethostname2))
+(progn
+  (format t "~&Hostname (technique 1): ~A" (gethostname))
+  (format t "~&Hostname (technique 2): ~A" (gethostname2)))
+
+#+test-uffi
+(progn
+  (let ((hostname1 (gethostname))
+	(hostname2 (gethostname2)))
+    
+    (util.test:test (and (stringp hostname1) (stringp hostname2)) t
+		    :fail-info "gethostname not string")
+    (util.test:test (and (not (zerop (length hostname1)))
+			 (not (zerop (length hostname2)))) t
+			 :fail-info "gethostname length 0")
+    (util.test:test (string= hostname1 hostname1) (length hostname1)
+		    :fail-info "gethostname techniques don't match"))
+  )
+
 
diff --git a/test-examples.cl b/test-examples.cl
index 7285be8..a3f7a13 100644
--- a/test-examples.cl
+++ b/test-examples.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: test-examples.cl,v 1.9 2002/04/02 21:29:45 kevin Exp $
+;;;; $Id: test-examples.cl,v 1.10 2002/04/02 21:42:11 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,27 +22,29 @@
 (load (make-pathname :name "acl-compat-tester" :type "cl"
 		     :defaults *load-truename*))
 
-(pushnew :test-uffi cl:*features*)
-
-(flet ((load-test (name)
-	 (load (merge-pathnames
-		(make-pathname :name name 
-			       :type "cl"
-			       :directory '(:relative "examples"))
-		*load-truename*))))
-
-  (load-test "c-test-fns")
-  (load-test "arrays")
-  (load-test "union")
-  (load-test "strtol")
-  (load-test "atoifl")
-  (load-test "gettime")
-  (load-test "getenv")
-  (load-test "gethostname")
-  (load-test "getshells")
-  (load-test "compress"))
-
-(setq cl:*features* (remove :test-uffi cl:*features*))
-
 
+(defun do-tests ()
+  (pushnew :test-uffi cl:*features*)
+  (util.test:with-tests (:name "UFFI")
+;    (setq util.test:*break-on-test-failures* break)
+    (flet ((load-test (name)
+	     (load (merge-pathnames
+		    (make-pathname :name name 
+				   :type "cl"
+				   :directory '(:relative "examples"))
+		    *load-truename*))))
       
+      (load-test "c-test-fns")
+      (load-test "arrays")
+      (load-test "union")
+      (load-test "strtol")
+      (load-test "atoifl")
+      (load-test "gettime")
+      (load-test "getenv")
+      (load-test "gethostname")
+      (load-test "getshells")
+      (load-test "compress"))
+    (setq cl:*features* (remove :test-uffi cl:*features*))))
+
+(do-tests)
+
diff --git a/tests/gethostname.cl b/tests/gethostname.cl
index 8d005b3..49ed9de 100644
--- a/tests/gethostname.cl
+++ b/tests/gethostname.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: gethostname.cl,v 1.10 2002/04/02 21:29:45 kevin Exp $
+;;;; $Id: gethostname.cl,v 1.11 2002/04/02 21:42:11 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -44,6 +44,22 @@
 	(error "gethostname() failed."))))
 
 #+examples-uffi
-(format t "~&Hostname (technique 1): ~A" (gethostname))
-(format t "~&Hostname (technique 2): ~A" (gethostname2))
+(progn
+  (format t "~&Hostname (technique 1): ~A" (gethostname))
+  (format t "~&Hostname (technique 2): ~A" (gethostname2)))
+
+#+test-uffi
+(progn
+  (let ((hostname1 (gethostname))
+	(hostname2 (gethostname2)))
+    
+    (util.test:test (and (stringp hostname1) (stringp hostname2)) t
+		    :fail-info "gethostname not string")
+    (util.test:test (and (not (zerop (length hostname1)))
+			 (not (zerop (length hostname2)))) t
+			 :fail-info "gethostname length 0")
+    (util.test:test (string= hostname1 hostname1) (length hostname1)
+		    :fail-info "gethostname techniques don't match"))
+  )
+
 
-- 
2.34.1