From 3b64133f21393f98495ac4bfdc42284225c1f421 Mon Sep 17 00:00:00 2001
From: Thomas Chandelle <thomas.chandelle@1spatial.com>
Date: Mon, 14 Nov 2016 09:09:32 +0100
Subject: [PATCH] Add tests for linedash for HiDPI display

---
 test/spec/ol/renderer/canvas/replay.test.js   |  19 +++++++++++++++++-
 .../linestring-strokes-canvas-hidpi.png       | Bin 0 -> 928 bytes
 .../expected/linestring-strokes-canvas.png    | Bin 787 -> 515 bytes
 .../spec/ol/style/linestring.test.js          |  12 ++++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 test_rendering/spec/ol/style/expected/linestring-strokes-canvas-hidpi.png

diff --git a/test/spec/ol/renderer/canvas/replay.test.js b/test/spec/ol/renderer/canvas/replay.test.js
index 68ee494d1c..da8a61ee52 100644
--- a/test/spec/ol/renderer/canvas/replay.test.js
+++ b/test/spec/ol/renderer/canvas/replay.test.js
@@ -34,7 +34,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
       });
       style2 = new ol.style.Style({
         fill: new ol.style.Fill({color: 'white'}),
-        stroke: new ol.style.Stroke({color: 'black', width: 1})
+        stroke: new ol.style.Stroke({color: 'black', width: 1, lineDash: [3, 6]})
       });
       fillCount = 0;
       strokeCount = 0;
@@ -139,6 +139,23 @@ describe('ol.render.canvas.ReplayGroup', function() {
       expect(strokeCount).to.be(3);
       expect(beginPathCount).to.be(3);
     });
+
+    it('applies the pixelRatio to the linedash array', function() {
+      var lineDash, lineDashCount = 0;
+
+      context.setLineDash = function(lineDash_) {
+        lineDashCount++;
+        lineDash = lineDash_.slice();
+      };
+
+      ol.renderer.vector.renderFeature(replay, feature1, style2, 1);
+      ol.renderer.vector.renderFeature(replay, feature2, style2, 1);
+      replay.replay(context, 2, transform, 0, {});
+
+      expect(lineDashCount).to.be(1);
+      expect(style2.getStroke().getLineDash()).to.be.eql([3, 6]);
+      expect(lineDash).to.be.eql([6, 12]);
+    });
   });
 
 });
