Updated with upstream update

plug-ins/script-fu/test/tests/PDB/image/image-ops.scm

@@ -36,7 +36,11 @@
 ; but then seems to slow down testing
 ; unless we scale down afterwards.
 ; This seems glacial if not scaled to 1,1 prior.
-(assert `(pika-image-scale ,testImage 524288 524288))
+; FIXME commented out, crashes with:
+; (pika-2.99:129): GLib-GObject-CRITICAL **: 13:19:28.145:
+; value "524288.000000" of type 'gdouble' is invalid or out of range for property 'x' of type 'gdouble'
+; but docs say 524288 is the max
+; (assert `(pika-image-scale ,testImage 524288 524288))
 
 ; down to min
 (assert `(pika-image-scale ,testImage 1 1))

plug-ins/script-fu/test/tests/PDB/item/item.scm

@@ -135,9 +135,10 @@
 (define testLayer (vector-ref (cadr (pika-image-get-layers testImage ))
                                   0))
 (define testSelection (car (pika-image-get-selection testImage)))
+(define testFont (car (pika-context-get-font)))
 (define
   testTextLayer
-   (car (pika-text-fontname
+   (car (pika-text-font
               testImage
               -1     ; drawable.  -1 means NULL means create new text layer
               0 0   ; coords
@@ -145,8 +146,7 @@
               1     ; border size
               1     ; antialias true
               31    ; fontsize
-              PIXELS  ; size units.  !!! See UNIT-PIXEL
-              "fontName" )))
+              testFont )))
 (define testChannel (car (pika-channel-new
             testImage    ; image
             23 24          ; width, height

plug-ins/script-fu/test/tests/PDB/pdb.scm

@@ -21,9 +21,7 @@
 (testing:load-test "layer-mask.scm")
 ; TODO layer stack ops
 
-; Commented out until PDB is fixed
-; Known to crash PIKA
-;(testing:load-test "text-layer-new.scm")
+(testing:load-test "text-layer-new.scm")
 
 (testing:load-test "vectors-new.scm")
 (testing:load-test "channel-new.scm")
@@ -36,9 +34,7 @@
 ; Drawable and Item are superclasses
 ; Testing Drawable and Item uses extant instances;
 ; must be after instances of subclasses are created.
-; commented out until text-get-fontname is fixed
-; Known to crash PIKA
-;(testing:load-test "item.scm")
+(testing:load-test "item.scm")
 ; todo item ordering operations
 
 ; TODO drawable

plug-ins/script-fu/test/tests/PDB/text-layer/text-layer-new.scm

@@ -1,7 +1,7 @@
 ; tests of TextLayer class
 
 ; !!! Some methods tested here are named strangely:
-; text-fontname returns a new TextLayer
+; text-font returns a new TextLayer
 
 
 
@@ -11,23 +11,21 @@
 ; Require image has no layer
 (define testImage (car (pika-image-new 21 22 RGB)))
 
+(define testFont (car (pika-context-get-font)))
+
 ; setup (not an assert )
 (define
     testTextLayer
        (car (pika-text-layer-new
               testImage
               "textOfTestTextLayer" ; text
-              "fontName" ; fontname
+              testFont ; font
               30 ; fontsize
               UNIT-PIXEL)))
 
 
-; !!!! fontName is not valid
-; The text displays anyway, using some font family, without error.
-; The docs don't seem to say which font family is used.
-; TODO better documentation
-; The text layer still says it is using the given font family.
-; TODO yield actual font family used.
+; TOTO test if font is not valid or NULL
+
 
 ; !!! UNIT-PIXEL PikaUnitsType is distinct from PIXELS PikaSizeType
 
@@ -77,9 +75,9 @@
 ; text
 (assert `(string=? (car (pika-text-layer-get-text ,testTextLayer))
                         "textOfTestTextLayer"))
-; font
-(assert `(string=? (car (pika-text-layer-get-font ,testTextLayer))
-                        "fontName"))
+; font, numeric ID's equal
+(assert `(= (car (pika-text-layer-get-font ,testTextLayer))
+            ,testFont))
 ; font-size
 (assert `(= (car (pika-text-layer-get-font-size ,testTextLayer))
             30))
@@ -100,15 +98,14 @@
 
 ;                  misc method
 
-; pika-text-get-extents-fontname
+; pika-text-get-extents-font
 ; Yields extent of rendered text, independent of image or layer.
 ; Extent is (width, height, ascent, descent) in unstated units, pixels?
 ; Does not affect image.
-(assert `(= (car (pika-text-get-extents-fontname
+(assert `(= (car (pika-text-get-extents-font
               "zed" ; text
               32    ; fontsize
-              POINTS  ; size units.  !!! See UNIT-PIXEL
-              "fontName" )) ; fontname
+              ,testFont ))
             57))
 ; usual result is (57 38 30 -8)
 
@@ -117,11 +114,11 @@
 ;           alternate method for creating text layer
 
 
-; pika-text-fontname creates text layer AND inserts it into image
+; pika-text-font creates text layer AND inserts it into image
 ; setup, not assert
 (define
   testTextLayer2
-   (car (pika-text-fontname
+   (car (pika-text-font
               testImage
               -1     ; drawable.  -1 means NULL means create new text layer
               0 0   ; coords
@@ -129,11 +126,10 @@
               1     ; border size
               1     ; antialias true
               31    ; fontsize
-              PIXELS  ; size units.  !!! See UNIT-PIXEL
-              "fontName" )))
+              testFont )))
 
 
-; error to insert layer created by pika-text-fontname
+; error to insert layer created by pika-text-font
 ; TODO make the error message matching by prefix only
 (assert-error `(pika-image-insert-layer
                   ,testImage