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

6 files changed, 35 insertions, 60 deletions

diff --git a/src/cairo-tests/circle.cpp b/src/cairo-tests/circle.cpp
index 7fbf1bd..f3ff3b1 100644
--- a/src/cairo-tests/circle.cpp
+++ b/src/cairo-tests/circle.cpp
@@ -41,18 +41,13 @@ ca_test_circle(caskbench_context_t *ctx)
         shape.radius = (double)rand()/RAND_MAX * MIN(
             MIN(shape.x, w-shape.x), MIN(shape.y, h-shape.y));
 
-        cairoRandomizeColor(ctx);
-        cairoDrawCircle(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_CIRCLE;
+        cairoDrawRandomizedShape(ctx,&shape);
     }
 
     return 1;
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;
diff --git a/src/cairo-tests/star.cpp b/src/cairo-tests/star.cpp
index 6b0d81c..9c1d4cb 100644
--- a/src/cairo-tests/star.cpp
+++ b/src/cairo-tests/star.cpp
@@ -47,18 +47,13 @@ ca_test_star(caskbench_context_t *ctx)
             shape.x = 0;
             shape.y = 0;
             shape.radius = 40;
-            cairoRandomizeColor(ctx);
-            cairoDrawStar(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_STAR;
+            cairoDrawRandomizedShape(ctx,&shape);
             cairo_restore(ctx->cairo_cr);
         }
     }
diff --git a/src/skia-tests/circle.cpp b/src/skia-tests/circle.cpp
index 211252e..17edf46 100644
--- a/src/skia-tests/circle.cpp
+++ b/src/skia-tests/circle.cpp
@@ -22,17 +22,6 @@ sk_setup_circle(caskbench_context_t *ctx)
     ctx->skia_paint->setAntiAlias(false);
     ctx->skia_paint->setStrokeWidth(1);
 
-    switch (ctx->shape_defaults.fill_type) {
-        case CB_FILL_NONE:
-            ctx->skia_paint->setStyle(SkPaint::kStroke_Style);
-            break;
-        case CB_FILL_SOLID:
-            ctx->skia_paint->setStyle(SkPaint::kFill_Style);
-            break;
-        default:
-            break;
-    }
-
     return 1;
 }
 
@@ -55,8 +44,14 @@ sk_test_circle(caskbench_context_t *ctx)
         shape.radius = (double)rand()/RAND_MAX * MIN(
             MIN(shape.x, w-shape.x), MIN(shape.y, h-shape.y));
 
-        skiaRandomizePaintColor(ctx);
-        skiaDrawCircle(ctx, &shape);
+
+       if (ctx->shape_defaults.fill_type == CB_FILL_RANDOM) {
+            shape.fill_type = generate_random_fill_type();
+        }
+        sk_set_fill_style(ctx, &shape);
+
+        shape.shape_type = CB_SHAPE_CIRCLE;
+        skiaDrawRandomizedShape(ctx,&shape);
     }
 
     return 1;
diff --git a/src/skia-tests/rect.cpp b/src/skia-tests/rect.cpp
index 014717f..714240e 100644
--- a/src/skia-tests/rect.cpp
+++ b/src/skia-tests/rect.cpp
@@ -60,8 +60,8 @@ sk_test_rect(caskbench_context_t *ctx)
         }
         sk_set_fill_style(ctx, &shape);
 
-        skiaRandomizePaintColor(ctx);
-        skiaDrawRectangle(ctx, &shape);
+        shape.shape_type = CB_SHAPE_RECTANGLE;
+        skiaDrawRandomizedShape(ctx,&shape);
     }
 
     return 1;
diff --git a/src/skia-tests/star.cpp b/src/skia-tests/star.cpp
index 5bc59a1..0c0823e 100644
--- a/src/skia-tests/star.cpp
+++ b/src/skia-tests/star.cpp
@@ -22,16 +22,6 @@ sk_setup_star(caskbench_context_t *ctx)
     ctx->skia_paint->setAntiAlias(false);
     ctx->skia_paint->setStrokeWidth(1);
 
-    switch (ctx->shape_defaults.fill_type) {
-        case CB_FILL_NONE:
-            ctx->skia_paint->setStyle(SkPaint::kStroke_Style);
-            break;
-        case CB_FILL_SOLID:
-            ctx->skia_paint->setStyle(SkPaint::kFill_Style);
-            break;
-        default:
-            break;
-    }
     return 1;
 }
 
@@ -59,8 +49,13 @@ sk_test_star(caskbench_context_t *ctx)
             shape.x = 0;
             shape.y = 0;
             shape.radius = 40;
-            skiaRandomizePaintColor(ctx);
-            skiaDrawStar(ctx, &shape);
+            if (ctx->shape_defaults.fill_type == CB_FILL_RANDOM) {
+                shape.fill_type = generate_random_fill_type();
+            }
+            sk_set_fill_style(ctx, &shape);
+
+            shape.shape_type = CB_SHAPE_STAR;
+            skiaDrawRandomizedShape(ctx,&shape);
             ctx->skia_canvas->restore();
         }
     }