From 7d29b35e75ed2ab1c2b4e2b07c106ff6162332d6 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sun, 7 Aug 2016 23:22:12 -0600
Subject: [PATCH] Put rendering test requires on top

---
 test_rendering/spec/ol/layer/image.test.js    | 15 ++++++-----
 test_rendering/spec/ol/layer/tile.test.js     | 27 ++++++++++---------
 test_rendering/spec/ol/layer/vector.test.js   | 17 ++++++------
 .../spec/ol/layer/vectortile.test.js          | 15 ++++++-----
 test_rendering/spec/ol/map.test.js            | 15 ++++++-----
 test_rendering/spec/ol/render.test.js         | 23 ++++++++--------
 test_rendering/spec/ol/reproj/image.test.js   | 13 ++++-----
 test_rendering/spec/ol/reproj/tile.test.js    | 13 ++++-----
 test_rendering/spec/ol/style/circle.test.js   | 23 ++++++++--------
 test_rendering/spec/ol/style/icon.test.js     | 19 ++++++-------
 .../spec/ol/style/linestring.test.js          | 19 ++++++-------
 test_rendering/spec/ol/style/polygon.test.js  | 21 ++++++++-------
 .../spec/ol/style/regularshape.test.js        | 23 ++++++++--------
 13 files changed, 128 insertions(+), 115 deletions(-)

diff --git a/test_rendering/spec/ol/layer/image.test.js b/test_rendering/spec/ol/layer/image.test.js
index 7befd59253..f5d655ecc2 100644
--- a/test_rendering/spec/ol/layer/image.test.js
+++ b/test_rendering/spec/ol/layer/image.test.js
@@ -1,5 +1,13 @@
 goog.provide('ol.test.rendering.layer.Image');
 
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Image');
+goog.require('ol.obj');
+goog.require('ol.proj');
+goog.require('ol.source.ImageStatic');
+
+
 describe('ol.rendering.layer.Image', function() {
 
   var target, map;
@@ -108,10 +116,3 @@ describe('ol.rendering.layer.Image', function() {
   });
 
 });
-
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Image');
-goog.require('ol.obj');
-goog.require('ol.proj');
-goog.require('ol.source.ImageStatic');
diff --git a/test_rendering/spec/ol/layer/tile.test.js b/test_rendering/spec/ol/layer/tile.test.js
index 7f03f2b87e..572c43700e 100644
--- a/test_rendering/spec/ol/layer/tile.test.js
+++ b/test_rendering/spec/ol/layer/tile.test.js
@@ -1,5 +1,19 @@
 goog.provide('ol.test.rendering.layer.Tile');
 
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.geom.Point');
+goog.require('ol.layer.Tile');
+goog.require('ol.obj');
+goog.require('ol.proj');
+goog.require('ol.source.TileImage');
+goog.require('ol.source.XYZ');
+goog.require('ol.style.Circle');
+goog.require('ol.style.Fill');
+goog.require('ol.style.Stroke');
+goog.require('ol.tilegrid.TileGrid');
+
+
 describe('ol.rendering.layer.Tile', function() {
 
   var target, map;
@@ -247,16 +261,3 @@ describe('ol.rendering.layer.Tile', function() {
     });
   });
 });
-
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.geom.Point');
-goog.require('ol.layer.Tile');
-goog.require('ol.obj');
-goog.require('ol.proj');
-goog.require('ol.source.TileImage');
-goog.require('ol.source.XYZ');
-goog.require('ol.style.Circle');
-goog.require('ol.style.Fill');
-goog.require('ol.style.Stroke');
-goog.require('ol.tilegrid.TileGrid');
diff --git a/test_rendering/spec/ol/layer/vector.test.js b/test_rendering/spec/ol/layer/vector.test.js
index 95a7d5a678..e0acad7d7a 100644
--- a/test_rendering/spec/ol/layer/vector.test.js
+++ b/test_rendering/spec/ol/layer/vector.test.js
@@ -1,5 +1,14 @@
 goog.provide('ol.test.rendering.layer.Vector');
 
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.Feature');
+goog.require('ol.geom.Circle');
+goog.require('ol.geom.Polygon');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+
+
 describe('ol.rendering.layer.Vector', function() {
 
   var center, target, map;
@@ -76,11 +85,3 @@ describe('ol.rendering.layer.Vector', function() {
   });
 
 });
