q5 2.10.7 → 2.10.8

package/p5-tests/unit/events/mouse.js

@@ -1,487 +0,0 @@
-suite('Mouse Events', function() {
-  let myp5;
-
-  let canvas;
-  let rect;
-  let sx;
-  let sy;
-  let touchObj1;
-  let touchObj2;
-  let touchEvent1;
-  let touchEvent2;
-
-  setup(function(done) {
-    new p5(function(p) {
-      p.setup = function() {
-        myp5 = p;
-        canvas = myp5._curElement.elt;
-        rect = canvas.getBoundingClientRect();
-        sx = canvas.scrollWidth / myp5.width;
-        sy = canvas.scrollHeight / myp5.height;
-        touchObj1 = new Touch({
-          target: canvas,
-          identifier: Date.now(),
-          clientX: 100,
-          clientY: 100
-        });
-        touchObj2 = new Touch({
-          target: canvas,
-          identifier: Date.now() + 1,
-          clientX: 200,
-          clientY: 200
-        });
-        touchEvent1 = new TouchEvent('touchmove', {
-          touches: [touchObj1, touchObj2]
-        });
-        touchEvent2 = new TouchEvent('touchmove', {
-          touches: [touchObj2]
-        });
-        done();
-      };
-    });
-  });
-
-  teardown(function() {
-    myp5.remove();
-  });
-
-  let mouseEvent1 = new MouseEvent('mousemove', { clientX: 100, clientY: 100 });
-  let mouseEvent2 = new MouseEvent('mousemove', { clientX: 200, clientY: 200 });
-
-  suite('p5.prototype._hasMouseInteracted', function() {
-    test('_hasMouseInteracted should be a boolean', function() {
-      assert.isBoolean(myp5._hasMouseInteracted);
-    });
-
-    test('_hasMouseInteracted should be false before mouse interaction', function() {
-      assert.strictEqual(myp5._hasMouseInteracted, false);
-    });
-
-    test('_hasMouseInteracted should be true on mouse interaction', function() {
-      window.dispatchEvent(mouseEvent1);
-      assert.strictEqual(myp5._hasMouseInteracted, true);
-    });
-
-    test('_hasMouseInteracted should be true on touch interaction', function() {
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5._hasMouseInteracted, true);
-    });
-  });
-
-  suite('p5.prototype.mouseX', function() {
-    test('mouseX should be a number', function() {
-      assert.isNumber(myp5.mouseX);
-    });
-
-    test('mouseX should be current horizontal position of mouse relative to the canvas', function() {
-      let result = (mouseEvent1.clientX - rect.left) / sx;
-      window.dispatchEvent(mouseEvent1);
-      assert.strictEqual(myp5.mouseX, result);
-    });
-
-    test('mouseX should be current horizontal position of touch relative to the canvas', function() {
-      let result = (touchObj1.clientX - rect.left) / sx;
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5.mouseX, result);
-    });
-  });
-
-  suite('p5.prototype.mouseY', function() {
-    test('mouseY should be a number', function() {
-      assert.isNumber(myp5.mouseY);
-    });
-
-    test('mouseY should be current vertical position of mouse relative to the canvas', function() {
-      let result = (mouseEvent1.clientY - rect.top) / sy;
-      window.dispatchEvent(mouseEvent1);
-      assert.strictEqual(myp5.mouseY, result);
-    });
-
-    test('mouseY should be current vertical position of touch relative to the canvas', function() {
-      let result = (touchObj1.clientY - rect.top) / sy;
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5.mouseY, result);
-    });
-  });
-
-  suite('p5.prototype.pmouseX', function() {
-    test('pmouseX should be a number', function() {
-      assert.isNumber(myp5.pmouseX);
-    });
-
-    test('pmouseX should be previous horizontal position of mouse relative to the canvas', function() {
-      window.dispatchEvent(mouseEvent1); // dispatch first mouse event
-      window.dispatchEvent(mouseEvent2); // dispatch second mouse event
-      let result = (mouseEvent1.clientX - rect.left) / sx;
-      assert.strictEqual(myp5.pmouseX, result);
-    });
-
-    test('pmouseX should be previous horizontal position of touch relative to the canvas', function() {
-      window.dispatchEvent(touchEvent1); // dispatch first touch event
-      window.dispatchEvent(touchEvent2); // dispatch second touch event
-      let result = (touchObj1.clientX - rect.left) / sx;
-      assert.strictEqual(myp5.pmouseX, result);
-    });
-  });
-
-  suite('p5.prototype.pmouseY', function() {
-    test('pmouseY should be a number', function() {
-      assert.isNumber(myp5.pmouseY);
-    });
-
-    test('pmouseY should be previous vertical position of mouse relative to the canvas', function() {
-      window.dispatchEvent(mouseEvent1); // dispatch first mouse event
-      window.dispatchEvent(mouseEvent2); // dispatch second mouse event
-      let result = (mouseEvent1.clientY - rect.top) / sy;
-      assert.strictEqual(myp5.pmouseY, result);
-    });
-
-    test('pmouseY should be previous vertical position of touch relative to the canvas', function() {
-      window.dispatchEvent(touchEvent1); // dispatch first touch event
-      window.dispatchEvent(touchEvent2); // dispatch second touch event
-      let result = (touchObj1.clientY - rect.top) / sy;
-      assert.strictEqual(myp5.pmouseY, result);
-    });
-  });
-  suite('p5.prototype.winMouseX', function() {
-    test('winMouseX should be a number', function() {
-      assert.isNumber(myp5.winMouseX);
-    });
-
-    test('winMouseX should be current horizontal position of mouse relative to the window', function() {
-      window.dispatchEvent(mouseEvent1);
-      assert.strictEqual(myp5.winMouseX, mouseEvent1.clientX);
-    });
-
-    test('winMouseX should be current horizontal position of touch relative to the window', function() {
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5.winMouseX, touchObj1.clientX);
-    });
-  });
-
-  suite('p5.prototype.winMouseY', function() {
-    test('winMouseY should be a number', function() {
-      assert.isNumber(myp5.winMouseY);
-    });
-
-    test('winMouseY should be current vertical position of mouse relative to the window', function() {
-      window.dispatchEvent(mouseEvent1);
-      assert.strictEqual(myp5.winMouseY, mouseEvent1.clientY);
-    });
-
-    test('winMouseY should be current vertical position of touch relative to the window', function() {
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5.winMouseY, touchObj1.clientY);
-    });
-  });
-
-  suite('p5.prototype.pwinMouseX', function() {
-    test('pwinMouseX should be a number', function() {
-      assert.isNumber(myp5.pwinMouseX);
-    });
-
-    test('pwinMouseX should be previous horizontal position of mouse relative to the window', function() {
-      window.dispatchEvent(mouseEvent1); // dispatch first mouse event
-      window.dispatchEvent(mouseEvent2); // dispatch second mouse event
-      assert.strictEqual(myp5.pwinMouseX, mouseEvent1.clientX);
-    });
-
-    test('pwinMouseX should be previous horizontal position of touch relative to the window', function() {
-      window.dispatchEvent(touchEvent1); // dispatch first touch event
-      window.dispatchEvent(touchEvent2); // dispatch second touch event
-      assert.strictEqual(myp5.pwinMouseX, touchObj1.clientX);
-    });
-  });
-
-  suite('p5.prototype.pwinMouseY', function() {
-    test('pwinMouseY should be a number', function() {
-      assert.isNumber(myp5.pwinMouseY);
-    });
-
-    test('pwinMouseY should be previous vertical position of mouse relative to the window', function() {
-      window.dispatchEvent(mouseEvent1); // dispatch first mouse event
-      window.dispatchEvent(mouseEvent2); // dispatch second mouse event
-      assert.strictEqual(myp5.pwinMouseY, mouseEvent1.clientY);
-    });
-
-    test('pwinMouseY should be previous vertical position of touch relative to the window', function() {
-      window.dispatchEvent(touchEvent1); // dispatch first touch event
-      window.dispatchEvent(touchEvent2); // dispatch second touch event
-      assert.strictEqual(myp5.pwinMouseY, touchObj1.clientY);
-    });
-  });
-
-  suite('p5.prototype.mouseButton', function() {
-    test('_hasMouseInteracted should be a number', function() {
-      assert.isNumber(myp5.mouseButton);
-    });
-
-    test('mouseButton should 0 for uninitialised', function() {
-      assert.strictEqual(myp5.mouseButton, 0);
-    });
-
-    test('mouseButton should be "left" on left mouse button click', function() {
-      window.dispatchEvent(new MouseEvent('mousedown', { button: 0 }));
-      assert.strictEqual(myp5.mouseButton, 'left');
-    });
-
-    test('mouseButton should be "center" on auxillary mouse button click', function() {
-      window.dispatchEvent(new MouseEvent('mousedown', { button: 1 }));
-      assert.strictEqual(myp5.mouseButton, 'center');
-    });
-
-    test('mouseButton should be "right" on right mouse button click', function() {
-      window.dispatchEvent(new MouseEvent('mousedown', { button: 2 }));
-      assert.strictEqual(myp5.mouseButton, 'right');
-    });
-  });
-
-  suite('p5.prototype.mouseIsPressed', function() {
-    test('mouseIsPressed should be a boolean', function() {
-      assert.isBoolean(myp5.mouseIsPressed);
-    });
-
-    test('mouseIsPressed should be false if mouse is not pressed', function() {
-      assert.strictEqual(myp5.mouseIsPressed, false);
-    });
-
-    test('mouseIsPressed should be true if mouse is pressed', function() {
-      window.dispatchEvent(new MouseEvent('mousedown'));
-      assert.strictEqual(myp5.mouseIsPressed, true);
-    });
-  });
-
-  suite('mouseMoved', function() {
-    test('mouseMoved function must run when mouse is moved', async function() {
-      let count = 0;
-
-      myp5.mouseMoved = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('mousemove'));
-      window.dispatchEvent(new MouseEvent('mousemove'));
-      assert.deepEqual(count, 2);
-    });
-
-    test('mouseMoved functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mouseMoved = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('mousemove')); //dispatch a mouse event to trigger the mouseMoved functions
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseMoved was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('mouseDragged', function() {
-    test('mouseDragged function must run when mouse is dragged', async function() {
-      let count = 0;
-
-      myp5.mouseDragged = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('mousedown')); //dispatch a mousedown event
-      window.dispatchEvent(new MouseEvent('mousemove')); //dispatch mousemove event while mouse is down to trigger mouseDragged
-      assert.deepEqual(count, 1);
-    });
-
-    test('mouseDragged functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mouseDragged = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('mousedown')); //dispatch a mousedown event
-      window.dispatchEvent(new MouseEvent('mousemove')); //dispatch mousemove event while mouse is down to trigger mouseDragged
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseDragged was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('mousePressed', function() {
-    test('mousePressed function must run when mouse is pressed', async function() {
-      let count = 0;
-
-      myp5.mousePressed = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('mousedown'));
-      assert.deepEqual(count, 1);
-    });
-
-    test('mousePressed functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mousePressed = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('mousedown'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseDragged was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('mouseReleased', function() {
-    test('mouseReleased function must run when mouse is released', async function() {
-      let count = 0;
-
-      myp5.mouseReleased = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('mouseup'));
-      assert.deepEqual(count, 1);
-    });
-
-    test('mouseReleased functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mouseReleased = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('mouseup'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseReleased was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('mouseClicked', function() {
-    test('mouseClicked function must run when mouse is clicked', async function() {
-      let count = 0;
-
-      myp5.mouseClicked = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('click'));
-      assert.deepEqual(count, 1);
-    });
-
-    test('mouseClicked functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mouseClicked = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('click'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseClicked was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('doubleClicked', function() {
-    test('doubleClicked function must run when mouse is double clicked', async function() {
-      let count = 0;
-
-      myp5.doubleClicked = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('dblclick'));
-      assert.deepEqual(count, 1);
-    });
-
-    test('doubleClicked functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.doubleClicked = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('dblclick'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times doubleClicked was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('mouseWheel', function() {
-    test('mouseWheel function must run when mouse wheel event is detected', async function() {
-      let count = 0;
-
-      myp5.mouseWheel = function() {
-        count += 1;
-      };
-
-      window.dispatchEvent(new MouseEvent('wheel'));
-      assert.deepEqual(count, 1);
-    });
-
-    test('mouseWheel functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-
-        sketch.mouseWheel = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new MouseEvent('wheel'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result; //get array holding number of times mouseWheel was called. Rejected sketches also thrown here
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-});

package/p5-tests/unit/events/touch.js

@@ -1,180 +0,0 @@
-suite('Touch Events', function() {
-  let myp5;
-
-  let canvas;
-  let touchObj1;
-  let touchObj2;
-  let touchEvent1;
-  let touchEvent2;
-
-  setup(function(done) {
-    new p5(function(p) {
-      p.setup = function() {
-        myp5 = p;
-        canvas = myp5._curElement.elt;
-        touchObj1 = new Touch({
-          target: canvas,
-          clientX: 100,
-          clientY: 100,
-          identifier: 36
-        });
-        touchObj2 = new Touch({
-          target: canvas,
-          clientX: 200,
-          clientY: 200,
-          identifier: 35
-        });
-        touchEvent1 = new TouchEvent('touchmove', {
-          touches: [touchObj1, touchObj2]
-        });
-        touchEvent2 = new TouchEvent('touchmove', {
-          touches: [touchObj2]
-        });
-        done();
-      };
-    });
-  });
-
-  teardown(function() {
-    myp5.remove();
-  });
-
-  suite('p5.prototype.touches', function() {
-    test('should be an empty array', function() {
-      assert.deepEqual(myp5.touches, []);
-    });
-
-    test('should be an array of multiple touches', function() {
-      window.dispatchEvent(touchEvent1);
-      assert.strictEqual(myp5.touches.length, 2);
-    });
-
-    test('should contain the touch registered', function() {
-      window.dispatchEvent(touchEvent2);
-      assert.strictEqual(myp5.touches[0].id, 35);
-    });
-  });
-
-  suite('touchStarted', function() {
-    test('touchStarted should be fired when a touch is registered', function() {
-      let count = 0;
-      myp5.touchStarted = function() {
-        count += 1;
-      };
-      window.dispatchEvent(new TouchEvent('touchstart'));
-      assert.strictEqual(count, 1);
-    });
-
-    test('should be fired when a touch starts over the element', function() {
-      let count = 0;
-      let div = myp5.createDiv();
-      let divTouchStarted = function() {
-        count += 1;
-      };
-      div.touchStarted(divTouchStarted);
-      div.elt.dispatchEvent(new TouchEvent('touchstart'));
-      assert.strictEqual(count, 1);
-    });
-
-    test('touchStarted functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-        sketch.touchStarted = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new TouchEvent('touchstart'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result;
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('touchMoved', function() {
-    test('touchMoved should be fired when a touchmove is registered', function() {
-      let count = 0;
-      myp5.touchMoved = function() {
-        count += 1;
-      };
-      window.dispatchEvent(touchEvent2);
-      assert.strictEqual(count, 1);
-    });
-
-    test('should be fired when a touchmove is registered over the element', function() {
-      let count = 0;
-      let div = myp5.createDiv();
-      let divTouchMoved = function() {
-        count += 1;
-      };
-      div.touchMoved(divTouchMoved);
-      div.elt.dispatchEvent(touchEvent2);
-      assert.strictEqual(count, 1);
-    });
-
-    test('touchMoved functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-        sketch.touchMoved = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(touchEvent2);
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result;
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-
-  suite('touchEnded', function() {
-    test('touchEnded must run when a touch is registered', function() {
-      let count = 0;
-      myp5.touchEnded = function() {
-        count += 1;
-      };
-      window.dispatchEvent(new TouchEvent('touchend'));
-      assert.strictEqual(count, 1);
-    });
-
-    test('should be fired when a touch starts over the element', function() {
-      let count = 0;
-      let div = myp5.createDiv();
-      let divTouchEnded = function() {
-        count += 1;
-      };
-      div.touchEnded(divTouchEnded);
-      div.elt.dispatchEvent(new TouchEvent('touchend'));
-      assert.strictEqual(count, 1);
-    });
-
-    test('touchEnded functions on multiple instances must run once', async function() {
-      let sketchFn = function(sketch, resolve, reject) {
-        let count = 0;
-        sketch.touchEnded = function() {
-          count += 1;
-        };
-
-        sketch.finish = function() {
-          resolve(count);
-        };
-      };
-      let sketches = parallelSketches([sketchFn, sketchFn]); //create two sketches
-      await sketches.setup; //wait for all sketches to setup
-      window.dispatchEvent(new TouchEvent('touchend'));
-      sketches.end(); //resolve all sketches by calling their finish functions
-      let counts = await sketches.result;
-      assert.deepEqual(counts, [1, 1]);
-    });
-  });
-});