mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-01 02:38:43 -05:00
Start refactoring Color tests.
This commit is contained in:
Jürg Lehni
parent
a48e6e5bf9
commit
0aa6c66681
5 changed files with 81 additions and 137 deletions
|
|
@ -60,7 +60,7 @@ function asyncTest(testName, expected) {
|
|||
}
|
||||
|
||||
function compareNumbers(number1, number2, message) {
|
||||
equals(Format.number(number1, 2), Format.number(number2, 2), message);
|
||||
equals(Format.number(number1, 5), Format.number(number2, 5), message);
|
||||
}
|
||||
|
||||
function comparePoints(point1, point2, message) {
|
||||
|
|
@ -81,40 +81,11 @@ function compareRectangles(rect1, rect2, message) {
|
|||
(message || '') + ' height');
|
||||
}
|
||||
|
||||
function compareRgbColors(color1, color2, message) {
|
||||
function compareColors(color1, color2, message) {
|
||||
color1 = new Color(color1);
|
||||
color2 = new Color(color2);
|
||||
|
||||
compareNumbers(color1.red, color2.red,
|
||||
(message || '') + ' red');
|
||||
compareNumbers(color1.green, color2.green,
|
||||
(message || '') + ' green');
|
||||
compareNumbers(color1.blue, color2.blue,
|
||||
(message || '') + ' blue');
|
||||
compareNumbers(color1.alpha, color2.alpha,
|
||||
(message || '') + ' alpha');
|
||||
}
|
||||
|
||||
function compareHsbColors(color1, color2, message) {
|
||||
color1 = new Color(color1);
|
||||
color2 = new Color(color2);
|
||||
|
||||
compareNumbers(color1.hue, color2.hue,
|
||||
(message || '') + ' hue');
|
||||
compareNumbers(color1.saturation, color2.saturation,
|
||||
(message || '') + ' saturation');
|
||||
compareNumbers(color1.brightness, color2.brightness,
|
||||
(message || '') + ' brightness');
|
||||
compareNumbers(color1.alpha, color2.alpha,
|
||||
(message || '') + ' alpha');
|
||||
}
|
||||
|
||||
function compareGrayColors(color1, color2, message) {
|
||||
color1 = new Color(color1);
|
||||
color2 = new Color(color2);
|
||||
|
||||
compareNumbers(color1.gray, color2.gray,
|
||||
(message || '') + ' gray');
|
||||
equals(color1.type, color2.type, (message || '') + ' type');
|
||||
equals(color1.components.toString(), color2.components.toString(), (message || '') + ' components');
|
||||
}
|
||||
|
||||
function compareGradientColors(gradientColor, gradientColor2, checkIdentity) {
|
||||
|
|
|
|||
|
|
@ -15,90 +15,63 @@ module('Color');
|
|||
test('Set named color', function() {
|
||||
var path = new Path();
|
||||
path.fillColor = 'red';
|
||||
compareRgbColors(path.fillColor, new Color(1, 0, 0));
|
||||
compareColors(path.fillColor, new Color(1, 0, 0));
|
||||
equals(path.fillColor.toCss(), 'rgb(255, 0, 0)');
|
||||
});
|
||||
|
||||
test('Set color to hex', function() {
|
||||
var path = new Path();
|
||||
path.fillColor = '#ff0000';
|
||||
compareRgbColors(path.fillColor, new Color(1, 0, 0));
|
||||
compareColors(path.fillColor, new Color(1, 0, 0));
|
||||
equals(path.fillColor.toCss(), 'rgb(255, 0, 0)');
|
||||
|
||||
var path = new Path();
|
||||
path.fillColor = '#f00';
|
||||
compareRgbColors(path.fillColor, new Color(1, 0, 0));
|
||||
compareColors(path.fillColor, new Color(1, 0, 0));
|
||||
equals(path.fillColor.toCss(), 'rgb(255, 0, 0)');
|
||||
});
|
||||
|
||||
test('Set color to object', function() {
|
||||
var path = new Path();
|
||||
path.fillColor = { red: 1, green: 0, blue: 1};
|
||||
compareRgbColors(path.fillColor, new Color(1, 0, 1));
|
||||
compareColors(path.fillColor, new Color(1, 0, 1));
|
||||
equals(path.fillColor.toCss(), 'rgb(255, 0, 255)');
|
||||
|
||||
var path = new Path();
|
||||
path.fillColor = { gray: 0.2 };
|
||||
compareRgbColors(path.fillColor, new Color(0.8, 0.8, 0.8));
|
||||
compareColors(path.fillColor, new Color(0.2));
|
||||
equals(path.fillColor.toCss(), 'rgb(204, 204, 204)');
|
||||
});
|
||||
|
||||
test('Set color to array', function() {
|
||||
var path = new Path();
|
||||
path.fillColor = [1, 0, 0];
|
||||
compareRgbColors(path.fillColor, new Color(1, 0, 0));
|
||||
compareColors(path.fillColor, new Color(1, 0, 0));
|
||||
equals(path.fillColor.toCss(), 'rgb(255, 0, 0)');
|
||||
});
|
||||
|
||||
test('Creating colors', function() {
|
||||
|
||||
compareRgbColors(new Color('#ff0000'), new Color(1, 0, 0),
|
||||
'RgbColor from hex code');
|
||||
compareColors(new Color('#ff0000'), new Color(1, 0, 0),
|
||||
'Color from hex code');
|
||||
|
||||
compareRgbColors(new Color({ red: 1, green: 0, blue: 1}),
|
||||
new Color(1, 0, 1), 'RgbColor from rgb object literal');
|
||||
compareColors(new Color({ red: 1, green: 0, blue: 1}),
|
||||
new Color(1, 0, 1), 'Color from rgb object literal');
|
||||
|
||||
compareRgbColors(new Color({ gray: 0.2 }),
|
||||
new Color(0.8, 0.8, 0.8), 'RgbColor from gray object literal');
|
||||
compareColors(new Color({ gray: 0.2 }),
|
||||
new Color(0.8, 0.8, 0.8).convert('gray'), 'Color from gray object literal');
|
||||
|
||||
compareRgbColors(new Color({ hue: 0, saturation: 1, brightness: 1}),
|
||||
new Color(1, 0, 0), 'RgbColor from hsb object literal');
|
||||
compareColors(new Color({ hue: 0, saturation: 1, brightness: 1}),
|
||||
new Color(1, 0, 0).convert('hsb'), 'Color from hsb object literal');
|
||||
|
||||
compareRgbColors(new Color([1, 0, 0]), new Color(1, 0, 0),
|
||||
'RgbColor from array');
|
||||
compareColors(new Color([1, 0, 0]), new Color(1, 0, 0),
|
||||
'Rgb Color from array');
|
||||
|
||||
compareHsbColors(new HsbColor('#000000'), new HsbColor(0, 0, 0),
|
||||
'HsbColor from hex code');
|
||||
|
||||
compareHsbColors(new HsbColor({ red: 1, green: 0, blue: 0}),
|
||||
new HsbColor(0, 1, 1), 'HsbColor from rgb object literal');
|
||||
|
||||
compareHsbColors(new HsbColor({ gray: 0.8 }),
|
||||
new HsbColor(0, 0, 0.2), 'RgbColor from gray object literal');
|
||||
|
||||
compareHsbColors(new HsbColor([1, 0, 0]), new HsbColor(1, 0, 0),
|
||||
'HsbColor from array');
|
||||
|
||||
compareGrayColors(new GrayColor('#000000'), new GrayColor(1),
|
||||
'GrayColor from hex code');
|
||||
|
||||
compareGrayColors(new GrayColor('#ffffff'), new GrayColor(0),
|
||||
'GrayColor from hex code');
|
||||
|
||||
compareGrayColors(new GrayColor({ red: 1, green: 1, blue: 1}),
|
||||
new GrayColor(0), 'GrayColor from rgb object literal');
|
||||
|
||||
compareGrayColors(new GrayColor({ gray: 0.2 }),
|
||||
new GrayColor(0.2), 'GrayColor from gray object literal');
|
||||
|
||||
compareGrayColors(new GrayColor({ hue: 0, saturation: 0, brightness: 0.8}),
|
||||
new GrayColor(0.2), 'GrayColor from hsb object literal');
|
||||
|
||||
compareGrayColors(new GrayColor([1]), new GrayColor(1),
|
||||
'GrayColor from array');
|
||||
compareColors(new Color([1]), new Color(1),
|
||||
'Gray Color from array');
|
||||
});
|
||||
|
||||
test('Get gray from RgbColor', function() {
|
||||
test('Get gray from RGB Color', function() {
|
||||
var color = new Color(1, 0.5, 0.2);
|
||||
compareNumbers(color.gray, 0.38458251953125);
|
||||
|
||||
|
|
@ -106,70 +79,70 @@ test('Get gray from RgbColor', function() {
|
|||
compareNumbers(color.gray, 0.72137451171875);
|
||||
});
|
||||
|
||||
test('Get gray from HsbColor', function() {
|
||||
test('Get gray from HSB Color', function() {
|
||||
var color = new HsbColor(0, 0, 0.2);
|
||||
compareNumbers(color.gray, 0.8);
|
||||
});
|
||||
|
||||
test('Get red from HsbColor', function() {
|
||||
test('Get red from HSB Color', function() {
|
||||
var color = new HsbColor(0, 1, 1);
|
||||
compareNumbers(color.red, 1);
|
||||
});
|
||||
|
||||
test('Get hue from RgbColor', function() {
|
||||
test('Get hue from RGB Color', function() {
|
||||
var color = new Color(1, 0, 0);
|
||||
compareNumbers(color.hue, 0);
|
||||
compareNumbers(color.saturation, 1);
|
||||
});
|
||||
|
||||
test('Gray Color', function() {
|
||||
var color = new GrayColor(1);
|
||||
var color = new Color(1);
|
||||
compareNumbers(color.gray, 1);
|
||||
compareNumbers(color.red, 0);
|
||||
compareNumbers(color.blue, 0);
|
||||
|
||||
color.red = 0.5;
|
||||
compareNumbers(color.gray, '0.84999');
|
||||
compareNumbers(color.gray, 0.85055);
|
||||
|
||||
color.green = 0.2;
|
||||
compareNumbers(color.gray, '0.82051');
|
||||
|
||||
compareNumbers(color.red, 0.5);
|
||||
compareNumbers(color.green, 0.2);
|
||||
compareNumbers(color.blue, 0);
|
||||
|
||||
compareNumbers(color.gray, 0.73315);
|
||||
});
|
||||
|
||||
test('Converting Colors', function() {
|
||||
var rgbColor = new Color(1, 0.5, 0.2);
|
||||
compareNumbers(new GrayColor(rgbColor).gray, 0.38299560546875);
|
||||
|
||||
var grayColor = new GrayColor(0.2);
|
||||
var rgbColor = new Color(grayColor);
|
||||
compareRgbColors(rgbColor, [ 0.8, 0.8, 0.8, 1]);
|
||||
|
||||
var hsbColor = new HsbColor(grayColor);
|
||||
compareHsbColors(hsbColor, [ 0, 0, 0.8, 1]);
|
||||
|
||||
var rgbColor = new Color(1, 0, 0);
|
||||
compareHsbColors(new HsbColor(rgbColor), [0, 1, 1, 1]);
|
||||
compareNumbers(rgbColor.gray, 0.38299560546875);
|
||||
var grayColor = new Color(0.2);
|
||||
compareColors(grayColor.convert('rgb'), new Color(0.8, 0.8, 0.8));
|
||||
compareColors(grayColor.convert('hsb'), { hue: 0, saturation: 0, brightness: 0.8 });
|
||||
compareColors(new Color(1, 0, 0).convert('hsb'), { hue: 0, saturation: 1, brightness: 1 });
|
||||
});
|
||||
|
||||
test('Setting RgbColor#gray', function() {
|
||||
test('Setting Color#gray', function() {
|
||||
var color = new Color(1, 0.5, 0.2);
|
||||
color.gray = 0.1;
|
||||
compareRgbColors(color, [ 0.9, 0.9, 0.9, 1]);
|
||||
compareColors(color, new Color(0.1));
|
||||
});
|
||||
|
||||
test('Setting HsbColor#red', function() {
|
||||
var color = new HsbColor(180, 0, 0);
|
||||
test('Setting Color#red', function() {
|
||||
var color = new Color({ hue: 180, saturation: 0, brightness: 0 });
|
||||
color.red = 1;
|
||||
compareHsbColors(color, [0, 1, 1, 1]);
|
||||
compareColors(color, new Color(0, 1, 1));
|
||||
});
|
||||
|
||||
test('Setting HsbColor#gray', function() {
|
||||
var color = new HsbColor(180, 0, 0);
|
||||
test('Setting Color#gray', function() {
|
||||
var color = new Color({ hue: 180, saturation: 0, brightness: 0 });
|
||||
color.gray = 0.5;
|
||||
compareHsbColors(color, [0, 0, 0.5, 1]);
|
||||
compareColors(color, new Color(0.5));
|
||||
});
|
||||
|
||||
test('Color.read(channels)', function() {
|
||||
var color = Color.read([0, 0, 1]);
|
||||
compareRgbColors(color, [0, 0, 1, 1]);
|
||||
compareColors(color, new Color(0, 0, 1));
|
||||
});
|
||||
|
||||
test('Cloning colors', function() {
|
||||
|
|
@ -196,6 +169,6 @@ test('Color#convert', function() {
|
|||
|
||||
test('Saturation from black rgb', function() {
|
||||
equals(function() {
|
||||
return new Color(0, 0, 0).saturation == 0;
|
||||
return new Color(0, 0, 0).saturation === 0;
|
||||
}, true);
|
||||
});
|
||||
|
|
@ -641,9 +641,9 @@ test('Item#blendMode in a transformed Group', function() {
|
|||
});
|
||||
|
||||
var raster = layer.rasterize();
|
||||
compareRgbColors(raster.getPixel(0, 0), new Color(1, 0, 0),
|
||||
compareColors(raster.getPixel(0, 0), new Color(1, 0, 0),
|
||||
'Top left pixel should be red:');
|
||||
compareRgbColors(raster.getPixel(50, 50), new Color(1, 1, 0),
|
||||
compareColors(raster.getPixel(50, 50), new Color(1, 1, 0),
|
||||
'Middle center pixel should be yellow:');
|
||||
|
||||
raster.remove();
|
||||
|
|
@ -653,8 +653,8 @@ test('Item#blendMode in a transformed Group', function() {
|
|||
group.position = [50, 50];
|
||||
|
||||
var raster = layer.rasterize();
|
||||
compareRgbColors(raster.getPixel(0, 0), new Color(1, 0, 0),
|
||||
compareColors(raster.getPixel(0, 0), new Color(1, 0, 0),
|
||||
'Top left pixel should be red:');
|
||||
compareRgbColors(raster.getPixel(50, 50), new Color(1, 1, 0),
|
||||
compareColors(raster.getPixel(50, 50), new Color(1, 1, 0),
|
||||
'Middle center pixel should be yellow:');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@ test('style defaults', function() {
|
|||
test('currentStyle', function() {
|
||||
paper.project.currentStyle.fillColor = 'black';
|
||||
var path = new Path();
|
||||
compareRgbColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareColors(path.fillColor, 'black', 'path.fillColor');
|
||||
|
||||
// When changing the current style of the project, the style of
|
||||
// paths created using project.currentStyle should not change.
|
||||
paper.project.currentStyle.fillColor = 'red';
|
||||
compareRgbColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareColors(path.fillColor, 'black', 'path.fillColor');
|
||||
});
|
||||
|
||||
test('setting currentStyle to an object', function() {
|
||||
|
|
@ -51,8 +51,8 @@ test('setting currentStyle to an object', function() {
|
|||
strokeColor: 'green'
|
||||
};
|
||||
var path = new Path();
|
||||
compareRgbColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareRgbColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
compareColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
});
|
||||
|
||||
test('setting path styles to an object', function() {
|
||||
|
|
@ -61,8 +61,8 @@ test('setting path styles to an object', function() {
|
|||
fillColor: 'red',
|
||||
strokeColor: 'green'
|
||||
};
|
||||
compareRgbColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareRgbColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
compareColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
});
|
||||
|
||||
test('setting group styles to an object', function() {
|
||||
|
|
@ -73,8 +73,8 @@ test('setting group styles to an object', function() {
|
|||
fillColor: 'red',
|
||||
strokeColor: 'green'
|
||||
};
|
||||
compareRgbColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareRgbColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
compareColors(path.fillColor, 'red', 'path.fillColor');
|
||||
compareColors(path.strokeColor, 'green', 'path.strokeColor');
|
||||
});
|
||||
|
||||
test('getting group styles', function() {
|
||||
|
|
@ -83,7 +83,7 @@ test('getting group styles', function() {
|
|||
path.fillColor = 'red';
|
||||
group.addChild(path);
|
||||
|
||||
compareRgbColors(group.fillColor, 'red', 'group.fillColor');
|
||||
compareColors(group.fillColor, 'red', 'group.fillColor');
|
||||
|
||||
var secondPath = new Path();
|
||||
secondPath.fillColor = 'black';
|
||||
|
|
@ -97,7 +97,7 @@ test('getting group styles', function() {
|
|||
|
||||
//If we remove the first path, it should now return 'black':
|
||||
group.children[0].remove();
|
||||
compareRgbColors(group.fillColor, 'black', 'group.fillColor');
|
||||
compareColors(group.fillColor, 'black', 'group.fillColor');
|
||||
});
|
||||
|
||||
test('setting group styles', function() {
|
||||
|
|
@ -116,11 +116,11 @@ test('setting group styles', function() {
|
|||
|
||||
// the paths contained in the group should now both have their fillColor
|
||||
// set to black:
|
||||
compareRgbColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareRgbColors(secondPath.fillColor, 'black', 'secondPath.fillColor');
|
||||
compareColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareColors(secondPath.fillColor, 'black', 'secondPath.fillColor');
|
||||
|
||||
// The second path still has its strokeColor set to red:
|
||||
compareRgbColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
compareColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
});
|
||||
|
||||
test('setting group styles 2', function() {
|
||||
|
|
@ -129,15 +129,15 @@ test('setting group styles 2', function() {
|
|||
path.fillColor = 'red';
|
||||
group.addChild(path);
|
||||
|
||||
compareRgbColors(group.fillColor, 'red', 'group.fillColor');
|
||||
compareColors(group.fillColor, 'red', 'group.fillColor');
|
||||
|
||||
var secondPath = new Path();
|
||||
secondPath.fillColor = 'blue';
|
||||
secondPath.strokeColor = 'red';
|
||||
group.addChild(secondPath);
|
||||
|
||||
compareRgbColors(secondPath.fillColor, 'blue', 'secondPath.fillColor');
|
||||
compareRgbColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
compareColors(secondPath.fillColor, 'blue', 'secondPath.fillColor');
|
||||
compareColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
|
||||
// By appending a path with a different fillcolor,
|
||||
// the group's fillColor should return undefined:
|
||||
|
|
@ -146,16 +146,16 @@ test('setting group styles 2', function() {
|
|||
}, undefined);
|
||||
|
||||
// But, both paths have a red strokeColor, so:
|
||||
compareRgbColors(group.strokeColor, 'red', 'group.strokeColor');
|
||||
compareColors(group.strokeColor, 'red', 'group.strokeColor');
|
||||
|
||||
// Change the fill color of the group's style:
|
||||
group.style.fillColor = 'black';
|
||||
|
||||
// the paths contained in the group should now both have their fillColor
|
||||
// set to black:
|
||||
compareRgbColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareRgbColors(secondPath.fillColor, 'black', 'secondPath.fillColor');
|
||||
compareColors(path.fillColor, 'black', 'path.fillColor');
|
||||
compareColors(secondPath.fillColor, 'black', 'secondPath.fillColor');
|
||||
|
||||
// The second path still has its strokeColor set to red:
|
||||
compareRgbColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
compareColors(secondPath.strokeColor, 'red', 'secondPath.strokeColor');
|
||||
});
|
||||
|
|
@ -78,14 +78,14 @@ asyncTest('Create a raster from a dom id', function(callback) {
|
|||
asyncTest('Raster#getPixel / setPixel', function(callback) {
|
||||
var raster = new Raster('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAIAAAD91JpzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABlJREFUeNpi+s/AwPCfgYmR4f9/hv8AAQYAHiAFAS8Lwy8AAAAASUVORK5CYII=');
|
||||
raster.onLoad = function() {
|
||||
compareRgbColors(raster.getPixel(0, 0), new Color(1, 0, 0));
|
||||
compareRgbColors(raster.getPixel(1, 0), new Color(0, 1, 0));
|
||||
compareRgbColors(raster.getPixel(0, 1), new Color(0, 0, 1));
|
||||
compareRgbColors(raster.getPixel(1, 1), new Color(1, 1, 1));
|
||||
compareColors(raster.getPixel(0, 0), new Color(1, 0, 0));
|
||||
compareColors(raster.getPixel(1, 0), new Color(0, 1, 0));
|
||||
compareColors(raster.getPixel(0, 1), new Color(0, 0, 1));
|
||||
compareColors(raster.getPixel(1, 1), new Color(1, 1, 1));
|
||||
|
||||
var color = new Color(1, 1, 0, 0.5);
|
||||
raster.setPixel([0, 0], color);
|
||||
compareRgbColors(raster.getPixel([0, 0]), color);
|
||||
compareColors(raster.getPixel([0, 0]), color);
|
||||
callback();
|
||||
};
|
||||
});
|
||||
|
|
@ -130,7 +130,7 @@ test('Raster#getAverageColor(path)', function() {
|
|||
});
|
||||
var raster = paper.project.activeLayer.rasterize();
|
||||
path.scale(0.9);
|
||||
compareRgbColors(raster.getAverageColor(path), new Color(1, 0, 0));
|
||||
compareColors(raster.getAverageColor(path), new Color(1, 0, 0));
|
||||
});
|
||||
|
||||
test('Raster#getAverageColor(path) with compound path', function() {
|
||||
|
|
@ -152,5 +152,5 @@ test('Raster#getAverageColor(path) with compound path', function() {
|
|||
var raster = paper.project.activeLayer.rasterize();
|
||||
path.scale(0.9);
|
||||
path2.scale(1.1);
|
||||
compareRgbColors(raster.getAverageColor(compoundPath), new Color(1, 0, 0));
|
||||
compareColors(raster.getAverageColor(compoundPath), new Color(1, 0, 0));
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue