From ed4347714bd30b6a08917d3d73604fdedfd02d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Lehni?= Date: Wed, 10 Feb 2016 13:26:40 +0100 Subject: [PATCH] Remove duplicate unit tests. --- test/tests/Path.js | 2 +- test/tests/Path_Curves.js | 182 -------------------------------------- test/tests/load.js | 1 - 3 files changed, 1 insertion(+), 184 deletions(-) delete mode 100644 test/tests/Path_Curves.js diff --git a/test/tests/Path.js b/test/tests/Path.js index 8dfdd3db..a392a74b 100644 --- a/test/tests/Path.js +++ b/test/tests/Path.js @@ -378,7 +378,7 @@ test('path.flatten(maxDistance)', function() { }, false, 'The points of the last and first segments should not be the same.'); equals(function() { - return path.lastSegment.point.toString() != path.segments[path.segments.length - 2].point.toString(); + return path.lastSegment.point.toString() != path.lastSegment.previous.point.toString(); }, true, 'The points of the last and before last segments should not be so close, that calling toString on them returns the same string value.'); }); diff --git a/test/tests/Path_Curves.js b/test/tests/Path_Curves.js deleted file mode 100644 index 2ead8045..00000000 --- a/test/tests/Path_Curves.js +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Paper.js - The Swiss Army Knife of Vector Graphics Scripting. - * http://paperjs.org/ - * - * Copyright (c) 2011 - 2016, Juerg Lehni & Jonathan Puckey - * http://scratchdisk.com/ & http://jonathanpuckey.com/ - * - * Distributed under the MIT license. See LICENSE file for details. - * - * All rights reserved. - */ - -QUnit.module('Path Curves'); - -test('path.curves synchronisation', function() { - var path = new Path(); - - path.add(new Point(100, 100)); - equals(path.segments.toString(), "{ point: { x: 100, y: 100 } }", "path.segments: path.add(new Point(100, 100));"); - equals(path.curves.toString(), "", "path.curves: path.add(new Point(100, 100));"); - path.insert(0, new Point(0, 100)); - equals(path.segments.toString(), "{ point: { x: 0, y: 100 } },{ point: { x: 100, y: 100 } }", "path.segments: path.insert(0, new Point(0, 100));"); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, point2: { x: 100, y: 100 } }", "path.curves: path.insert(0, new Point(0, 100));"); - path.insert(1, {point:[50, 0], handleIn:[-25, 0], handleOut:[25, 0]}); - equals(path.segments.toString(), "{ point: { x: 0, y: 100 } },{ point: { x: 50, y: 0 }, handleIn: { x: -25, y: 0 }, handleOut: { x: 25, y: 0 } },{ point: { x: 100, y: 100 } }", "path.segments: path.insert(1, {point:[50, 0], handleIn:[-25, 0], handleOut:[25, 0]});"); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, handle2: { x: -25, y: 0 }, point2: { x: 50, y: 0 } },{ point1: { x: 50, y: 0 }, handle1: { x: 25, y: 0 }, point2: { x: 100, y: 100 } }", "path.curves: path.insert(1, {point:[50, 0], handleIn:[-25, 0], handleOut:[25, 0]});"); - path.closed = true; - equals(path.segments.toString(), "{ point: { x: 0, y: 100 } },{ point: { x: 50, y: 0 }, handleIn: { x: -25, y: 0 }, handleOut: { x: 25, y: 0 } },{ point: { x: 100, y: 100 } }", "path.segments: path.closed = true;"); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, handle2: { x: -25, y: 0 }, point2: { x: 50, y: 0 } },{ point1: { x: 50, y: 0 }, handle1: { x: 25, y: 0 }, point2: { x: 100, y: 100 } },{ point1: { x: 100, y: 100 }, point2: { x: 0, y: 100 } }", "path.curves: path.closed = true;"); - path.removeSegments(2, 3); - equals(path.segments.toString(), "{ point: { x: 0, y: 100 } },{ point: { x: 50, y: 0 }, handleIn: { x: -25, y: 0 }, handleOut: { x: 25, y: 0 } }", "path.segments: path.removeSegments(2, 3);"); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, handle2: { x: -25, y: 0 }, point2: { x: 50, y: 0 } },{ point1: { x: 50, y: 0 }, handle1: { x: 25, y: 0 }, point2: { x: 0, y: 100 } }", "path.curves: path.removeSegments(2, 3);"); - path.add(new Point(100, 100)); - path.removeSegments(1, 2); - equals(path.segments.toString(), "{ point: { x: 0, y: 100 } },{ point: { x: 100, y: 100 } }", "path.segments: path.add(new Point(100, 100));\npath.removeSegments(1, 2);"); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, point2: { x: 100, y: 100 } },{ point1: { x: 100, y: 100 }, point2: { x: 0, y: 100 } }", "path.curves: path.add(new Point(100, 100));\npath.removeSegments(1, 2);"); - - // Transform the path, and the curves length should be invalidated (first, force-cache the first segment's length by accessing it - var length = path.curves[0].length; - ok(path.curves[0]._length, 'Curve length does not appear to be cached'); - path.scale(2, [0, 0]); - equals(path.curves[0].length, 200, 'Curve length should be updated when path is transformed'); - - var points = []; - for (var i = 0; i < 40; i++) - points.push(Point.random()); - var path = new Path(points); - equals(path.segments.length, 40, 'segments.length'); - equals(path.curves.length, 39, 'curves.length'); - path.removeSegments(); - equals(path.segments.length, 0, 'segments.length'); - equals(path.curves.length, 0, 'curves.length'); -}); - -test('path.curves on closed paths', function() { - var path = new Path.Circle(new Point(100, 100) , 100); - equals(path.curves.toString(), "{ point1: { x: 0, y: 100 }, handle1: { x: 0, y: -55.22847 }, handle2: { x: -55.22847, y: 0 }, point2: { x: 100, y: 0 } },{ point1: { x: 100, y: 0 }, handle1: { x: 55.22847, y: 0 }, handle2: { x: 0, y: -55.22847 }, point2: { x: 200, y: 100 } },{ point1: { x: 200, y: 100 }, handle1: { x: 0, y: 55.22847 }, handle2: { x: 55.22847, y: 0 }, point2: { x: 100, y: 200 } },{ point1: { x: 100, y: 200 }, handle1: { x: -55.22847, y: 0 }, handle2: { x: 0, y: 55.22847 }, point2: { x: 0, y: 100 } }"); - path.removeSegments(0, 1); - equals(path.curves.toString(), "{ point1: { x: 100, y: 0 }, handle1: { x: 55.22847, y: 0 }, handle2: { x: 0, y: -55.22847 }, point2: { x: 200, y: 100 } },{ point1: { x: 200, y: 100 }, handle1: { x: 0, y: 55.22847 }, handle2: { x: 55.22847, y: 0 }, point2: { x: 100, y: 200 } },{ point1: { x: 100, y: 200 }, handle1: { x: -55.22847, y: 0 }, handle2: { x: -55.22847, y: 0 }, point2: { x: 100, y: 0 } }"); -}); - - -test('path.flatten(maxDistance)', function() { - var path = new Path.Circle(new Size(80, 50), 35); - - // Convert its curves to points, with a max distance of 20: - path.flatten(20); - - equals(function() { - return path.lastSegment.point.equals(path.firstSegment.point); - }, false, 'The points of the last and first segments should not be the same.'); - - equals(function() { - return path.lastSegment.point.toString() != path.segments[path.segments.length - 2].point.toString(); - }, true, 'The points of the last and before last segments should not be so close, that calling toString on them returns the same string value.'); -}); - -test('Curve list after removing a segment - 1', function() { - var path = new paper.Path([0, 0], [1, 1], [2, 2]); - var prevCurves = path.curves.slice(); - - equals(function() { - return path.curves.length; - }, 2, 'After creating a path with three segments, we should have two curves. By accessing path.curves we also make sure the curves are created internally.'); - - equals(function() { - return path.segments[1].remove(); - }, true, 'Removing the paths second segment should be successful.'); - - equals(function() { - return path.curves.length; - }, 1, 'After removing the middle segment, we should be left with one curve.'); - - equals(function() { - return path.curves[0] === prevCurves[0]; - }, true, 'The remaining curve should be the same as in the previous state of the curves array.'); - - equals(function() { - return path.curves[0].path === path; - }, true, 'The remaining curve should stay linked to the path.'); - - equals(function() { - return prevCurves[1].path === null; - }, true, 'The removed curve should not stay linked to the path.'); -}); - -test('Curve list after removing a segment - 2', function() { - var path = new paper.Path([0, 0], [1, 1], [2, 2]); - - equals(function() { - return path.curves.length; - }, 2, 'After creating a path with three segments, we should have two curves. By accessing path.curves we also make sure the curves are created internally.'); - - equals(function() { - return path.lastSegment.remove(); - }, true, 'Removing the last segment should be successful.'); - - equals(function() { - return path.curves.length; - }, 1, 'After removing the last segment, we should be left with one curve.'); - - equals(function() { - return path.lastSegment.remove(); - }, true, 'Removing last segment should be successful.'); - - equals(function() { - return path.curves.length; - }, 0, 'After removing the last segment, we should be left with no curves.'); - - equals(function() { - return path.lastSegment.remove(); - }, true, 'Removing the final remaining segment should be successful.'); - - equals(function() { - return path.curves.length; - }, 0, 'After removing all segments, we should be left with no curves.'); - - path.addSegment([0, 0]); - path.addSegment([1, 1]); - - equals(function() { - return path.curves.length; - }, 1, 'After adding two new segments, we should have one curve again.'); - - path.addSegment([2, 2]); - - equals(function() { - return path.curves.length; - }, 2, 'After adding a new segment, we should have two curves again.'); - - equals(function() { - return path.curves[1].segment1 === path.curves[0].segment2; - }, true, "The newly created curve's first segment needs to be the same as the previous curve's second segment."); - - path.addSegments([[3, 3], [4, 4]]); - - equals(function() { - return path.curves.length; - }, 4, 'After adding two new segments at the end, we should have four curves now.'); -}); - -test('Splitting a straight path should produce segments without handles', function() { - var path1 = new Path.Line([0, 0], [50, 50]); - var path2 = path1.split(0, 0.5); - equals(function() { - return !path1.lastSegment.hasHandles() && !path2.firstSegment.hasHandles(); - }, true); -}); - -test('Splitting a path with one curve in the middle result in two paths of the same length with one curve each', function() { - var path1 = new Path.Line([0, 0], [100, 100]); - var path2 = path1.split(path1.getLocationAt(path1.length / 2)); - equals(function() { - return path1.curves.length; - }, 1); - equals(function() { - return path2.curves.length; - }, 1); - equals(function() { - return path1.length === path2.length; - }, true); -}); diff --git a/test/tests/load.js b/test/tests/load.js index d8e373eb..6514919d 100644 --- a/test/tests/load.js +++ b/test/tests/load.js @@ -33,7 +33,6 @@ /*#*/ include('Path.js'); /*#*/ include('Path_Constructors.js'); -/*#*/ include('Path_Curves.js'); /*#*/ include('Path_Intersections.js'); /*#*/ include('Path_Boolean.js'); /*#*/ include('PathItem_Contains.js');