X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fatoifl.lisp;h=4f079b7ba608198b6a16b9ded389ab64a3dd1407;hb=01066b26a984761a2c9372871bba3697984a4456;hp=47c194cf9e4fe5f9430ccb746e245e5810b31018;hpb=a95b9a217335917d96b8c0cced4f49c3e4846115;p=uffi.git

diff --git a/tests/atoifl.lisp b/tests/atoifl.lisp
index 47c194c..4f079b7 100644
--- a/tests/atoifl.lisp
+++ b/tests/atoifl.lisp
@@ -2,31 +2,26 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          atoifl.cl
+;;;; Name:          atoifl.lisp
 ;;;; Purpose:       UFFI Example file to atoi/atof/atol
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: atoifl.lisp,v 1.1 2002/09/30 10:02:36 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package :cl-user)
+(in-package #:uffi-tests)
 
-(uffi:def-function ("atoi" c-atoi) 
+(uffi:def-function ("atoi" c-atoi)
     ((str :cstring))
   :returning :int)
 
-(uffi:def-function ("atol" c-atol) 
+(uffi:def-function ("atol" c-atol)
     ((str :cstring))
   :returning :long)
 
-(uffi:def-function ("atof" c-atof) 
+(uffi:def-function ("atof" c-atof)
     ((str :cstring))
   :returning :double)
 
@@ -39,21 +34,7 @@
   "Returns a double float from a string."
   (uffi:with-cstring (str-cstring str)
     (c-atof str-cstring)))
-  
-#+examples-uffi
-(progn
-  (flet ((print-results (str)
-	   (format t "~&(atoi ~S) => ~S" str (atoi str))))
-    (print-results "55")))
-
 
-#+test-uffi
-(progn
-  (util.test:test (atoi "123") 123 :test #'eql
-		  :fail-info "Error with atoi")
-  (util.test:test (atoi "") 0 :test #'eql
-		  :fail-info "Error with atoi")
-  (util.test:test (atof "2.23") 2.23d0 :test #'eql
-		  :fail-info "Error with atof")
-  )
-  
+(deftest :atoi.1 (atoi "123") 123)
+(deftest :atoi.2 (atoi "") 0)
+(deftest :atof.3 (atof "2.23") 2.23d0)