diff --git a/test_rendering/spec/ol/style/expected/linestring-strokes-canvas-hidpi.png b/test_rendering/spec/ol/style/expected/linestring-strokes-canvas-hidpi.png
new file mode 100644
index 0000000000000000000000000000000000000000..600e4c1336f190a4deb8cd8e03ae8b8565a1bbcf
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz000ALNkl<Zc%1Fq
zFKiQG7{~FiXaXb^Eo!1-O(vKmAeOD7Vgj)Q1SEt^AP^N56BURN#KZ(*Bum-=asn|i
zF)=~N#2g3&2_%rLgo=qSX?hhC6-B&ldhOj{8+q@&_I{t_Q5E;Ree(Xl0}&As5s_p&
zq?kI+FK!&?7aPa<#hxNG8ui(w%|nVQ>jmi-!*zovB{rfch<e7wqoIPtE9@7fKD)FT
zgN9B-)MuAAtrtX-`h_C8NnJ!lL_}<=R!{e;)n-o-j9Tq<R|SbtI4OvTh{$DmUbf(Q
z*?rH;Ha#!fQ-ns-^RoM`R;FmR80~gu&GWL|7&LfNqT6m~)~yu7Gd)AaxI$RzDV`ao
zoHuSlW8X$WM&^uCDc75y&nrTrT+WRbq^W`=pdcEu;xuHnTA8A!N&QM;ZTZ`7XVzUe
zZqlOD$-J~ujDdbn(Z=xa5zWR>L_|bHL_|bHL}c0&fv>;^px`zYc?A3bdj0qfJaL*)
zg53g|42v;{PX9NFP!2dDSd2k@2hz^6OPCqVAAVjjdcYQ-@5CdJ295|8U>n#0y1+AM
z*(J~#!D8%Udc$>K!Ch*}wZ*U)N0>s0V-?Iil5w4g45?>`h=>c%fs*Sa#OznzVV2BY
zVA*Xt@s<KsEI(rp9YkJ83bW(xVTKc19$<QgzbJLg`Iz|lci)4<L0ifMk6*Oo_o)zm
zd~S0WUJH5Vj>YFqj8%evOauEvND4RzdA8jzo?>p9;CS97x=A)o_`S;Gh@KxS_knMW
z{t-VhcjQqj0-wh6_(j5sGDq<GwTt~F?|BNq*;p=RN4Z4qyzAGe4s(LxT-L!XjT0km
zMOAT{(NG1r>pBS+))-FaHuoEH2@iqy=*<uj5fO1Hh2D;gjWn>2S+c)!oXbDWVE1y#
zwH)w;(M@e^@8vTLk3?!r=l)`b@H4pB-OGo)kv@0<dfF^7dJq}Ad-<Ed8-nLkZ~MPZ
zqY~gT+TM@A9hXTBY!iMzJ?&pFtrOmEr=!A)kfaWP+b)xe$Ti?K;U5m&aFI|cB$*S;
zN+c;#z#%cXmtP@x7v3U96I+D*t4sgNYc8q;3Yb-eKY=rn{lUKfO1g=;r;p6|H-25r
z-A2+CfX_tOGyGN=4p}<WiHUodrJsn1h=_>D|M~;xvB(G-RaL0~0000<MNUMnLSTZ?
C9jzMx

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/expected/linestring-strokes-canvas.png b/test_rendering/spec/ol/style/expected/linestring-strokes-canvas.png
index 0e354d444a9fdef3864e89bbdeadb519e157d616..9eb1f39a996d6c3fbf30a12681b41f155f7d9b7a 100644
GIT binary patch
delta 490
zcmV<G0Tup}27?5UBYy$PNkl<ZXo2mQtxf|$6h@DzEXfX3EDjn(Wo6qS5C}vc0Kp?v
z@BkzgXo6^(3LXK$15{KXaUd#4S%Dw{lFiNv1Y!|0q!k1@+bNy4bCS<&(!2ND-k%xp
zc;?T5gTkm>Z$>+fwksNy>rG=LqjJ6ZwA;vBld+kVF|snH<$rOJPUpSS>%FyIQMdaV
zuD6kuAdZ6|Nkl76gSIP5648p|ATTl^r5H*nG6xk+Z6--XOG=U5-*06X7u(J#iZ(MT
zMV2I@wO&TzI0({IJUdWEKj}rvjnY&`0HoX~x!CMRCOjUGXRRp$*FYbb{+#3(1(bnI
ztFNCe9oHxWFMnF+i%lmVAu9P4sItUm1<K6fqLc6#5NbJvX%AF@2)ILyXean?Y?G-J
z0z=ePyO~E)rc5Sex+f~YoBr)WM{^Ol)rmZiuSE8NPaWgLUTV`bxwVJP*0d)&&Y6Y0
zjM)JmQN2;I5U*+>Ms7mvnD8tMb6J*q^9cG2HB|pu9b*7B)G7ATX3#%4Vmy|QZ3Nsy
zeVGh(zxdCK(W!p#2WsEsW|pmOiz~*Lvs~ppxwUUu+`+B@3{Yj3tHi$ljaj$04T{Wo
gK`Wv*xX0sxFIlFE#w<E#xBvhE07*qoM6N<$g8A*-EdT%j

delta 764
zcmV<Y0t5Yn1d|4kBYy(gNkl<ZXhZFoKTaD#6vn@ClgiFE^!5pobacQ8LQa4!L4hd3
z4U(JyQXmSDlAHiI0hE+*0&h=an<|Yb`m7lkto6>{-K<ug#<F&2-ut~b?|ri)(2^lq
z!h!aJjQg8=K&RiFOwIE_e*eej&zp>l`<p{4I=^g_>V7Wde19~^?|+xsZ6^qcnU#5i
zwpIs=tyP*0`rY1QuY3QevR9aq^Yf=~sSL!fb9lJ%!)1*^kh8O=?=F+;c<1P7!^xL+
z)`*l@_WX>`LZC5%C?)c47dJvoCQdp+h}jIcLWqxbY#ARLQp$&34?ATrFI#Ii%Z7kh
zsQTsQJLzMn%71tF_x~y%<*3)2tkjbikm)o#7DAlRsf&x|fE*lnf~fkq1H^|aBOJE2
zeC&3y?X<OMK*8)v*_>h*Vo~hZ&cz-UspiaTr;aoyzW$!9GvXh!YG<r7Vu^1C;8wk}
z1EBPrlp<GEWJE*gGus^i!c;n{0O5IU2w<u_e-D6Xq<>MBB&k76h;8LKGeQ`GST7Mm
zVN-(eOOBt&%mg7GlvB)(zAO6z;5yV<r|*%-#Z706BCjD?^sE;R8EN))dWwwLAhb1Z
zt3B1h2B|w)EC@Rj+bla3Z#!%k1<V9L6Zo67EysYE5WHk&W^9ANEPlcy?PQ@KbZD$H
z;R>N48GiuX$$kPjw$Zyh4*@X+?@@IqU*%?3)5@QuE&GC`fY1Rpn*{5HSqdJ$Ag18)
z?#nk5%Z{D`_^Q^4YRf(#%c`A93v^qK>SV4Ut5iF9D;N{aPDYqdA&a_zxC&l~eLaUT
zxjK^twPhPf9S}ur*+pF61g;FkSG8j@qUY`cxOGy0yxQ_AkPy{Q0m3!(F7P^F7J<a5
zb}AV2fXU)#{gjSnkd%UFvu%4$f!uOEU>1RBh2=3KR`6`jmOa;PneVW6O0%+RYjN`b
ugwTNc^kDVH)_!9mTI<|3NUh;^F!m28hsHA_%;!k}0000<MNUMnLSTZ~Rdihd

