fix tests broken by stride changes and library changes

gtkforphp · Sep 22, 2011 · cca72d7 · cca72d7
1 parent 7297331
commit cca72d7
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 45 deletions.
diff --git a/tests/Cairo/statusToString.phpt b/tests/Cairo/statusToString.phpt
@@ -43,7 +43,7 @@ object(CairoImageSurface)#%d (0) {
 }
 object(CairoContext)#%d (0) {
 }
-string(7) "success"
+string(21) "no error has occurred"
 Cairo::statusToString() expects exactly 1 parameter, 0 given
 Cairo::statusToString() expects exactly 1 parameter, 2 given
-Cairo::statusToString() expects parameter 1 to be long, array given
+Cairo::statusToString() expects parameter 1 to be long, array given
diff --git a/tests/CairoContext/cairo_restore.phpt b/tests/CairoContext/cairo_restore.phpt
@@ -35,11 +35,11 @@ object(CairoImageSurface)#%d (0) {
 object(CairoContext)#%d (0) {
 }
 
-Warning: cairo_restore(): cairo_restore without matching cairo_save in %s on line %d
+Warning: cairo_restore(): cairo_restore() without matching cairo_save() in %s on line %d
 
 Warning: cairo_restore() expects exactly 1 parameter, 0 given in %s on line %d
 
 Warning: cairo_restore() expects exactly 1 parameter, 2 given in %s on line %d
 CAUGHT ERROR: Argument 1 passed to cairo_restore() must be an instance of CairoContext, integer given
 
-Warning: cairo_restore() expects parameter 1 to be CairoContext, integer given in %s on line %d
+Warning: cairo_restore() expects parameter 1 to be CairoContext, integer given in %s on line %d
diff --git a/tests/CairoContext/cairo_set_dash.phpt b/tests/CairoContext/cairo_set_dash.phpt
@@ -58,8 +58,8 @@ Warning: cairo_set_dash() expects at most 3 parameters, 4 given in %s on line %d
 CAUGHT ERROR: Argument 1 passed to cairo_set_dash() must be an instance of CairoContext, integer given
 
 Warning: cairo_set_dash() expects parameter 1 to be CairoContext, integer given in %s on line %d
-CAUGHT ERROR: Argument 2 passed to cairo_set_dash() must be an array, integer given
+CAUGHT ERROR: Argument 2 passed to cairo_set_dash() must be of the type array, integer given
 
 Warning: cairo_set_dash() expects parameter 2 to be array, integer given in %s on line %d
 
-Warning: cairo_set_dash() expects parameter 3 to be double, array given in %s on line %d
+Warning: cairo_set_dash() expects parameter 3 to be double, array given in %s on line %d
diff --git a/tests/CairoContext/restore.phpt b/tests/CairoContext/restore.phpt
@@ -36,5 +36,5 @@ object(CairoImageSurface)#%d (0) {
 }
 object(CairoContext)#%d (0) {
 }
-cairo_restore without matching cairo_save
-CairoContext::restore() expects exactly 0 parameters, 1 given
+cairo_restore() without matching cairo_save()
+CairoContext::restore() expects exactly 0 parameters, 1 given
diff --git a/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_for_data.phpt b/tests/CairoSurface/CairoImageSurface/cairo_image_surface_create_for_data.phpt
@@ -22,36 +22,33 @@ cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32);
 cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 1);
 
 /* Wrong number args - 5 */
-cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 1, 1, 1, 1);
+cairo_image_surface_create_for_data('', CAIRO_FORMAT_ARGB32, 1, 1, 1);
 
 /* Wrong arg type 1 */
-cairo_image_surface_create_for_data(array(), 1, 1, 1, 1);
+cairo_image_surface_create_for_data(array(), 1, 1, 1);
 
 /* Wrong arg type 2 */
-cairo_image_surface_create_for_data('', array(), 1, 1, 1);
+cairo_image_surface_create_for_data('', array(), 1, 1);
 
 /* Wrong arg type 3 */
-cairo_image_surface_create_for_data('', 1, array(), 1, 1);
+cairo_image_surface_create_for_data('', 1, array(), 1);
 
 /* Wrong arg type 4 */
-cairo_image_surface_create_for_data('', 1, 1, array(), 1);
-
-/* Wrong arg type 5 */
-cairo_image_surface_create_for_data('', 1, 1, 1, array());
+cairo_image_surface_create_for_data('', 1, 1, array());
 ?>
 --EXPECTF--
 object(CairoImageSurface)#%d (0) {
 }
 
-Warning: cairo_image_surface_create_for_data() expects at least 4 parameters, 0 given in %s on line %d
+Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 0 given in %s on line %d
 
-Warning: cairo_image_surface_create_for_data() expects at least 4 parameters, 1 given in %s on line %d
+Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 1 given in %s on line %d
 
-Warning: cairo_image_surface_create_for_data() expects at least 4 parameters, 2 given in %s on line %d
+Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 2 given in %s on line %d
 
-Warning: cairo_image_surface_create_for_data() expects at least 4 parameters, 3 given in %s on line %d
+Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 3 given in %s on line %d
 
-Warning: cairo_image_surface_create_for_data() expects at most 5 parameters, 6 given in %s on line %d
+Warning: cairo_image_surface_create_for_data() expects exactly 4 parameters, 5 given in %s on line %d
 
 Warning: cairo_image_surface_create_for_data() expects parameter 1 to be string, array given in %s on line %d
 
@@ -60,5 +57,3 @@ Warning: cairo_image_surface_create_for_data() expects parameter 2 to be long, a
 Warning: cairo_image_surface_create_for_data() expects parameter 3 to be long, array given in %s on line %d
 
 Warning: cairo_image_surface_create_for_data() expects parameter 4 to be long, array given in %s on line %d
-
-Warning: cairo_image_surface_create_for_data() expects parameter 5 to be long, array given in %s on line %d
diff --git a/tests/CairoSurface/CairoImageSurface/createForData.phpt b/tests/CairoSurface/CairoImageSurface/createForData.phpt
@@ -43,47 +43,39 @@ try {
 
 /* Wrong number args - 5 */
 try {
-    CairoImageSurface::createForData('', CairoFormat::ARGB32, 1, 1, 1, 1);
+    CairoImageSurface::createForData('', CairoFormat::ARGB32, 1, 1, 1);
     trigger_error('We should bomb here');
 } catch (CairoException $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 1 */
 try {
-    CairoImageSurface::createForData(array(), 1, 1, 1, 1);
+    CairoImageSurface::createForData(array(), 1, 1, 1);
     trigger_error('We should bomb here');
 } catch (CairoException $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 2 */
 try {
-    CairoImageSurface::createForData('', array(), 1, 1, 1);
+    CairoImageSurface::createForData('', array(), 1, 1);
     trigger_error('We should bomb here');
 } catch (CairoException $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 3 */
 try {
-    CairoImageSurface::createForData('', 1, array(), 1, 1);
+    CairoImageSurface::createForData('', 1, array(), 1);
     trigger_error('We should bomb here');
 } catch (CairoException $e) {
     echo $e->getMessage(), PHP_EOL;
 }
 
 /* Wrong arg type 4 */
 try {
-    CairoImageSurface::createForData('', 1, 1, array(), 1);
-    trigger_error('We should bomb here');
-} catch (CairoException $e) {
-    echo $e->getMessage(), PHP_EOL;
-}
-
-/* Wrong arg type 5 */
-try {
-    CairoImageSurface::createForData('', 1, 1, 1, array());
+    CairoImageSurface::createForData('', 1, 1, array());
     trigger_error('We should bomb here');
 } catch (CairoException $e) {
     echo $e->getMessage(), PHP_EOL;
@@ -92,13 +84,12 @@ try {
 --EXPECTF--
 object(CairoImageSurface)#%d (0) {
 }
-CairoImageSurface::createForData() expects at least 4 parameters, 0 given
-CairoImageSurface::createForData() expects at least 4 parameters, 1 given
-CairoImageSurface::createForData() expects at least 4 parameters, 2 given
-CairoImageSurface::createForData() expects at least 4 parameters, 3 given
-CairoImageSurface::createForData() expects at most 5 parameters, 6 given
+CairoImageSurface::createForData() expects exactly 4 parameters, 0 given
+CairoImageSurface::createForData() expects exactly 4 parameters, 1 given
+CairoImageSurface::createForData() expects exactly 4 parameters, 2 given
+CairoImageSurface::createForData() expects exactly 4 parameters, 3 given
+CairoImageSurface::createForData() expects exactly 4 parameters, 5 given
 CairoImageSurface::createForData() expects parameter 1 to be string, array given
 CairoImageSurface::createForData() expects parameter 2 to be long, array given
 CairoImageSurface::createForData() expects parameter 3 to be long, array given
 CairoImageSurface::createForData() expects parameter 4 to be long, array given
-CairoImageSurface::createForData() expects parameter 5 to be long, array given
diff --git a/tests/cairo_phpinfo.phpt b/tests/cairo_phpinfo.phpt
@@ -32,8 +32,9 @@ Xlib (X11, X.org) Surface => %s
 Quartz (MacOSX) Surface => %s
 SVG Surface => %s
 Win32 Surface => %s
+Recording Surface => %s
                          Font Backends Available                         
 Freetype Fonts => %s
 Quartz Fonts => %s
 Win32 Fonts => %s
-User Fonts => %s"
+User Fonts => %s"
diff --git a/tests/cairo_status_to_string.phpt b/tests/cairo_status_to_string.phpt
@@ -23,10 +23,10 @@ object(CairoImageSurface)#%d (0) {
 }
 object(CairoContext)#%d (0) {
 }
-string(7) "success"
+string(21) "no error has occurred"
 
 Warning: cairo_status_to_string() expects exactly 1 parameter, 0 given in %s on line %d
 
 Warning: cairo_status_to_string() expects exactly 1 parameter, 2 given in %s on line %d
 
-Warning: cairo_status_to_string() expects parameter 1 to be long, array given in %s on line %d
+Warning: cairo_status_to_string() expects parameter 1 to be long, array given in %s on line %d