GOOPS cosmetics

[bpt/guile.git] / test-suite / tests / encoding-iso88597.test

diff --git a/test-suite/tests/encoding-iso88597.test b/test-suite/tests/encoding-iso88597.test
index eae3fab..e88b9d3 100644 (file)
--- a/test-suite/tests/encoding-iso88597.test
+++ b/test-suite/tests/encoding-iso88597.test
@@ -1,6 +1,6 @@
 ;;;; encoding-iso88697.test --- test suite for Guile's string encodings    -*- mode: scheme; coding: iso-8859-7 -*-
 ;;;;
-;;;; Copyright (C) 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -20,16 +20,13 @@
   #:use-module (test-suite lib)
   #:use-module (srfi srfi-1))
 
-(define exception:conversion
-  (cons 'misc-error "^cannot convert to output locale"))
-
 ;; Create a string from integer char values, eg. (string-ints 65) => "A"
 (define (string-ints . args)
   (apply string (map integer->char args)))
 
-(define oldlocale #f)
-(if (defined? 'setlocale)
-    (set! oldlocale (setlocale LC_ALL "")))
+(when (defined? 'setlocale)
+  (setlocale LC_ALL ""))
+
 (define ascii-a (integer->char 65))     ; LATIN CAPITAL LETTER A
 (define a-acute (integer->char #x00c1)) ; LATIN CAPITAL LETTER A WITH ACUTE
 (define alpha (integer->char #x03b1))   ; GREEK SMALL LETTER ALPHA
@@ -98,16 +95,16 @@
 (with-test-prefix "string length"
 
   (pass-if "s1"
-          (eq? (string-length s1) 4))
+          (eqv? (string-length s1) 4))
   
   (pass-if "s2"
-          (eq? (string-length s2) 3))
+          (eqv? (string-length s2) 3))
   
   (pass-if "s3"
-          (eq? (string-length s3) 8))
+          (eqv? (string-length s3) 8))
   
   (pass-if "s4" 
-          (eq? (string-length s4) 3)))
+          (eqv? (string-length s4) 3)))
 
 (with-test-prefix "internal encoding"
 
@@ -160,17 +157,13 @@
   (pass-if "1"
           (let ((á 1)
                 (ñ 2))
-            (eq? (+ á ñ) 3))))
+            (eqv? (+ á ñ) 3))))
 
 (with-test-prefix "output errors"
 
   (pass-if-exception "char #x0400"
-                    exception:conversion
+                    exception:encoding-error
                     (let ((pt (open-output-string)))
                       (set-port-encoding! pt "ISO-8859-7")
                       (set-port-conversion-strategy! pt 'error)
                       (display (string-ints #x0400) pt))))
-
-;; Reset locale
-(if (defined? 'setlocale)
-    (setlocale LC_ALL oldlocale))