path2d test

Author: saŭlo

lib/js/tests/Webapi/Canvas/Webapi__Canvas__Canvas2d__test.js

@@ -160,20 +160,6 @@ ctx.strokeRect(1, 0, 10, 10);
 
 ctx.clearRect(1, 0, 10, 10);
 
-var path1 = new Path2D(undefined);
-
-var path2 = new Path2D("M24.85,10.126c2.018-4.783,6.628-8.125,11.99-8.125c7.223,0,12.425,6.179,13.079,13.543 c0,0,0.353,1.828-0.424,5.119c-1.058,4.482-3.545,8.464-6.898,11.503L24.85,48L7.402,32.165c-3.353-3.038-5.84-7.021-6.898-11.503 c-0.777-3.291-0.424-5.119-0.424-5.119C0.734,8.179,5.936,2,13.159,2C18.522,2,22.832,5.343,24.85,10.126z");
-
-path1.rect(1, 2, 10, 10);
-
-path2.bezierCurveTo(1, 2, 2, 2, 4, 4);
-
-ctx.beginPath();
-
-ctx.stroke(path1);
-
-ctx.fill(path2);
-
 exports.canvasEl = canvasEl;
 exports.ctx = ctx;
 exports.pointInPath = pointInPath;
@@ -191,6 +177,4 @@ exports.imageFromData = imageFromData;
 exports.w = w;
 exports.h = h;
 exports.frameFromImage = frameFromImage;
-exports.path1 = path1;
-exports.path2 = path2;
 /* canvasEl Not a pure module */

lib/js/tests/Webapi/Canvas/Webapi__Canvas__Path2d__test.js

@@ -0,0 +1,23 @@
+'use strict';
+
+
+var path = new Path2D("M24.85,10.126c2.018-4.783,6.628-8.125,11.99-8.125c7.223,0,12.425,6.179,13.079,13.543 c0,0,0.353,1.828-0.424,5.119c-1.058,4.482-3.545,8.464-6.898,11.503L24.85,48L7.402,32.165c-3.353-3.038-5.84-7.021-6.898-11.503 c-0.777-3.291-0.424-5.119-0.424-5.119C0.734,8.179,5.936,2,13.159,2C18.522,2,22.832,5.343,24.85,10.126z");
+
+path.moveTo(1, 1);
+
+path.lineTo(1, 2);
+
+path.rect(1, 2, 10, 10);
+
+path.bezierCurveTo(1, 2, 2, 2, 4, 4);
+
+var canvasEl = document.createElement("canvas");
+
+var ctx = canvasEl.getContext("2d");
+
+ctx.fill(path);
+
+exports.path = path;
+exports.canvasEl = canvasEl;
+exports.ctx = ctx;
+/* path Not a pure module */

tests/Webapi/Canvas/Webapi__Canvas__Canvas2d__test.res

@@ -123,19 +123,3 @@ ctx->strokeText("hi", ~x=1., ~y=0., ())
 ctx->fillRect(~x=1., ~y=0., ~w=10., ~h=10.)
 ctx->strokeRect(~x=1., ~y=0., ~w=10., ~h=10.)
 ctx->clearRect(~x=1., ~y=0., ~w=10., ~h=10.)
-
-let path1 = Path2d.make()
-let path2 = Path2d.make(
-  ~d="M24.85,10.126c2.018-4.783,6.628-8.125,11.99-8.125c7.223" ++
-  ",0,12.425,6.179,13.079,13.543 c0,0,0.353,1.828-0.424,5.119c-1.058,4.482" ++
-  "-3.545,8.464-6.898,11.503L24.85,48L7.402,32.165c-3.353-3.038-5.84-7.021" ++
-  "-6.898-11.503 c-0.777-3.291-0.424-5.119-0.424-5.119C0.734,8.179,5.936,2" ++ ",13.159,2C18.522,2,22.832,5.343,24.85,10.126z",
-  (),
-)
-
-path1->Path2d.rect(~x=1., ~y=2., ~w=10., ~h=10.)
-path2->Path2d.bezierCurveTo(~cp1x=1., ~cp1y=2., ~cp2x=2., ~cp2y=2., ~x=4., ~y=4.)
-
-ctx->beginPath
-ctx->strokePath2d(path1)
-ctx->fillPath2d(path2)

tests/Webapi/Canvas/Webapi__Canvas__Path2d__test.res

@@ -0,0 +1,22 @@
+open Webapi.Canvas
+open Webapi.Canvas.Canvas2d
+open Webapi.Dom
+
+let path = Path2d.make(
+  ~d="M24.85,10.126c2.018-4.783,6.628-8.125,11.99-8.125c7.223" ++
+  ",0,12.425,6.179,13.079,13.543 c0,0,0.353,1.828-0.424,5.119c-1.058,4.482" ++
+  "-3.545,8.464-6.898,11.503L24.85,48L7.402,32.165c-3.353-3.038-5.84-7.021" ++
+  "-6.898-11.503 c-0.777-3.291-0.424-5.119-0.424-5.119C0.734,8.179,5.936,2" ++ ",13.159,2C18.522,2,22.832,5.343,24.85,10.126z",
+  (),
+)
+
+path->Path2d.moveTo(~x=1., ~y=1.)
+path->Path2d.lineTo(~x=1., ~y=2.)
+path->Path2d.rect(~x=1., ~y=2., ~w=10., ~h=10.)
+path->Path2d.bezierCurveTo(~cp1x=1., ~cp1y=2., ~cp2x=2., ~cp2y=2., ~x=4., ~y=4.)
+
+
+let canvasEl: Dom.element = document->Document.createElement("canvas")
+let ctx = canvasEl->CanvasElement.getContext2d
+
+ctx->fillPath2d(path)