新增部分 jest测试demo

persagy-web-draw/__tests__/SBrush.test.ts

@@ -0,0 +1,66 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import { SBrush, SPoint } from "./../src"
+import { SBrushType } from "./../src/enums/SBrushType";
+import { SColor, SLinearGradient } from "./../src/";
+import expect from "expect"
+
+/**
+ * 画刷测试
+ *
+ * @author 韩耀龙 han_yao_long@163.com
+ */
+
+test("构造函数", () => {
+    // 无参数
+    let brush = new SBrush();
+    expect(brush).toStrictEqual(new SBrush());
+
+    // 第一个参数
+    let brush1 = new SBrush(brush);
+    expect(brush1).toStrictEqual(new SBrush());
+
+    let linearGradient = new SLinearGradient(new SPoint(0,0),new SPoint(1,1))
+    let brush2 = new SBrush(linearGradient);
+    expect(brush2.type).toBe(SBrushType.Gradient);
+
+    let color = new SColor('#ffffff')
+    let brush3 = new SBrush(color);
+    expect(brush3.type).toBe(SBrushType.Color);
+
+});
+
+test("设置属性", () => {
+    let brush = new SBrush();
+    brush.color = new SColor('#ffffff');
+    expect(brush.color).toStrictEqual(new SColor('#ffffff'));
+
+    let brush1 = new SBrush();
+    brush1.gradient = new SLinearGradient(new SPoint(0,0),new SPoint(1,1))
+    expect(brush1.gradient).toStrictEqual(new SLinearGradient(new SPoint(0,0),new SPoint(1,1)));
+
+});

persagy-web-draw/__tests__/SCanvasView.test.ts

@@ -0,0 +1,84 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import expect from "expect"
+import {
+    SMouseButton,
+    SMouseEvent,
+    SNetUtil,
+    SObject,
+    STouchState
+} from "@persagy-web/base";
+import { SSvgPaintEngine } from "./../src/engines/SSvgPaintEngine";
+import { SPoint } from "./../src/types/SPoint";
+import { SPainter } from "./../src/SPainter";
+import { SCanvasView } from "./../src"
+/**
+ * 视图类 测试
+ *
+ * @author 韩耀龙 han_yao_long@163.com
+ */
+
+test("构造函数", () => {
+    document.body.innerHTML = `<canvas
+    id="aaa"
+    :width="300"
+    :height="300"
+    tabindex="0"
+  ></canvas>`
+    let view = new SCanvasView('aaa');
+    expect(view).toBeTruthy();
+});
+
+test("设置属性", () => {
+    document.body.innerHTML = `<canvas
+    id="aaa"
+    :width="300"
+    :height="300"
+    tabindex="0"
+  ></canvas>`
+    let view = new SCanvasView('aaa');
+
+    view.origin = new SPoint(1,1)
+    expect(view.origin).toStrictEqual(new SPoint(1,1));
+
+    view.scale = 6
+    expect(view.scale).toStrictEqual(6);
+
+    view.cursor = 'pointer'
+    expect(view.cursor).toBe('pointer');
+});
+
+test("svgData", () => {
+    document.body.innerHTML = `<canvas
+    id="aaa"
+    :width="300"
+    :height="300"
+    tabindex="0"
+  ></canvas>`
+    let view = new SCanvasView('aaa');
+    expect(view.svgData().includes('svg')).toBeTruthy();
+});

persagy-web-draw/__tests__/SColor.test.ts

@@ -0,0 +1,92 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import { SColor } from "./../src/";
+import expect from "expect"
+
+/**
+ * 颜色测试
+ *
+ * @author 韩耀龙 han_yao_long@163.com
+ */
+
+test("构造函数", () => {
+    let color = new SColor();
+    expect(color.toVal()).toBe('#000000');
+
+    let color1 = new SColor('#ffffff');
+    expect(color1.toVal()).toBe('#ffffff');
+
+    let color2 = new SColor(113, 168, 28);
+    expect(color2.toVal()).toBe('#71a81c');
+    let color3 = new SColor(color2);
+    expect(color3.toVal()).toBe('#71a81c');
+
+    let color4 = new SColor(113, 168, 28, 255);
+    expect(color4.toVal()).toBe('#71a81c');
+});
+
+test("获取属性", () => {
+    let color = new SColor('#71a81c');
+    expect(color.toRgb()).toBe('rgb(113, 168, 28)');
+    expect(color.toRgba()).toBe('rgba(113, 168, 28, 1)');
+    expect(color.toVal()).toBe('#71a81c')
+});
+
+test("设置属性", () => {
+    let color = new SColor('#71a81c');
+    color.red = 50;
+    expect(color.toVal()).toBe('#32a81c');
+
+    let color1 = new SColor('#71a81c');
+    color1.green = 50;
+    expect(color1.toVal()).toBe('#71321c');
+
+    let color3 = new SColor('#71a81c');
+    color3.blue = 50;
+    expect(color3.toVal()).toBe('#71a832');
+
+    let color4 = new SColor('#71a81c');
+    color4.alpha = 255;
+    expect(color4.toVal()).toBe('#71a81c');
+
+    let color5 = new SColor('#71a81c');
+    color5.value = '#32a81cff';
+    expect(color5.toVal()).toBe('#32a81c');
+
+    let color6 = new SColor('#71a81c');
+    color6.value = 'f';
+    expect(color6.toVal()).toBe('#71a81c');
+
+    expect(SColor.rgb(113,168,50)).toStrictEqual(new SColor('#71a832ff'))
+
+    expect(SColor.rgba(113,168,50,255)).toStrictEqual(new SColor('#71a832ff'));
+
+
+    expect(SColor.rgb(113,168,50)).toStrictEqual(new SColor('#71a832ff'))
+
+    expect(SColor.rgba(113,168,50,255)).toStrictEqual(new SColor('#71a832ff'));
+});

