diff options
Diffstat (limited to 'tests/auto/quick/qquickcanvasitem/data')
18 files changed, 158 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml index 33fffd4cb1..00d13f31f4 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arc.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_angle_1(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -21,6 +22,7 @@ CanvasTestCase { } function test_angle_2(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -36,6 +38,7 @@ CanvasTestCase { } function test_angle_3(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -53,6 +56,7 @@ CanvasTestCase { } function test_angle_4(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -71,6 +75,7 @@ CanvasTestCase { } function test_angle_5(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -90,6 +95,7 @@ CanvasTestCase { function test_angle_6(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -110,6 +116,7 @@ CanvasTestCase { function test_empty(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -125,6 +132,7 @@ CanvasTestCase { } function test_nonempty(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -141,6 +149,7 @@ CanvasTestCase { } function test_nonfinite(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -199,6 +208,7 @@ CanvasTestCase { } function test_end(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -216,6 +226,7 @@ CanvasTestCase { } function test_negative(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -234,6 +245,7 @@ CanvasTestCase { function test_scale_1(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -270,6 +282,7 @@ CanvasTestCase { function test_scale_2(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -296,6 +309,7 @@ CanvasTestCase { function test_selfintersect_1(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -316,6 +330,7 @@ CanvasTestCase { function test_selfintersect_2(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -340,6 +355,7 @@ CanvasTestCase { function test_shape_1(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -361,6 +377,7 @@ CanvasTestCase { function test_shape_2(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -381,6 +398,7 @@ CanvasTestCase { } function test_shape_3(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -401,6 +419,7 @@ CanvasTestCase { function test_shape_4(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -421,6 +440,7 @@ CanvasTestCase { function test_shape_5(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -441,6 +461,7 @@ CanvasTestCase { function test_twopie(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -488,6 +509,7 @@ CanvasTestCase { function test_zero(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml index ef1b7a7b2a..81412d98c9 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_arcto.qml @@ -7,6 +7,7 @@ CanvasTestCase { function test_coincide(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -44,6 +45,7 @@ CanvasTestCase { } function test_collinear(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -109,6 +111,7 @@ CanvasTestCase { } function test_subpath(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -135,6 +138,7 @@ CanvasTestCase { function test_negative(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -152,6 +156,7 @@ CanvasTestCase { function test_nonfinite(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -208,6 +213,7 @@ CanvasTestCase { } function test_scale(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -237,6 +243,7 @@ CanvasTestCase { function test_shape(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -348,6 +355,7 @@ CanvasTestCase { function test_transform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -374,6 +382,7 @@ CanvasTestCase { } function test_zero(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml index 8a5a52cf1e..4ee24ad437 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_composite.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_clearRect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -17,6 +18,7 @@ CanvasTestCase { function test_clip(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var composites = [ {compsite:"copy"}, {compsite:"destination-atop"}, @@ -47,6 +49,7 @@ CanvasTestCase { function test_globalAlpha(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); compare(ctx.globalAlpha, 1.0); @@ -83,6 +86,7 @@ CanvasTestCase { function test_operation(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.globalCompositeOperation = 'xor'; @@ -137,6 +141,7 @@ CanvasTestCase { function test_solid(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = Qt.rgba(0, 1, 1, 1.0); @@ -233,6 +238,7 @@ CanvasTestCase { } function test_transparent(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; @@ -330,6 +336,7 @@ CanvasTestCase { function test_uncovered(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = 'rgba(0, 255, 0, 0.5)'; diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml b/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml index 58ea6d7f59..9e8c0785c3 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_fillStyle.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_default(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); verify(ctx.fillStyle, "#000000"); @@ -14,6 +15,7 @@ CanvasTestCase { } function test_get(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#fa0'; @@ -23,6 +25,7 @@ CanvasTestCase { } function test_hex(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -37,6 +40,7 @@ CanvasTestCase { } function test_invalid(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#fa0'; @@ -60,6 +64,7 @@ CanvasTestCase { } function test_saverestore(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var old = ctx.fillStyle; ctx.save(); @@ -75,6 +80,7 @@ CanvasTestCase { } function test_namedColor(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = "red"; @@ -91,6 +97,7 @@ CanvasTestCase { } function test_rgba(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = "rgb(-100, 300, 255)"; @@ -108,6 +115,7 @@ CanvasTestCase { function test_hsla(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = "hsla(120, 100%, 50%, 0.499)"; diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_fillrect.qml b/tests/auto/quick/qquickcanvasitem/data/tst_fillrect.qml index ce1c27c6bc..213abdd622 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_fillrect.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_fillrect.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_fillRect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.fillStyle = "red"; ctx.fillRect(0, 0, canvas.width, canvas.height); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml b/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml index 7c87d896fb..70e77c8760 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_gradient.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_basic(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -18,6 +19,7 @@ CanvasTestCase { function test_interpolate(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -166,6 +168,7 @@ CanvasTestCase { } function test_radial(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -788,6 +791,7 @@ CanvasTestCase { } function test_linear(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); try { var err = false; @@ -907,6 +911,7 @@ CanvasTestCase { } function test_object(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); var g1 = ctx.createLinearGradient(0, 0, 100, 0); @@ -978,6 +983,7 @@ CanvasTestCase { function test_conical(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); var g = ctx.createConicalGradient(10, 10, 50); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml index 1f695d7080..a1eb272cd0 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_image.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_image.qml @@ -11,12 +11,12 @@ CanvasTestCase { canvas.loadImage('rgrg-256x256.png'); canvas.loadImage('ggrr-256x256.png'); canvas.loadImage('broken.png'); - while (!canvas.isImageLoaded('green.png')) - wait(200); + tryVerify(function() { return canvas.isImageLoaded('green.png'); }) } function test_3args(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); ctx.reset(); @@ -35,6 +35,7 @@ CanvasTestCase { } function test_5args(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -54,6 +55,7 @@ CanvasTestCase { } function test_9args(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -118,6 +120,7 @@ CanvasTestCase { } function test_animated(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -125,6 +128,7 @@ CanvasTestCase { } function test_clip(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -139,6 +143,7 @@ CanvasTestCase { } function test_self(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -170,6 +175,7 @@ CanvasTestCase { function test_outsidesource(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -207,6 +213,7 @@ CanvasTestCase { function test_null(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -220,15 +227,18 @@ CanvasTestCase { function test_url(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); canvas.loadImage(testCase.green); + tryVerify(function() { return canvas.isImageLoaded(testCase.green); }) ctx.drawImage(testCase.green, 0, 0); comparePixel(ctx, 0,0, 0,255,0,255,2); } function test_composite(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -241,12 +251,14 @@ CanvasTestCase { } function test_path(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); } function test_transform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -260,6 +272,7 @@ CanvasTestCase { function test_imageitem(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -268,6 +281,7 @@ CanvasTestCase { function test_imageData(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -276,6 +290,7 @@ CanvasTestCase { function test_wrongtype(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -293,6 +308,7 @@ CanvasTestCase { function test_nonfinite(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -606,6 +622,7 @@ CanvasTestCase { function test_negative(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -661,6 +678,7 @@ CanvasTestCase { function test_canvas(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -684,6 +702,7 @@ CanvasTestCase { function test_broken(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -694,6 +713,7 @@ CanvasTestCase { function test_alpha(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); @@ -706,6 +726,7 @@ CanvasTestCase { } function test_multiple_painting(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); loadImages(canvas); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_imagedata.qml b/tests/auto/quick/qquickcanvasitem/data/tst_imagedata.qml index 76b99a765e..aab7a95589 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_imagedata.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_imagedata.qml @@ -11,6 +11,7 @@ CanvasTestCase { skip("ctx.getImageData crashes on offscreen/minimal platforms"); var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var size = 17 ctx.reset(); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml index ba7ff09728..e5d03e5db7 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_default(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); compare(ctx.lineWidth, 1); @@ -16,6 +17,7 @@ CanvasTestCase { function test_cross(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -43,6 +45,7 @@ CanvasTestCase { function test_join(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -306,6 +309,7 @@ CanvasTestCase { } function test_miter(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -481,6 +485,7 @@ CanvasTestCase { } function test_width(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -625,6 +630,7 @@ CanvasTestCase { skip("line::test_cap crashes on Android, QTBUG-103257") var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -841,6 +847,7 @@ CanvasTestCase { function test_lineDash(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.strokeStyle = "#fff"; @@ -899,6 +906,7 @@ CanvasTestCase { function test_lineDashReset(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.strokeStyle = "#ff0000"; @@ -930,6 +938,7 @@ CanvasTestCase { function test_lineDashOffset(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.strokeStyle = "#fff"; diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml index 60c782c8fa..ae08b58519 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_path.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_path.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_basic(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -36,6 +37,7 @@ CanvasTestCase { } function test_beginPath(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); @@ -48,6 +50,7 @@ CanvasTestCase { } function test_closePath(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -86,6 +89,7 @@ CanvasTestCase { function test_isPointInPath(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.arc(50, 25, 10, 0, Math.PI, false); @@ -256,6 +260,7 @@ CanvasTestCase { function test_fill(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -378,6 +383,7 @@ CanvasTestCase { } function test_stroke(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -662,6 +668,7 @@ CanvasTestCase { } function test_clip(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -784,6 +791,7 @@ CanvasTestCase { function test_moveTo(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -839,6 +847,7 @@ CanvasTestCase { } function test_lineTo(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -904,6 +913,7 @@ CanvasTestCase { } function test_bezierCurveTo(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -1072,6 +1082,7 @@ CanvasTestCase { } function test_quadraticCurveTo(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -1173,6 +1184,7 @@ CanvasTestCase { } function test_rect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -1371,6 +1383,7 @@ CanvasTestCase { function test_clearRect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#0f0'; @@ -1383,6 +1396,7 @@ CanvasTestCase { } function test_fillRect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.beginPath(); @@ -1397,6 +1411,7 @@ CanvasTestCase { function test_strokeRect(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.beginPath(); @@ -1412,6 +1427,7 @@ CanvasTestCase { } function test_transform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml index 1d7fd2c12f..e0a4d7ad23 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_pattern.qml @@ -6,36 +6,42 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_basic(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_animated(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_image(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_modified(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_paint(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_repeat(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml index 281264ba92..ef908db92a 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml @@ -7,6 +7,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_createImageData(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var imageData = ctx.createImageData(1, 1); var imageDataValues = imageData.data; @@ -20,24 +21,28 @@ CanvasTestCase { } function test_getImageData(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_object(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_putImageData(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_filters(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml b/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml index 2baaa072d0..14318b3f56 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_shadow.qml @@ -6,12 +6,14 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_basic(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_blur(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() @@ -19,6 +21,7 @@ CanvasTestCase { function test_clip(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() @@ -26,6 +29,7 @@ CanvasTestCase { function test_composite(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() @@ -33,6 +37,7 @@ CanvasTestCase { function test_enable(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() @@ -40,36 +45,42 @@ CanvasTestCase { function test_gradient(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_image(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_offset(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_pattern(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_stroke(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_tranform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_state.qml b/tests/auto/quick/qquickcanvasitem/data/tst_state.qml index 18464def7c..ce02f9d7f7 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_state.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_state.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_bitmap(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -19,6 +20,7 @@ CanvasTestCase { } function test_clip(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -35,6 +37,7 @@ CanvasTestCase { } function test_fillStyle(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); // Test that restore() undoes any modifications @@ -56,6 +59,7 @@ CanvasTestCase { } function test_font(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -78,6 +82,7 @@ CanvasTestCase { } function test_globalAlpha(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -100,6 +105,7 @@ CanvasTestCase { } function test_globalCompositeOperation(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -122,6 +128,7 @@ CanvasTestCase { } function test_lineCap(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -144,6 +151,7 @@ CanvasTestCase { } function test_lineJoin(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -166,6 +174,7 @@ CanvasTestCase { } function test_lineWidth(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -188,6 +197,7 @@ CanvasTestCase { } function test_miterLimit(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -210,6 +220,7 @@ CanvasTestCase { } function test_path(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -225,6 +236,7 @@ CanvasTestCase { } function test_shadow(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -295,6 +307,7 @@ CanvasTestCase { } function test_stack(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -330,6 +343,7 @@ CanvasTestCase { } function test_strokeStyle(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -353,6 +367,7 @@ CanvasTestCase { function test_text(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -392,6 +407,7 @@ CanvasTestCase { function test_transform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml index a3f1ab0a9b..0dc39b8b4c 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_strokeStyle.qml @@ -8,6 +8,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_default(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); compare(ctx.strokeStyle, "#000000") @@ -17,6 +18,7 @@ CanvasTestCase { } function test_saverestore(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var old = ctx.strokeStyle; ctx.save(); @@ -33,6 +35,7 @@ CanvasTestCase { } function test_namedColor(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.strokeStyle = "red"; @@ -50,6 +53,7 @@ CanvasTestCase { } function test_colorFromObjectToString(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -68,6 +72,7 @@ CanvasTestCase { } function test_withInvalidColor(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_svgpath.qml b/tests/auto/quick/qquickcanvasitem/data/tst_svgpath.qml index 2b39357bed..011fbd497b 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_svgpath.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_svgpath.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_svgpath(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); var svgs = [ // Absolute coordinates, explicit commands. diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml index bfc4067040..f7cd66890b 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml @@ -6,36 +6,42 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_baseLine(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_align(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_stroke(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_fill(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_font(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() } function test_measure(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); canvas.destroy() diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml b/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml index b2f5b51fa5..bbfec6a106 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_transform.qml @@ -6,6 +6,7 @@ CanvasTestCase { function init_data() { return testData("2d"); } function test_order(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -20,6 +21,7 @@ CanvasTestCase { } function test_rotate(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -90,6 +92,7 @@ CanvasTestCase { } function test_scale(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); @@ -182,6 +185,7 @@ CanvasTestCase { } function test_setTransform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -325,6 +329,7 @@ CanvasTestCase { } function test_transform(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; @@ -460,6 +465,7 @@ CanvasTestCase { } function test_translate(row) { var canvas = createCanvasObject(row); + tryVerify(function() { return canvas.available; }); var ctx = canvas.getContext('2d'); ctx.reset(); ctx.fillStyle = '#f00'; |