Skip to content

Commit 83be3cb

Browse files
lehnilehni
committed
Fix SVGImport tests to work with new Shape import.
1 parent 9976033 commit 83be3cb

2 files changed

Lines changed: 50 additions & 50 deletions

File tree

‎test/lib/helpers.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ function compareItems(item, item2, cloned, checkIdentity, dontShareProject) {
227227
}, true);
228228

229229
var itemProperties = ['opacity', 'locked', 'visible', 'blendMode', 'name',
230-
'selected', 'clipMask'];
230+
'selected', 'clipMask', 'guide'];
231231
Base.each(itemProperties, function(key) {
232232
var value = item[key];
233233
// When item was cloned and had a name, the name will be versioned
@@ -272,7 +272,7 @@ function compareItems(item, item2, cloned, checkIdentity, dontShareProject) {
272272
}
273273

274274
// Path specific
275-
if (item2 instanceof Path) {
275+
if (item instanceof Path) {
276276
var keys = ['closed', 'fullySelected', 'clockwise'];
277277
for (var i = 0, l = keys.length; i < l; i++) {
278278
var key = keys[i];
@@ -282,6 +282,15 @@ function compareItems(item, item2, cloned, checkIdentity, dontShareProject) {
282282
compareSegmentLists(item.segments, item2.segments, checkIdentity);
283283
}
284284

285+
// Shape specific
286+
if (item instanceof Shape) {
287+
var keys = ['shape', 'size', 'radius'];
288+
for (var i = 0, l = keys.length; i < l; i++) {
289+
var key = keys[i];
290+
equals(item[key], item2[key], 'Compare Shape#' + key);
291+
}
292+
}
293+
285294
// Group specific
286295
if (item instanceof Group) {
287296
equals(function() {

‎test/tests/SVGImport.js‎

Lines changed: 39 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test('make an svg line', function() {
3434

3535
var line = new Path.Line([x1, y1], [x2, y2]);
3636

37-
compareSegmentLists(importedLine.segments, line.segments, true);
37+
compareItems(importedLine, line);
3838
});
3939

4040
test('make an svg line with invalid values', function() {
@@ -49,7 +49,7 @@ test('make an svg line with invalid values', function() {
4949

5050
var line = new Path.Line([0, 0], [0, 0]);
5151

52-
compareSegmentLists(importedLine.segments, line.segments, true);
52+
compareItems(importedLine, line);
5353
});
5454

5555
test('compare rectangle values', function() {
@@ -69,9 +69,9 @@ test('compare rectangle values', function() {
6969
var topLeft = new Point(x, y);
7070
var size = new Size(width, height);
7171
var rectangle = new Rectangle(topLeft, size);
72-
var realRectangle = new Path.Rectangle(rectangle);
72+
var realRectangle = new Shape.Rectangle(rectangle);
7373

74-
compareSegmentLists(importedRectangle.segments, realRectangle.segments, true);
74+
compareItems(importedRectangle, realRectangle);
7575
});
7676

7777

@@ -91,9 +91,9 @@ test('compare negative rectangle values', function() {
9191
var topLeft = new Point(x, y);
9292
var size = new Size(width, height);
9393
var rectangle = new Rectangle(topLeft, size);
94-
var realRectangle = new Path.Rectangle(rectangle);
94+
var realRectangle = new Shape.Rectangle(rectangle);
9595

96-
compareSegmentLists(importedRectangle.segments, realRectangle.segments, true);
96+
compareItems(importedRectangle, realRectangle);
9797
});
9898

9999

@@ -111,9 +111,9 @@ test('compare invalid rectangle values', function() {
111111
var topLeft = new Point(0, 0);
112112
var size = new Size(0, 0);
113113
var rectangle = new Rectangle(topLeft, size);
114-
var realRectangle = new Path.Rectangle(rectangle);
114+
var realRectangle = new Shape.Rectangle(rectangle);
115115

116-
compareSegmentLists(importedRectangle.segments, realRectangle.segments, true);
116+
compareItems(importedRectangle, realRectangle);
117117
});
118118

119119
test('compare round rectangle values', function() {
@@ -138,9 +138,9 @@ test('compare round rectangle values', function() {
138138
var size = new Size(width, height);
139139
var cornerSize = new Size(rx, ry);
140140
var rectangle = new Rectangle(topLeft, size);
141-
var roundRect = new Path.Rectangle(rectangle, cornerSize);
141+
var roundRect = new Shape.Rectangle(rectangle, cornerSize);
142142

143-
compareSegmentLists(importedRectangle.segments, roundRect.segments, true);
143+
compareItems(importedRectangle, roundRect);
144144
});
145145

146146
test('compare negative round rectangle values', function() {
@@ -165,9 +165,9 @@ test('compare negative round rectangle values', function() {
165165
var size = new Size(width, height);
166166
var cornerSize = new Size(rx, ry);
167167
var rectangle = new Rectangle(topLeft, size);
168-
var roundRect = new Path.Rectangle(rectangle, cornerSize);
168+
var roundRect = new Shape.Rectangle(rectangle, cornerSize);
169169

170-
compareSegmentLists(importedRectangle.segments, roundRect.segments, true);
170+
compareItems(importedRectangle, roundRect);
171171
});
172172

173173
test('compare invalid round rectangle values', function() {
@@ -192,9 +192,9 @@ test('compare invalid round rectangle values', function() {
192192
var size = new Size(width, height);
193193
var cornerSize = new Size(rx, ry);
194194
var rectangle = new Rectangle(topLeft, size);
195-
var roundRect = new Path.Rectangle(rectangle, cornerSize);
195+
var roundRect = new Shape.Rectangle(rectangle, cornerSize);
196196

197-
compareSegmentLists(importedRectangle.segments, roundRect.segments, true);
197+
compareItems(importedRectangle, roundRect);
198198
});
199199

200200
test('compare ellipse values', function() {
@@ -211,15 +211,12 @@ test('compare ellipse values', function() {
211211

212212
var importedEllipse = paper.project.importSVG(shape);
213213

214-
var center = new Point(cx, cy);
215-
var offset = new Point(rx, ry);
216-
var topLeft = center.subtract(offset);
217-
var bottomRight = center.add(offset);
218-
219-
var rect = new Rectangle(topLeft, bottomRight);
220-
var ellipse = new Path.Ellipse(rect);
214+
var ellipse = new Shape.Ellipse({
215+
center: new Point(cx, cy),
216+
radius: new Point(rx, ry)
217+
});
221218

222-
compareSegmentLists(importedEllipse.segments, ellipse.segments, true);
219+
compareItems(importedEllipse, ellipse);
223220
});
224221

225222
test('compare negative ellipse values', function() {
@@ -236,15 +233,12 @@ test('compare negative ellipse values', function() {
236233

237234
var importedEllipse = paper.project.importSVG(shape);
238235

239-
var center = new Point(cx, cy);
240-
var offset = new Point(rx, ry);
241-
var topLeft = center.subtract(offset);
242-
var bottomRight = center.add(offset);
243-
244-
var rect = new Rectangle(topLeft, bottomRight);
245-
var ellipse = new Path.Ellipse(rect);
236+
var ellipse = new Shape.Ellipse({
237+
center: new Point(cx, cy),
238+
radius: new Point(rx, ry)
239+
});
246240

247-
compareSegmentLists(importedEllipse.segments, ellipse.segments, true);
241+
compareItems(importedEllipse, ellipse);
248242
});
249243

250244
test('compare invalid ellipse values', function() {
@@ -257,15 +251,12 @@ test('compare invalid ellipse values', function() {
257251

258252
var importedEllipse = paper.project.importSVG(shape);
259253

260-
var center = new Point(0, 0);
261-
var offset = new Point(0, 0);
262-
var topLeft = center.subtract(offset);
263-
var bottomRight = center.add(offset);
264-
265-
var rect = new Rectangle(topLeft, bottomRight);
266-
var ellipse = new Path.Ellipse(rect);
254+
var ellipse = new Shape.Ellipse({
255+
center: new Point(0, 0),
256+
radius: new Point(0, 0)
257+
});
267258

268-
compareSegmentLists(importedEllipse.segments, ellipse.segments, true);
259+
compareItems(importedEllipse, ellipse);
269260
});
270261

271262
test('compare circle values', function() {
@@ -281,9 +272,9 @@ test('compare circle values', function() {
281272
var importedCircle = paper.project.importSVG(shape);
282273

283274
var center = new Point(cx, cy);
284-
var circle = new Path.Circle(center, r);
275+
var circle = new Shape.Circle(center, r);
285276

286-
compareSegmentLists(importedCircle.segments, circle.segments, true);
277+
compareItems(importedCircle, circle);
287278
});
288279

289280
test('compare negative circle values', function() {
@@ -299,9 +290,9 @@ test('compare negative circle values', function() {
299290
var importedCircle = paper.project.importSVG(shape);
300291

301292
var center = new Point(cx, cy);
302-
var circle = new Path.Circle(center, r);
293+
var circle = new Shape.Circle(center, r);
303294

304-
compareSegmentLists(importedCircle.segments, circle.segments, true);
295+
compareItems(importedCircle, circle);
305296
});
306297

307298

@@ -315,9 +306,9 @@ test('compare invalid circle values', function() {
315306
var importedCircle = paper.project.importSVG(shape);
316307

317308
var center = new Point(0, 0);
318-
var circle = new Path.Circle(center, 0);
309+
var circle = new Shape.Circle(center, 0);
319310

320-
compareSegmentLists(importedCircle.segments, circle.segments, true);
311+
compareItems(importedCircle, circle);
321312

322313
});
323314

@@ -339,7 +330,7 @@ test('compare polygon values', function() {
339330
poly.closePath();
340331
}
341332

342-
compareSegmentLists(importedPolygon.segments, poly.segments, true);
333+
compareItems(importedPolygon, poly);
343334
});
344335

345336
test('compare negative polygon values', function() {
@@ -360,7 +351,7 @@ test('compare negative polygon values', function() {
360351
poly.closePath();
361352
}
362353

363-
compareSegmentLists(importedPolygon.segments, poly.segments, true);
354+
compareItems(importedPolygon, poly);
364355
});
365356

366357
test('compare polyline values', function() {
@@ -381,7 +372,7 @@ test('compare polyline values', function() {
381372
poly.closePath();
382373
}
383374

384-
compareSegmentLists(importedPolyline.segments, poly.segments, true);
375+
compareItems(importedPolyline, poly);
385376
});
386377

387378
test('compare negative polyline values', function() {
@@ -402,5 +393,5 @@ test('compare negative polyline values', function() {
402393
poly.closePath();
403394
}
404395

405-
compareSegmentLists(importedPolyline.segments, poly.segments, true);
396+
compareItems(importedPolyline, poly);
406397
});

0 commit comments

Comments
 (0)