persagy-web-draw/__tests__/types/SLine.test.ts

@@ -1,6 +1,6 @@
 import { SPoint } from "../../src";
 import { SLine } from "../../src";
-
+import expect from "expect"
 test("构造函数", () => {
     // 无参数
     let line = new SLine()
@@ -27,6 +27,25 @@ test("构造函数", () => {
 });
 
 
+test("设置属性", () => {
+    let line = new SLine();
+    line.x1 = 1;
+    expect(line.x1).toBe(1);
+
+    line.y1 = 1;
+    expect(line.y1).toBe(1);
+
+    line.x2 = 1;
+    expect(line.x2).toBe(1);
+
+    line.y2 = 1;
+    expect(line.y2).toBe(1);
+
+    expect(line.dx).toBe(0);
+    expect(line.dy).toBe(0);
+
+});
+
 test("isNull", () => {
     // 答案为 true
     let line = new SLine();

persagy-web-draw/__tests__/types/SRect.test.ts

@@ -48,12 +48,46 @@ test("构造函数", () => {
     expect(rect1.leftTop).toStrictEqual(new SPoint(0, 0));
     expect(rect1.size).toStrictEqual(new SSize(2, 2));
 
+    // 两个参数
+    const leftPoint1 = new SPoint(1, 1);
+    const size = new SSize(2, 2)
+    let rect11 = new SRect(leftPoint1, size)
+    expect(rect11).toStrictEqual(new SRect(1,1,2,2));
+
     // 四个参数
     let rect2 = new SRect(0, 0, 4, 4)
     expect(rect2.leftTop).toStrictEqual(new SPoint(0, 0));
     expect(rect2.size).toStrictEqual(new SSize(4, 4));
 });
 
+test("设置属性", () => {
+    let rect = new SRect();
+    rect.x = 1
+    expect(rect.leftTop.x).toBe(1);
+
+    rect.y = 1
+    expect(rect.leftTop.y).toBe(1);
+
+    rect.width = 2;
+    expect(rect.size.width).toBe(2);
+
+    rect.height = 2;
+    expect(rect.size.height).toBe(2);
+
+    rect.left = 2;
+    expect(rect.leftTop.x).toBe(2);
+
+    rect.top = 2;
+    expect(rect.leftTop.y).toBe(2);
+
+    rect.right = 3;
+    expect(rect.width).toBe(1);
+
+    rect.bottom = 3;
+    expect(rect.height).toBe(1);
+
+});
+
 test("isEmpty", () => {
     // false
     let rect = new SRect()
@@ -159,10 +193,10 @@ test("intersected", () => {
 test("intersect", () => {
     let rect = new SRect(0, 0, 4, 4);
     let rect1 = new SRect(2, 2, 4, 4);
-    rect.intersected(rect1)
+    rect.intersect(rect1)
     expect(rect).toStrictEqual(new SRect(2, 2, 2, 2));
     let rect2 = new SRect(5, 5, 4, 4);
     let rect3 = new SRect(1, 1, 1, 1);
-    rect2.intersected(rect3)
+    rect2.intersect(rect3)
     expect(rect2).toStrictEqual(new SRect());
 });

persagy-web-draw/__tests__/types/SSize.test.ts

@@ -76,10 +76,10 @@ test("isNull", () => {
 test("isValid", () => {
     // true
     let size = new SSize()
-    expect(size.isNull()).toBeFalsy();
+    expect(size.isValid()).toBeFalsy();
     // false
     let size1 = new SSize(4, 4)
-    expect(size1.isNull()).toBeTruthy();
+    expect(size1.isValid()).toBeTruthy();
 });
 
 test("scale", () => {
@@ -87,11 +87,46 @@ test("scale", () => {
     size1.scale(2,2)
     expect(size1.width).toBe(2);
     expect(size1.height).toBe(2);
+
+    let size2 = new SSize(4, 4);
+    size2.scale(1,2,SAspectRatioMode.KeepAspectRatio);
+    expect(size2.width).toBe(1);
+    expect(size2.height).toBe(1);
+
+    let size3 = new SSize(4, 4);
+    size3.scale(1,2,SAspectRatioMode.KeepAspectRatioByExpanding);
+    expect(size3.width).toBe(2);
+    expect(size3.height).toBe(2);
 });
 
 test("scaled", () => {
     let size1 = new SSize(4, 4);
-    size1.scaled(2,2)
-    expect(size1.width).toBe(8);
-    expect(size1.height).toBe(8);
+    let size3 = size1.scaled(2,2)
+    expect(size3.width).toBe(2);
+    expect(size3.height).toBe(2);
+
+    let size4 = new SSize(1, 2);
+    const size5 = size4.scaled(2,2,SAspectRatioMode.KeepAspectRatio);
+    expect(size5.width).toBe(1);
+    expect(size5.height).toBe(2);
+
+    let size6 = new SSize(1, 2);
+    const size7 = size6.scaled(2,2,SAspectRatioMode.KeepAspectRatioByExpanding);
+    expect(size7.width).toBe(2);
+    expect(size7.height).toBe(4);
+
+});
+
+test("transpose", () => {
+    let size1 = new SSize(2, 4);
+    size1.transpose()
+    expect(size1.width).toBe(4);
+    expect(size1.height).toBe(2);
+});
+
+test("transposed", () => {
+    let size1 = new SSize(2, 4);
+    const size2 = size1.transposed()
+    expect(size2.width).toBe(4);
+    expect(size2.height).toBe(2);
 });

persagy-web-draw/src/SCanvasView.ts

@@ -119,6 +119,9 @@ export class SCanvasView extends SObject {
     set cursor(v: string) {
         this.canvasView.style.cursor = v;
     }
+    get cursor(): string {
+        return this.canvasView.style.cursor;
+    }
 
     /**
      * 构造函数
@@ -236,21 +239,21 @@ export class SCanvasView extends SObject {
      *
      * @param painter     painter 对象
      */
-    protected onDraw(painter: SPainter): void {}
+    protected onDraw(painter: SPainter): void { }
 
     /**
      * 鼠标单击事件
      *
      * @param event       事件参数
      */
-    protected onClick(event: MouseEvent): void {}
+    protected onClick(event: MouseEvent): void { }
 
     /**
      * 鼠标双击事件
      *
      * @param event       事件参数
      */
-    protected onDoubleClick(event: MouseEvent): void {}
+    protected onDoubleClick(event: MouseEvent): void { }
 
     /**
      * 鼠标按下事件
@@ -296,14 +299,14 @@ export class SCanvasView extends SObject {
      *
      * @param event       事件参数
      */
-    protected onMouseUp(event: MouseEvent): void {}
+    protected onMouseUp(event: MouseEvent): void { }
 
     /**
      * 上下文菜单事件
      *
      * @param event       事件参数
      */
-    protected onContextMenu(event: MouseEvent): void {}
+    protected onContextMenu(event: MouseEvent): void { }
 
     /**
      * 鼠标滚轮事件
@@ -326,21 +329,21 @@ export class SCanvasView extends SObject {
      *
      * @param event       事件参数
      */
-    protected onKeyDown(event: KeyboardEvent): void {}
+    protected onKeyDown(event: KeyboardEvent): void { }
 
     /**
      * 按键press事件
      *
      * @param event       事件参数
      */
-    protected onKeyPress(event: KeyboardEvent): void {}
+    protected onKeyPress(event: KeyboardEvent): void { }
 
     /**
      * 按键松开事件
      *
      * @param event       事件参数
      */
-    protected onKeyUp(event: KeyboardEvent): void {}
+    protected onKeyUp(event: KeyboardEvent): void { }
 
     /**
      * 开始触摸事件
@@ -399,7 +402,7 @@ export class SCanvasView extends SObject {
      *
      * @param event       事件参数
      */
-    protected onResize(event: UIEvent): void {}
+    protected onResize(event: UIEvent): void { }
 
     /**
      * 绑定事件
@@ -438,7 +441,7 @@ export class SCanvasView extends SObject {
     private requestAnimationFrame(callback: FrameRequestCallback): any {
         let currTime = new Date().getTime();
         let timeToCall = Math.max(0, 16 - (currTime - this._lastFrameTime));
-        let id = setTimeout(function(): void {
+        let id = setTimeout(function (): void {
             callback(currTime + timeToCall);
         }, timeToCall);
         this._lastFrameTime = currTime + timeToCall;