-
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.Feature');
-goog.require('ol.geom.Circle');
-goog.require('ol.geom.Polygon');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
diff --git a/test_rendering/spec/ol/layer/vectortile.test.js b/test_rendering/spec/ol/layer/vectortile.test.js
index bb249babd1..77b24d38d3 100644
--- a/test_rendering/spec/ol/layer/vectortile.test.js
+++ b/test_rendering/spec/ol/layer/vectortile.test.js
@@ -1,5 +1,13 @@
 goog.provide('ol.test.rendering.layer.VectorTile');
 
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.format.MVT');
+goog.require('ol.layer.VectorTile');
+goog.require('ol.obj');
+goog.require('ol.source.VectorTile');
+
+
 describe('ol.rendering.layer.VectorTile', function() {
 
   var target, map;
@@ -73,10 +81,3 @@ describe('ol.rendering.layer.VectorTile', function() {
   });
 
 });
-
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.format.MVT');
-goog.require('ol.layer.VectorTile');
-goog.require('ol.obj');
-goog.require('ol.source.VectorTile');
diff --git a/test_rendering/spec/ol/map.test.js b/test_rendering/spec/ol/map.test.js
index ffb1846f0a..d8e35ba614 100644
--- a/test_rendering/spec/ol/map.test.js
+++ b/test_rendering/spec/ol/map.test.js
@@ -1,5 +1,13 @@
 goog.provide('ol.test.rendering.Map');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.Point');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+
+
 describe('ol.rendering.Map', function() {
 
   var target, map;
@@ -114,10 +122,3 @@ describe('ol.rendering.Map', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.Point');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
diff --git a/test_rendering/spec/ol/render.test.js b/test_rendering/spec/ol/render.test.js
index 6f15943f0f..1c2796512d 100644
--- a/test_rendering/spec/ol/render.test.js
+++ b/test_rendering/spec/ol/render.test.js
@@ -1,5 +1,17 @@
 goog.provide('ol.test.rendering.render');
 
+goog.require('ol.geom.LineString');
+goog.require('ol.geom.Point');
+goog.require('ol.geom.Polygon');
+goog.require('ol.render');
+goog.require('ol.render.VectorContext');
+goog.require('ol.render.canvas.Immediate');
+goog.require('ol.style.Circle');
+goog.require('ol.style.Fill');
+goog.require('ol.style.Stroke');
+goog.require('ol.style.Style');
+
+
 describe('ol.render', function() {
 
   var context;
@@ -126,14 +138,3 @@ describe('ol.render', function() {
   });
 
 });
-
-goog.require('ol.geom.LineString');
-goog.require('ol.geom.Point');
-goog.require('ol.geom.Polygon');
-goog.require('ol.render');
-goog.require('ol.render.VectorContext');
-goog.require('ol.render.canvas.Immediate');
-goog.require('ol.style.Circle');
-goog.require('ol.style.Fill');
-goog.require('ol.style.Stroke');
-goog.require('ol.style.Style');
diff --git a/test_rendering/spec/ol/reproj/image.test.js b/test_rendering/spec/ol/reproj/image.test.js
index 694ab07fb5..08069072a2 100644
--- a/test_rendering/spec/ol/reproj/image.test.js
+++ b/test_rendering/spec/ol/reproj/image.test.js
@@ -1,5 +1,12 @@
 goog.provide('ol.test.rendering.reproj.Image');
 
+goog.require('ol.events');
+goog.require('ol.proj');
+goog.require('ol.proj.EPSG3857');
+goog.require('ol.reproj.Image');
+goog.require('ol.source.ImageStatic');
+
+
 describe('ol.rendering.reproj.Image', function() {
 
   function testSingleImage(source, targetProj,
@@ -52,9 +59,3 @@ describe('ol.rendering.reproj.Image', function() {
     });
   });
 });
-
-goog.require('ol.events');
-goog.require('ol.proj');
-goog.require('ol.proj.EPSG3857');
-goog.require('ol.reproj.Image');
-goog.require('ol.source.ImageStatic');
diff --git a/test_rendering/spec/ol/reproj/tile.test.js b/test_rendering/spec/ol/reproj/tile.test.js
index 041923d6a3..06129029b7 100644
--- a/test_rendering/spec/ol/reproj/tile.test.js
+++ b/test_rendering/spec/ol/reproj/tile.test.js
@@ -1,5 +1,12 @@
 goog.provide('ol.test.rendering.reproj.Tile');
 
+goog.require('ol.events');
+goog.require('ol.proj');
+goog.require('ol.reproj.Tile');
+goog.require('ol.source.XYZ');
+goog.require('ol.TileState');
+
+
 describe('ol.rendering.reproj.Tile', function() {
 
   function testSingleTile(source, targetProjection, targetTileGrid, z, x, y,
@@ -172,9 +179,3 @@ describe('ol.rendering.reproj.Tile', function() {
     });
   });
 });
-
-goog.require('ol.events');
-goog.require('ol.proj');
-goog.require('ol.reproj.Tile');
-goog.require('ol.source.XYZ');
-goog.require('ol.TileState');
diff --git a/test_rendering/spec/ol/style/circle.test.js b/test_rendering/spec/ol/style/circle.test.js
index 8066e7ebbc..a123db58f8 100644
--- a/test_rendering/spec/ol/style/circle.test.js
+++ b/test_rendering/spec/ol/style/circle.test.js
@@ -1,5 +1,17 @@
 goog.provide('ol.test.rendering.style.Circle');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.Point');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Circle');