diff --git a/test_rendering/spec/ol/style/linestring.test.js b/test_rendering/spec/ol/style/linestring.test.js
index 05a6e10a0d..d6eda66cb1 100644
--- a/test_rendering/spec/ol/style/linestring.test.js
+++ b/test_rendering/spec/ol/style/linestring.test.js
@@ -14,7 +14,7 @@ describe('ol.rendering.style.LineString', function() {
 
   var target, map, vectorSource;
 
-  function createMap(renderer) {
+  function createMap(renderer, opt_pixelRatio) {
     target = createMapDiv(50, 50);
 
     vectorSource = new ol.source.Vector();
@@ -23,6 +23,7 @@ describe('ol.rendering.style.LineString', function() {
     });
 
     map = new ol.Map({
+      pixelRatio: opt_pixelRatio || 1,
       target: target,
       renderer: renderer,
       layers: [vectorLayer],
@@ -85,6 +86,7 @@ describe('ol.rendering.style.LineString', function() {
           color: '#000000',
           width: 2,
           lineCap: 'square',
+          lineDash: [4, 8],
           lineJoin: 'round'
         })
       }));
@@ -105,5 +107,13 @@ describe('ol.rendering.style.LineString', function() {
       expectResemble(map, 'spec/ol/style/expected/linestring-strokes-webgl.png',
           14.6, done);
     });
+
+    it('tests the canvas renderer (HiDPI)', function(done) {
+      map = createMap('canvas', 2);
+      createFeatures();
+      expectResemble(
+          map, 'spec/ol/style/expected/linestring-strokes-canvas-hidpi.png',
+          3.0, done);
+    });
   });
 });