From 8e8098b3621c4d904a8241d88a754cafdb1c4c33 Mon Sep 17 00:00:00 2001
From: GaborFarkas <raandal73@gmail.com>
Date: Wed, 5 Oct 2016 18:34:54 +0200
Subject: [PATCH] Add some test to PolygonReplay

---
 test/spec/ol/render/webgl/replay.test.js      |  62 +++++++-----------
 .../polygon-fill-and-strokes-webgl.png        | Bin 0 -> 458 bytes
 .../expected/polygon-types-webgl-stroke.png   | Bin 0 -> 780 bytes
 .../ol/style/expected/polygon-types-webgl.png | Bin 0 -> 276 bytes
 .../style/expected/polygon-zindex-webgl.png   | Bin 0 -> 300 bytes
 test_rendering/spec/ol/style/polygon.test.js  |  32 ++++++++-
 6 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 test_rendering/spec/ol/style/expected/polygon-fill-and-strokes-webgl.png
 create mode 100644 test_rendering/spec/ol/style/expected/polygon-types-webgl-stroke.png
 create mode 100644 test_rendering/spec/ol/style/expected/polygon-types-webgl.png
 create mode 100644 test_rendering/spec/ol/style/expected/polygon-zindex-webgl.png

diff --git a/test/spec/ol/render/webgl/replay.test.js b/test/spec/ol/render/webgl/replay.test.js
index decb86cc18..1456bb2691 100644
--- a/test/spec/ol/render/webgl/replay.test.js
+++ b/test/spec/ol/render/webgl/replay.test.js
@@ -397,7 +397,7 @@ describe('ol.render.webgl.PolygonReplay', function() {
     replay = new ol.render.webgl.PolygonReplay(tolerance, maxExtent);
   });
 
