From 72ea0ecfd87b083e1e10f1ac5568116667cc834a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 3 Feb 2016 22:34:58 -0700 Subject: [PATCH] Remove remaining goog.object use from tests --- .../keyboardpaninteraction.test.js | 1 - .../keyboardzoominteraction.test.js | 1 - .../mousewheelzoominteraction.test.js | 1 - test/spec/ol/layer/layergroup.test.js | 24 +++++++++---------- test/spec/ol/pointer/touchsource.test.js | 13 +++++----- test/spec/ol/source/tilesource.test.js | 1 - 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/test/spec/ol/interaction/keyboardpaninteraction.test.js b/test/spec/ol/interaction/keyboardpaninteraction.test.js index 303c81e576..bdec982f5a 100644 --- a/test/spec/ol/interaction/keyboardpaninteraction.test.js +++ b/test/spec/ol/interaction/keyboardpaninteraction.test.js @@ -47,7 +47,6 @@ describe('ol.interaction.KeyboardPan', function() { }); -goog.require('goog.object'); goog.require('ol.Map'); goog.require('ol.MapBrowserEvent'); goog.require('ol.View'); diff --git a/test/spec/ol/interaction/keyboardzoominteraction.test.js b/test/spec/ol/interaction/keyboardzoominteraction.test.js index 94ec0c9888..7dc2c08bf2 100644 --- a/test/spec/ol/interaction/keyboardzoominteraction.test.js +++ b/test/spec/ol/interaction/keyboardzoominteraction.test.js @@ -41,7 +41,6 @@ describe('ol.interaction.KeyboardZoom', function() { }); -goog.require('goog.object'); goog.require('ol.Map'); goog.require('ol.MapBrowserEvent'); goog.require('ol.View'); diff --git a/test/spec/ol/interaction/mousewheelzoominteraction.test.js b/test/spec/ol/interaction/mousewheelzoominteraction.test.js index 79e52d90dc..22a983aa68 100644 --- a/test/spec/ol/interaction/mousewheelzoominteraction.test.js +++ b/test/spec/ol/interaction/mousewheelzoominteraction.test.js @@ -126,7 +126,6 @@ describe('ol.interaction.MouseWheelZoom', function() { }); -goog.require('goog.object'); goog.require('ol.Map'); goog.require('ol.MapBrowserEvent'); goog.require('ol.View'); diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/layergroup.test.js index 8d357b76d4..a285ed23c6 100644 --- a/test/spec/ol/layer/layergroup.test.js +++ b/test/spec/ol/layer/layergroup.test.js @@ -279,10 +279,10 @@ describe('ol.layer.Group', function() { var layerGroup = new ol.layer.Group({ layers: layers }); - expect(goog.object.getCount(layerGroup.listenerKeys_)).to.eql(0); + expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0); var layer = new ol.layer.Layer({}); layers.push(layer); - expect(goog.object.getCount(layerGroup.listenerKeys_)).to.eql(1); + expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1); var listeners = layerGroup.listenerKeys_[goog.getUid(layer)]; expect(listeners.length).to.eql(2); @@ -291,7 +291,7 @@ describe('ol.layer.Group', function() { // remove the layer from the group layers.pop(); - expect(goog.object.getCount(layerGroup.listenerKeys_)).to.eql(0); + expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0); expect(listeners[0].listener).to.be(undefined); expect(listeners[1].listener).to.be(undefined); }); @@ -364,9 +364,9 @@ describe('ol.layer.Group', function() { expect(layerStatesArray[0]).to.eql(layer1.getLayerState()); // layer state should match except for layer reference - var layerState = goog.object.clone(layerStatesArray[0]); + var layerState = ol.object.assign({}, layerStatesArray[0]); delete layerState.layer; - var groupState = goog.object.clone(layerGroup.getLayerState()); + var groupState = ol.object.assign({}, layerGroup.getLayerState()); delete groupState.layer; expect(layerState).to.eql(groupState); @@ -413,14 +413,14 @@ describe('ol.layer.Group', function() { var groupState, layerState; // layer state should match except for layer reference - layerState = goog.object.clone(layerStatesArray[0]); + layerState = ol.object.assign({}, layerStatesArray[0]); delete layerState.layer; - groupState = goog.object.clone(layerGroup.getLayerState()); + groupState = ol.object.assign({}, layerGroup.getLayerState()); delete groupState.layer; expect(layerState).to.eql(groupState); // layer state should be transformed (and we ignore layer reference) - layerState = goog.object.clone(layerStatesArray[1]); + layerState = ol.object.assign({}, layerStatesArray[1]); delete layerState.layer; expect(layerState).to.eql({ opacity: 0.25, @@ -491,14 +491,14 @@ describe('ol.layer.Group', function() { goog.require('ol.array'); goog.require('goog.dispose'); +goog.require('ol.Collection'); +goog.require('ol.ObjectEventType'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('goog.object'); -goog.require('ol.ObjectEventType'); goog.require('ol.extent'); -goog.require('ol.layer.Layer'); goog.require('ol.layer.Group'); +goog.require('ol.layer.Layer'); +goog.require('ol.object'); goog.require('ol.renderer.Map'); goog.require('ol.source.Source'); goog.require('ol.source.State'); -goog.require('ol.Collection'); diff --git a/test/spec/ol/pointer/touchsource.test.js b/test/spec/ol/pointer/touchsource.test.js index dba05424bc..d4eec899b4 100644 --- a/test/spec/ol/pointer/touchsource.test.js +++ b/test/spec/ol/pointer/touchsource.test.js @@ -46,7 +46,7 @@ describe('ol.pointer.TouchSource', function() { expect(pointerEvent2.clientX).to.be(30); expect(pointerEvent2.clientY).to.be(45); - expect(goog.object.getCount(handler.pointerMap)).to.be(2); + expect(Object.keys(handler.pointerMap).length).to.be(2); }); it('creates the right pointer events', function() { @@ -57,7 +57,7 @@ describe('ol.pointer.TouchSource', function() { {identifier: 3, clientX: 10, clientY: 11} ]); expect(eventSpy.calledOnce).to.be.ok(); - expect(goog.object.getCount(handler.pointerMap)).to.be(1); + expect(Object.keys(handler.pointerMap).length).to.be(1); // second touch (first touch still down) simulateTouchEvent('touchstart', [ @@ -65,7 +65,7 @@ describe('ol.pointer.TouchSource', function() { ], [{identifier: 3}, {identifier: 4}] ); expect(eventSpy.calledTwice).to.be.ok(); - expect(goog.object.getCount(handler.pointerMap)).to.be(2); + expect(Object.keys(handler.pointerMap).length).to.be(2); // first touch moves var moveEventSpy = sinon.spy(); @@ -87,7 +87,7 @@ describe('ol.pointer.TouchSource', function() { ], [{identifier: 3}, {identifier: 4}] ); expect(upEventSpy.calledTwice).to.be.ok(); - expect(goog.object.getCount(handler.pointerMap)).to.be(0); + expect(Object.keys(handler.pointerMap).length).to.be(0); }); it('handles flawed touches', function() { @@ -98,7 +98,7 @@ describe('ol.pointer.TouchSource', function() { {identifier: 3, clientX: 10, clientY: 11} ]); expect(eventSpy.calledOnce).to.be.ok(); - expect(goog.object.getCount(handler.pointerMap)).to.be(1); + expect(Object.keys(handler.pointerMap).length).to.be(1); // second touch, but the first touch has disappeared var cancelEventSpy = sinon.spy(); @@ -111,7 +111,7 @@ describe('ol.pointer.TouchSource', function() { // the first (broken) touch is canceled expect(cancelEventSpy.calledOnce).to.be.ok(); - expect(goog.object.getCount(handler.pointerMap)).to.be(1); + expect(Object.keys(handler.pointerMap).length).to.be(1); }); }); @@ -127,7 +127,6 @@ describe('ol.pointer.TouchSource', function() { } }); -goog.require('goog.object'); goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventTarget'); diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tilesource.test.js index 1155964481..2ec75b645c 100644 --- a/test/spec/ol/source/tilesource.test.js +++ b/test/spec/ol/source/tilesource.test.js @@ -255,7 +255,6 @@ describe('ol.test.source.TileMock', function() { }); -goog.require('goog.object'); goog.require('ol.Tile'); goog.require('ol.TileRange'); goog.require('ol.TileState');