Use specific pixelRatio so tests run on all devices

This commit is contained in:
Andreas Hocevar
2017-08-16 22:38:33 -04:00
parent b710c1f76e
commit 55be9b8d3c
11 changed files with 50 additions and 15 deletions

View File

@@ -41,6 +41,7 @@ describe('layer clipping', function() {
var map = null;
beforeEach(function() {
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(256, 256),
view: new ol.View({
center: [0, 0],

View File

@@ -15,6 +15,7 @@ describe('ol.rendering.layer.Image', function() {
function createMap(renderer) {
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
view: new ol.View({

View File

@@ -21,6 +21,7 @@ describe('ol.rendering.layer.Vector', function() {
var map;
function createMap(renderer) {
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(80, 80),
renderer: renderer,
view: new ol.View({
@@ -249,12 +250,12 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
var referenceImage = canvas.toDataURL('image/png');
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be similar to `overlaps: true`
map.once('postrender', function() {
expectResemble(map, referenceImage, 2, done);
// result should be the same as with `overlaps: true`
map.once('postrender', function(e) {
expectResemble(map, referenceImage, 1e-9, done);
});
});
});
@@ -300,12 +301,12 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
var referenceImage = canvas.toDataURL('image/png');
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be exactly the same as with `overlaps: true`
map.once('postrender', function() {
expectResemble(map, referenceImage, 0, done);
expectResemble(map, referenceImage, 1e-9, done);
});
});
});
@@ -316,6 +317,7 @@ describe('ol.rendering.layer.Vector', function() {
var map2;
beforeEach(function() {
map2 = new ol.Map({
pixelRatio: 1,
target: createMapDiv(128, 128),
view: new ol.View({
center: [0, 0],
@@ -404,6 +406,7 @@ describe('ol.rendering.layer.Vector', function() {
});
map3 = new ol.Map({
pixelRatio: 1,
layers: [layer],
target: createMapDiv(100, 100),
view: view

View File

@@ -15,7 +15,7 @@ describe('ol.rendering.layer.VectorTile', function() {
function createMap(renderer, opt_pixelRatio) {
map = new ol.Map({
pixelRatio: opt_pixelRatio,
pixelRatio: opt_pixelRatio || 1,
target: createMapDiv(50, 50),
renderer: renderer,
view: new ol.View({

View File

@@ -21,6 +21,7 @@ describe('ol.rendering.Map', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
layers: [vectorLayer],

View File

@@ -20,14 +20,20 @@ describe('ol.render', function() {
describe('ol.render.toContext()', function() {
it('creates a vector context from a Canvas 2d context', function() {
var vectorContext = ol.render.toContext(getContext(), {size: [100, 100]});
var vectorContext = ol.render.toContext(getContext(), {
pixelRatio: 1,
size: [100, 100]
});
expect(vectorContext).to.be.a(ol.render.VectorContext);
expect(vectorContext).to.be.a(ol.render.canvas.Immediate);
});
it('can be used to render a point geometry', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
image: new ol.style.Circle({
@@ -48,7 +54,10 @@ describe('ol.render', function() {
it('can be used to render a linestring geometry', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
@@ -69,7 +78,10 @@ describe('ol.render', function() {
it('respects lineCap for linestring', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
@@ -91,7 +103,10 @@ describe('ol.render', function() {
it('respects lineJoin for linestring', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
@@ -113,7 +128,10 @@ describe('ol.render', function() {
it('can be used to render a polygon geometry', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
@@ -139,7 +157,10 @@ describe('ol.render', function() {
it('supports lineDash styles', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({
@@ -161,7 +182,10 @@ describe('ol.render', function() {
it('supports lineDashOffset', function(done) {
var context = getContext();
var vectorContext = ol.render.toContext(context, {size: [100, 100]});
var vectorContext = ol.render.toContext(context, {
pixelRatio: 1,
size: [100, 100]
});
var style = new ol.style.Style({
stroke: new ol.style.Stroke({

View File

@@ -23,6 +23,7 @@ describe('ol.rendering.style.Circle', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
layers: [vectorLayer],

View File

@@ -30,6 +30,7 @@ describe('ol.rendering.style.Icon', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(width ? width : 50, height ? height : 50),
renderer: renderer,
layers: [vectorLayer],

View File

@@ -24,6 +24,7 @@ describe('ol.rendering.style.Polygon', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(size, size),
renderer: renderer,
layers: [vectorLayer],

View File

@@ -23,6 +23,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(50, 50),
renderer: renderer,
layers: [vectorLayer],

View File

@@ -22,6 +22,7 @@ describe('ol.rendering.style.Text', function() {
});
map = new ol.Map({
pixelRatio: 1,
target: createMapDiv(200, 200),
renderer: renderer,
layers: [vectorLayer],