Issue #105. Modify tests to support random fill options.

1 files changed, 6 insertions, 11 deletions

diff --git a/src/cairo-tests/rect.cpp b/src/cairo-tests/rect.cpp
index e25488c..52babd8 100644
--- a/src/cairo-tests/rect.cpp
+++ b/src/cairo-tests/rect.cpp
@@ -46,18 +46,13 @@ ca_test_rect(caskbench_context_t *ctx)
         shape.width = abs(x2 - x1);
         shape.height = abs(y2 - y1);
 
-        cairoRandomizeColor(ctx);
-        cairoDrawRectangle(ctx, &shape);
-        switch (ctx->shape_defaults.fill_type) {
-            case CB_FILL_NONE:
-                cairo_stroke(ctx->cairo_cr);
-                break;
-            case CB_FILL_SOLID:
-                cairo_fill(ctx->cairo_cr);
-                break;
-            default:
-                break;
+        if (ctx->shape_defaults.fill_type == CB_FILL_RANDOM) {
+            shape.fill_type = generate_random_fill_type();
         }
+        ca_set_fill_style(ctx, &shape);
+
+        shape.shape_type = CB_SHAPE_RECTANGLE;
+        cairoDrawRandomizedShape(ctx,&shape);
     }
 
     return 1;