Merge pull request #5429 from probins/testenums

Remove enums from tests
This commit is contained in:
Andreas Hocevar
2016-07-15 09:12:58 +02:00
committed by GitHub
41 changed files with 379 additions and 435 deletions

View File

@@ -44,7 +44,7 @@ describe('ol.layer.Layer', function() {
opacity: 1,
visible: true,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -79,7 +79,7 @@ describe('ol.layer.Layer', function() {
opacity: 0.5,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 10,
maxResolution: 500,
@@ -167,7 +167,7 @@ describe('ol.layer.Layer', function() {
opacity: 0.3,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 10,
maxResolution: 500,
@@ -183,7 +183,7 @@ describe('ol.layer.Layer', function() {
opacity: 0,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -197,7 +197,7 @@ describe('ol.layer.Layer', function() {
opacity: 1,
visible: true,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -247,14 +247,14 @@ describe('ol.layer.Layer', function() {
var first = new ol.source.Source({projection: projection});
var layer = new ol.layer.Layer({source: first});
first.setState(ol.source.State.READY);
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new ol.source.Source({projection: projection});
layer.set('source', second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
second.setState(ol.source.State.READY);
second.setState('ready');
expect(layer.handleSourceChange_.callCount).to.be(2);
// remove spy
@@ -293,14 +293,14 @@ describe('ol.layer.Layer', function() {
var first = new ol.source.Source({projection: projection});
var layer = new ol.layer.Layer({source: first});
first.setState(ol.source.State.READY);
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new ol.source.Source({projection: projection});
layer.setSource(second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
second.setState(ol.source.State.READY);
second.setState('ready');
expect(layer.handleSourceChange_.callCount).to.be(2);
// remove spy
@@ -333,7 +333,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() {
var listener = sinon.spy();
layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.on('propertychange', listener);
layer.setOpacity(0.4);
expect(listener.calledOnce).to.be(true);
});
@@ -366,7 +366,7 @@ describe('ol.layer.Layer', function() {
it('fires a change event', function() {
var listener = sinon.spy();
layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.on('propertychange', listener);
layer.setVisible(false);
expect(listener.callCount).to.be(1);
@@ -433,9 +433,7 @@ describe('ol.layer.Layer', function() {
});
goog.require('ol.Map');
goog.require('ol.ObjectEventType');
goog.require('ol.layer.Layer');
goog.require('ol.proj');
goog.require('ol.render.Event');
goog.require('ol.source.Source');
goog.require('ol.source.State');

View File

@@ -32,7 +32,7 @@ describe('ol.layer.Group', function() {
opacity: 1,
visible: true,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -68,14 +68,14 @@ describe('ol.layer.Group', function() {
});
it('is dispatched by the group when layer opacity changes', function() {
group.on(ol.events.EventType.CHANGE, listener);
group.on('change', listener);
layer.setOpacity(0.5);
expect(listener.calledOnce).to.be(true);
});
it('is dispatched by the group when layer visibility changes', function() {
group.on(ol.events.EventType.CHANGE, listener);
group.on('change', listener);
layer.setVisible(false);
expect(listener.callCount).to.be(1);
@@ -107,14 +107,14 @@ describe('ol.layer.Group', function() {
});
it('is dispatched by the group when group opacity changes', function() {
group.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
group.on('propertychange', listener);
group.setOpacity(0.5);
expect(listener.calledOnce).to.be(true);
});
it('is dispatched by the group when group visibility changes', function() {
group.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
group.on('propertychange', listener);
group.setVisible(false);
expect(listener.callCount).to.be(1);
@@ -151,7 +151,7 @@ describe('ol.layer.Group', function() {
opacity: 0.5,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 10,
maxResolution: 500,
@@ -192,7 +192,7 @@ describe('ol.layer.Group', function() {
opacity: 0.5,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: groupExtent,
zIndex: 0,
maxResolution: 500,
@@ -232,7 +232,7 @@ describe('ol.layer.Group', function() {
opacity: 0.3,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: groupExtent,
zIndex: 10,
maxResolution: 500,
@@ -248,7 +248,7 @@ describe('ol.layer.Group', function() {
opacity: 0,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -262,7 +262,7 @@ describe('ol.layer.Group', function() {
opacity: 1,
visible: true,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: Infinity,
@@ -426,7 +426,7 @@ describe('ol.layer.Group', function() {
opacity: 0.25,
visible: false,
managed: true,
sourceState: ol.source.State.READY,
sourceState: 'ready',
extent: undefined,
zIndex: 0,
maxResolution: 150,
@@ -491,13 +491,10 @@ describe('ol.layer.Group', function() {
goog.require('ol.array');
goog.require('ol.Collection');
goog.require('ol.ObjectEventType');
goog.require('ol.events');
goog.require('ol.events.EventType');
goog.require('ol.extent');
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');