+goog.require('ol.style.Fill');
+goog.require('ol.style.Style');
+goog.require('ol.style.Stroke');
+
+
 describe('ol.rendering.style.Circle', function() {
 
   var target, map, vectorSource;
@@ -187,14 +199,3 @@ describe('ol.rendering.style.Circle', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.Point');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
-goog.require('ol.style.Circle');
-goog.require('ol.style.Fill');
-goog.require('ol.style.Style');
-goog.require('ol.style.Stroke');
diff --git a/test_rendering/spec/ol/style/icon.test.js b/test_rendering/spec/ol/style/icon.test.js
index 5549231b30..e55cc6071c 100644
--- a/test_rendering/spec/ol/style/icon.test.js
+++ b/test_rendering/spec/ol/style/icon.test.js
@@ -1,5 +1,15 @@
 goog.provide('ol.test.rendering.style.Icon');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.Point');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Icon');
+goog.require('ol.style.Style');
+
+
 describe('ol.rendering.style.Icon', function() {
 
   var target, map, vectorSource;
@@ -110,12 +120,3 @@ describe('ol.rendering.style.Icon', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.Point');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
-goog.require('ol.style.Icon');
-goog.require('ol.style.Style');
diff --git a/test_rendering/spec/ol/style/linestring.test.js b/test_rendering/spec/ol/style/linestring.test.js
index 2c69a3c7c3..b3e14dbbdc 100644
--- a/test_rendering/spec/ol/style/linestring.test.js
+++ b/test_rendering/spec/ol/style/linestring.test.js
@@ -1,5 +1,15 @@
 goog.provide('ol.test.rendering.style.LineString');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.LineString');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Style');
+goog.require('ol.style.Stroke');
+
+
 describe('ol.rendering.style.LineString', function() {
 
   var target, map, vectorSource;
@@ -90,12 +100,3 @@ describe('ol.rendering.style.LineString', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.LineString');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
-goog.require('ol.style.Style');
-goog.require('ol.style.Stroke');
diff --git a/test_rendering/spec/ol/style/polygon.test.js b/test_rendering/spec/ol/style/polygon.test.js
index afd205261e..4fc152fe20 100644
--- a/test_rendering/spec/ol/style/polygon.test.js
+++ b/test_rendering/spec/ol/style/polygon.test.js
@@ -1,5 +1,16 @@
 goog.provide('ol.test.rendering.style.Polygon');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.Polygon');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Fill');
+goog.require('ol.style.Style');
+goog.require('ol.style.Stroke');
+
+
 describe('ol.rendering.style.Polygon', function() {
 
   var target, map, vectorSource;
@@ -187,13 +198,3 @@ describe('ol.rendering.style.Polygon', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.Polygon');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
-goog.require('ol.style.Fill');
-goog.require('ol.style.Style');
-goog.require('ol.style.Stroke');
diff --git a/test_rendering/spec/ol/style/regularshape.test.js b/test_rendering/spec/ol/style/regularshape.test.js
index 8dfd3c35fa..e9e005c455 100644
--- a/test_rendering/spec/ol/style/regularshape.test.js
+++ b/test_rendering/spec/ol/style/regularshape.test.js
@@ -1,5 +1,17 @@
 goog.provide('ol.test.rendering.style.RegularShape');
 
+goog.require('ol.Feature');
+goog.require('ol.geom.Point');
+goog.require('ol.Map');
+goog.require('ol.View');
+goog.require('ol.layer.Vector');
+goog.require('ol.source.Vector');
+goog.require('ol.style.Fill');
+goog.require('ol.style.RegularShape');
+goog.require('ol.style.Style');
+goog.require('ol.style.Stroke');
+
+
 describe('ol.rendering.style.RegularShape', function() {
 
   var target, map, vectorSource;
@@ -115,14 +127,3 @@ describe('ol.rendering.style.RegularShape', function() {
     });
   });
 });
-
-goog.require('ol.Feature');
-goog.require('ol.geom.Point');
-goog.require('ol.Map');
-goog.require('ol.View');
-goog.require('ol.layer.Vector');
-goog.require('ol.source.Vector');
-goog.require('ol.style.Fill');
-goog.require('ol.style.RegularShape');
-goog.require('ol.style.Style');
-goog.require('ol.style.Stroke');