From c9aff611102338acfdcefce493ef2d132838d370 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Fri, 1 Apr 2016 13:33:10 +0200
Subject: [PATCH] Fix ol.source.Zoomify tests on firefox

---
 test/spec/ol/source/zoomifysource.test.js |  22 ++++++++++++++--------
 test/zoomify-url/TileGroup0/0-0-0.jpg     | Bin 0 -> 4216 bytes
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 test/zoomify-url/TileGroup0/0-0-0.jpg

diff --git a/test/spec/ol/source/zoomifysource.test.js b/test/spec/ol/source/zoomifysource.test.js
index 4e0316a98a..440ff6b292 100644
--- a/test/spec/ol/source/zoomifysource.test.js
+++ b/test/spec/ol/source/zoomifysource.test.js
@@ -209,21 +209,26 @@ describe('ol.source.Zoomify', function() {
       expect(img).to.be(img2);
     });
 
-    it('"tile.getImage" returns and caches a loaded canvas', function() {
+    it('"tile.getImage" returns and caches a loaded canvas', function(done) {
       // It'll only cache if the same context is passed, see below
       var context = ol.dom.createCanvasContext2D(256, 256);
       var source = getZoomifySource();
 
       var tile = source.getTile(0, 0, -1, 1, proj);
-      tile.state = ol.TileState.LOADED;
-      var img = tile.getImage(context);
 
-      var tile2 = source.getTile(0, 0, -1, 1, proj);
-      tile2.state = ol.TileState.LOADED;
-      var img2 = tile2.getImage(context);
+      ol.events.listen(tile, 'change', function() {
+        if (tile.getState() == ol.TileState.LOADED) {
+          var img = tile.getImage(context);
+          expect(img).to.be.a(HTMLCanvasElement);
 
-      expect(img).to.be.a(HTMLCanvasElement);
-      expect(img).to.be(img2);
+          var tile2 = source.getTile(0, 0, -1, 1, proj);
+          expect(tile2.getState()).to.be(ol.TileState.LOADED);
+          var img2 = tile2.getImage(context);
+          expect(img).to.be(img2);
+          done();
+        }
+      });
+      tile.load();
     });
 
     it('"tile.getImage" returns and caches an image only for same context', function() {
@@ -254,6 +259,7 @@ describe('ol.source.Zoomify', function() {
 
 
 goog.require('ol.dom');
+goog.require('ol.events');
 goog.require('ol.proj.Projection');
 goog.require('ol.source.Zoomify');
 goog.require('ol.TileState');
diff --git a/test/zoomify-url/TileGroup0/0-0-0.jpg b/test/zoomify-url/TileGroup0/0-0-0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3f9625970efaa430e125be9d3a571ff3f7698cbe
GIT binary patch
literal 4216
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
RZty<h#sGo;y91iL_YYXNO4$Ga

literal 0
HcmV?d00001