factor: trim using lists

[factor.git] / basis / core-text / core-text-tests.factor

diff --git a/basis/core-text/core-text-tests.factor b/basis/core-text/core-text-tests.factor
index 93f92391c8d30d7a37c25b1a80ab5d45a0f876b5..ce973b2abe21f78de1845a34e9a2344075a46f68 100644 (file)
--- a/basis/core-text/core-text-tests.factor
+++ b/basis/core-text/core-text-tests.factor
@@ -1,28 +1,28 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: tools.test core-text core-foundation
-core-foundation.dictionaries destructors
-arrays kernel generalizations math accessors
-core-foundation.utilities
+USING: tools.test core-text core-text.fonts core-foundation
+core-foundation.dictionaries destructors arrays kernel
+generalizations math accessors core-foundation.utilities
 combinators hashtables colors ;
 IN: core-text.tests
 
 : test-font ( name -- font )
     [ >cf &CFRelease 0.0 f CTFontCreateWithName ] with-destructors ;
 
-[ ] [ "Helvetica" test-font CFRelease ] unit-test
+{ } [ "Helvetica" test-font CFRelease ] unit-test
 
-[ ] [
+{ } [
     [
         kCTFontAttributeName "Helvetica" test-font &CFRelease 2array 1array
         <CFDictionary> &CFRelease drop
     ] with-destructors
 ] unit-test
 
-: test-typographic-bounds ( string font -- ? )
+:: test-typographic-bounds ( string font -- ? )
     [
-        test-font &CFRelease white <CTLine> &CFRelease
-        line-typographic-bounds {
+        font test-font &CFRelease :> ctfont
+        string ctfont COLOR: white <CTLine> &CFRelease :> ctline
+        ctfont ctline compute-line-metrics {
             [ width>> float? ]
             [ ascent>> float? ]
             [ descent>> float? ]
@@ -30,8 +30,8 @@ IN: core-text.tests
         } cleave and and and
     ] with-destructors ;
 
-[ t ] [ "Hello world" "Helvetica" test-typographic-bounds ] unit-test
+{ t } [ "Hello world" "Helvetica" test-typographic-bounds ] unit-test
 
-[ t ] [ "Hello world" "Chicago" test-typographic-bounds ] unit-test
+{ t } [ "Hello world" "Chicago" test-typographic-bounds ] unit-test
 
-[ t ] [ "日本語" "Helvetica" test-typographic-bounds ] unit-test
\ No newline at end of file
+{ t } [ "日本語" "Helvetica" test-typographic-bounds ] unit-test