-  describe('#drawPolygonGeometry', function() {
+  describe('#drawPolygon', function() {
     beforeEach(function() {
       replay.setFillStrokeStyle(fillStyle, strokeStyle);
     });
@@ -406,44 +406,30 @@ describe('ol.render.webgl.PolygonReplay', function() {
       var polygon1 = new ol.geom.Polygon(
           [[[1000, 2000], [1200, 2000], [1200, 3000]]]
           );
-      replay.drawPolygonGeometry(polygon1, null);
-      expect(replay.vertices_).to.have.length(18);
-      expect(replay.indices_).to.have.length(3);
+      replay.drawPolygon(polygon1, null);
+      expect(replay.vertices).to.have.length(6);
+      expect(replay.indices).to.have.length(3);
 
-      expect(replay.vertices_).to.eql([
-        1200, 2000, 0, 0, 1, 0.5,
-        1200, 3000, 0, 0, 1, 0.5,
-        1000, 2000, 0, 0, 1, 0.5]);
-      expect(replay.indices_).to.eql([0, 1, 2]);
-
-      expect(replay.lineStringReplay_.vertices_).to.have.length(24);
-      expect(replay.lineStringReplay_.vertices_).to.eql([
-        1000, 2000, 0, 1, 0, 0.4,
-        1200, 2000, 0, 1, 0, 0.4,
-        1200, 2000, 0, 1, 0, 0.4,
-        1200, 3000, 0, 1, 0, 0.4
-      ]);
+      expect(replay.vertices).to.eql([
+        1200, 3000, 1200, 2000, 1000, 2000]);
+      expect(replay.indices).to.eql([2, 0, 1]);
 
       var polygon2 = new ol.geom.Polygon(
           [[[4000, 2000], [4200, 2000], [4200, 3000]]]
           );
-      replay.drawPolygonGeometry(polygon2, null);
-      expect(replay.vertices_).to.have.length(36);
-      expect(replay.indices_).to.have.length(6);
+      replay.drawPolygon(polygon2, null);
+      expect(replay.vertices).to.have.length(12);
+      expect(replay.indices).to.have.length(6);
 
-      expect(replay.vertices_).to.eql([
-        1200, 2000, 0, 0, 1, 0.5,
-        1200, 3000, 0, 0, 1, 0.5,
-        1000, 2000, 0, 0, 1, 0.5,
-        4200, 2000, 0, 0, 1, 0.5,
-        4200, 3000, 0, 0, 1, 0.5,
-        4000, 2000, 0, 0, 1, 0.5
+      expect(replay.vertices).to.eql([
+        1200, 3000, 1200, 2000, 1000, 2000,
+        4200, 3000, 4200, 2000, 4000, 2000
       ]);
-      expect(replay.indices_).to.eql([0, 1, 2, 3, 4, 5]);
+      expect(replay.indices).to.eql([2, 0, 1, 5, 3, 4]);
     });
   });
 
-  describe('#drawMultiPolygonGeometry', function() {
+  describe('#drawMultiPolygon', function() {
     beforeEach(function() {
       replay.setFillStrokeStyle(fillStyle, strokeStyle);
     });
@@ -453,19 +439,15 @@ describe('ol.render.webgl.PolygonReplay', function() {
         [[[1000, 2000], [1200, 2000], [1200, 3000]]],
         [[[4000, 2000], [4200, 2000], [4200, 3000]]]
       ]);
-      replay.drawMultiPolygonGeometry(multiPolygon, null);
-      expect(replay.vertices_).to.have.length(36);
-      expect(replay.indices_).to.have.length(6);
+      replay.drawMultiPolygon(multiPolygon, null);
+      expect(replay.vertices).to.have.length(12);
+      expect(replay.indices).to.have.length(6);
 
-      expect(replay.vertices_).to.eql([
-        1200, 2000, 0, 0, 1, 0.5,
-        1200, 3000, 0, 0, 1, 0.5,
-        1000, 2000, 0, 0, 1, 0.5,
-        4200, 2000, 0, 0, 1, 0.5,
-        4200, 3000, 0, 0, 1, 0.5,
-        4000, 2000, 0, 0, 1, 0.5
+      expect(replay.vertices).to.eql([
+        1200, 3000, 1200, 2000, 1000, 2000,
+        4200, 3000, 4200, 2000, 4000, 2000
       ]);
-      expect(replay.indices_).to.eql([0, 1, 2, 3, 4, 5]);
+      expect(replay.indices).to.eql([2, 0, 1, 5, 3, 4]);
     });
   });
 });
diff --git a/test_rendering/spec/ol/style/expected/polygon-fill-and-strokes-webgl.png b/test_rendering/spec/ol/style/expected/polygon-fill-and-strokes-webgl.png
new file mode 100644
index 0000000000000000000000000000000000000000..da2f9000f4ab0a470201e5c6d6b6ec8024ebe752
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&0004zNkl<ZXhZE-
zu};G<5Vajx*-$4$0kN_nL8kBl415A})u|sq`T?D)&U^v`A3&yn#Kww%BBqLs6>>%%
zQXyPw*LEUgz07y-{NCNWIN>akheyJLfrxD<AG=4HU?Q`P{~fnCEpwY(ts~>{dnN=q
z7w+{s^TLWm!o`ivL6*hrzLdtv(E=uuS<bn*a4jw+4Qnz_-8AQ%Ib+plkdh5eooS7T
zkW{j&y0sQ4Nsft&RK@=<B43}Q?YH}pEs@u)!vU?W4?v_Tj|g-G9%*L%#xq*6tY6!;
zyC}}-J)(fr=5j4eB#M52v#9f*cT(w!Rp(WbPWGpFbIe6}#ygDfAymG)s<`41qryZ&
zVYfoWmBcD}@e)Z6I^HwAijp?5)x*pvxE2r{k&Vl<QyaCKjQKdfx>opJ9RZPmEkZ|>
zn6=q4S{N-|0eA!+3FwQTP#7(Y7Dj8i0`Let0*}BWngV}*v*Q{c&@WiOQLf*B6XFf!
z^*hMBdO!dtA_42S3T6DK+UjXMih+oSc#Wif1ATM9LW;T0ivR!s07*qoM6N<$f+ao7
A!T<mO

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/expected/polygon-types-webgl-stroke.png b/test_rendering/spec/ol/style/expected/polygon-types-webgl-stroke.png
new file mode 100644
index 0000000000000000000000000000000000000000..624f09615852d81b8ec4d8dea8e7a6b1077e907e
GIT binary patch
literal 780
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSV7lz-;uum9_jcCnO-%+oY+wJ%
z|C;mhP*1bNrDu<puc=qe+;v-FZJd715{{Uqs}|1Sb~+-)=p>-z=CDS_zx_|=l|A9B
zy=vop+Ryast@0~b8M$@e1c{c4k5BJ!Klv|Qj``<~Dx-ZL-97k!><tw76!|ZIu`-Kd
z63dZO3!TA+%=yCi@y!=^i52<Z_I&<&j#*K8b@Jo578b^|c4d{>83yuBO$?h43r_Mi
znZd8<*l_b9$4ND*Gwl-;4!kL7NfG9KHd$O~&i$8%FPFbst}eyWfRJ$Z5J)JqaN5+#
z_E}Md!@&BE?h~^O-`%IZQCeH`r}(1Mm72d>oW#y)&HbcZ|H}H#+v+~1kQNj3q?-ko
zodg1(J(*V#d}g9<3kRp8+u9!0-M_brD{{P4R50U`Z4xkKN_u)hkwZ{fA<VC;y`t<_
z5>M2rkNcJ?EpcuCzeGlnBU4GijHh3x#fIa<(tUe{mRKK&zVohe_QqfCpVLi)k9k(U
zo?ay~<!bH4KU0(TY*kb_eaL&>+E!)tBheF%K98<*kH7wMZhdrn1-H|QE{76Ux5t7_
z0@=JivCk)(wyxFVP%O<^Zls*T6&)+!G$&{6*`-sD{od9g(Ea4ImD4<hJ=&)qN!6}(
z<8XS%vWNRqiFK(}3*SQLzJ2X41c0oK_pVs2+syxRfsFy16I(**ovsOdr<ju!QW(OH
zujN1pYw4#vu}SBjv32F=dE%kmKfCrbDjwO+bBj+r{<LK5$*}Y_%dKYJZ$Gu~^$Ndy
zUwOeK|F_@YIdsejZc%vRnDC`i|Jd3!GFD4?-o_-goGH}q{xxI5Cds)fg}<`jd+wO(
zE3BBB@mxqbr7t>C#Oc(9bE<A9WVUb8XqmEbuJ;?UBJcOL)8}cot~eXq*Q1<r;hdm^
z*d`w5<!2c0cU#%~e_UW7US=Wfbcmx^SV3iaIx_RN{l+PGQa6<z$O5Kv22WQ%mvv4F
FO#l(bTB`s6

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/expected/polygon-types-webgl.png b/test_rendering/spec/ol/style/expected/polygon-types-webgl.png
new file mode 100644
index 0000000000000000000000000000000000000000..4abfccb058171eacee2eb2426f37ed59671ecfd7
GIT binary patch
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&0002nNkl<ZXhZFo
zQ3}H_3`3LqAG%|(!C*;I7IhWo_1n0X_0+WOt;p4j=x7K@bF#K0M{CEg8}IEKS9ibB
zY(q!fH+J_!$O>jET03=7jv!=$$8BLR<A|EOk>IF|AY>&Y>b8>VYQJkGZCafLN7POI
ztImEPx(C1Q96`wZe2{VsT5g19{m963GdthdZl`brN8C)k`hgZ`f!6s3$Osup&d7{U
z$1BVk`=9+S89|7E8IG*{X?!yZT4`tr^ITqHd1_rgrEr5SAwvJS66v2&+|+}C5R&Fn
a8Al!(wt6$}x+3=g0000<MNUMnLSTY&-gtum

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/expected/polygon-zindex-webgl.png b/test_rendering/spec/ol/style/expected/polygon-zindex-webgl.png
new file mode 100644
index 0000000000000000000000000000000000000000..931df4a072135f1c08ddc640a747434ad8928292
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nET&z>%hAsNnZXKds>WFX=)mv_ZP
z2PNeT7nIl%#nKW5w4QmWOjvP~!AdIW=rcWz+PJLy<?rtOFPoyqS~*L>PROmUHzh~u
z`qMWLeQFAK`peyTz$S4rp~b_s{(pRS?zY!mHOHpk>r;Qt7~sRAENLNdl0|s;);6E>
z->qNg*4ur_zr7{*|3}6Eog*I0mMaDszgd``aw6vX+BNJ4!rNq(AJ30nFDl^a`MX;v
z%}r}p+NY&Q&3`}1SITP;G<4W4qx8+=Xp?{-^On<!N&O)@9K;A77N}&>V2CnqpAq~G
P=zRuHS3j3^P6<r_JlS<y

literal 0
HcmV?d00001

diff --git a/test_rendering/spec/ol/style/polygon.test.js b/test_rendering/spec/ol/style/polygon.test.js
index 21fd39e093..59748f865b 100644
--- a/test_rendering/spec/ol/style/polygon.test.js
+++ b/test_rendering/spec/ol/style/polygon.test.js
@@ -86,11 +86,18 @@ describe('ol.rendering.style.Polygon', function() {
     }
 
     it('tests the canvas renderer', function(done) {
-      map = createMap('canvas');
+      map = createMap('webgl');
       createFeatures();
       expectResemble(map, 'spec/ol/style/expected/polygon-types-canvas.png',
           IMAGE_TOLERANCE, done);
     });
+
+    it('tests the webgl renderer', function(done) {
+      map = createMap('webgl');
+      createFeatures();
+      expectResemble(map, 'spec/ol/style/expected/polygon-types-webgl.png',
+          IMAGE_TOLERANCE, done);
+    });
   });
 
   describe('different types with stroke', function() {
@@ -153,6 +160,14 @@ describe('ol.rendering.style.Polygon', function() {
       expectResemble(map, 'spec/ol/style/expected/polygon-types-canvas-stroke.png',
           IMAGE_TOLERANCE, done);
     });
+
+    it('tests the webgl renderer', function(done) {
+      map = createMap('webgl', 100);
+      map.getView().setResolution(0.5);
+      createFeatures();
+      expectResemble(map, 'spec/ol/style/expected/polygon-types-webgl-stroke.png',
+          IMAGE_TOLERANCE, done);
+    });
   });
 
   describe('z-index', function() {
@@ -206,6 +221,13 @@ describe('ol.rendering.style.Polygon', function() {
       expectResemble(map, 'spec/ol/style/expected/polygon-zindex-canvas.png',
           IMAGE_TOLERANCE, done);
     });
+
+    it('tests the webgl renderer', function(done) {
+      map = createMap('webgl');
+      createFeatures();
+      expectResemble(map, 'spec/ol/style/expected/polygon-zindex-webgl.png',
+          IMAGE_TOLERANCE, done);
+    });
   });
 
   describe('different fills and strokes', function() {
@@ -259,6 +281,14 @@ describe('ol.rendering.style.Polygon', function() {
           map, 'spec/ol/style/expected/polygon-fill-and-strokes-canvas.png',
           IMAGE_TOLERANCE, done);
     });
+
+    it('tests the webgl renderer', function(done) {
+      map = createMap('webgl');
+      createFeatures();
+      expectResemble(
+          map, 'spec/ol/style/expected/polygon-fill-and-strokes-webgl.png',
+          5.76, done);
+    });
   });
 
   describe('CanvasPattern and LinearGradient as fills and strokes', function() {