Refactor canvas item unit tests

Change-Id: I99ba84889ce360d2def27834f15af43c2bdf29bc
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

1 files changed, 42 insertions, 32 deletions

diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml
index 11618e95a9..bfc4067040 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_text.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_text.qml
@@ -1,34 +1,44 @@
 import QtQuick 2.0
-import QtTest 1.0
-import "testhelper.js" as Helper
-Canvas {
-   id:canvas; width:100;height:50; renderTarget: Canvas.Image; renderStrategy:Canvas.Threaded
-   TestCase {
-       //TODO
-       name: "text"; when: windowShown
-       function test_baseLine() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-       function test_align() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-       function test_stroke() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-       function test_fill() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-       function test_font() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-       function test_measure() {
-           var ctx = canvas.getContext('2d');
-           ctx.reset();
-      }
-   }
+
+CanvasTestCase {
+   id:testCase
+   name: "text"
+   function init_data() { return testData("2d"); }
+   function test_baseLine(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+   function test_align(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+   function test_stroke(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+   function test_fill(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+   function test_font(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+   function test_measure(row) {
+       var canvas = createCanvasObject(row);
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       canvas.destroy()
+  }
+
 }