Rename _ol_Disposable_ to Disposable

This commit is contained in:
Frederic Junod
2017-12-22 09:02:23 +01:00
parent fc00aecd2e
commit 085fddcb36
9 changed files with 27 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../src/ol/Disposable.js';
import Disposable from '../../../src/ol/Disposable.js';
describe('ol.Disposable', function() {
@@ -6,8 +6,8 @@ describe('ol.Disposable', function() {
describe('constructor', function() {
it('creates an instance', function() {
var disposable = new _ol_Disposable_();
expect(disposable).to.be.a(_ol_Disposable_);
var disposable = new Disposable();
expect(disposable).to.be.a(Disposable);
});
});
@@ -15,12 +15,12 @@ describe('ol.Disposable', function() {
describe('#disposed_', function() {
it('is initially false', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
expect(disposable.disposed_).to.be(false);
});
it('is true after a call to dispose', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
disposable.dispose();
expect(disposable.disposed_).to.be(true);
});
@@ -30,7 +30,7 @@ describe('ol.Disposable', function() {
describe('#dispose()', function() {
it('calls disposeInternal only once', function() {
var disposable = new _ol_Disposable_();
var disposable = new Disposable();
sinon.spy(disposable, 'disposeInternal');
expect(disposable.disposeInternal.called).to.be(false);
disposable.dispose();

View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import _ol_events_ from '../../../../src/ol/events.js';
import Event from '../../../../src/ol/events/Event.js';
import EventTarget from '../../../../src/ol/events/EventTarget.js';
@@ -23,7 +23,7 @@ describe('ol.events.EventTarget', function() {
describe('constructor', function() {
it('creates an instance', function() {
expect(eventTarget).to.be.a(EventTarget);
expect(eventTarget).to.be.a(_ol_Disposable_);
expect(eventTarget).to.be.a(Disposable);
});
it('creates an empty listeners_ object', function() {
expect(Object.keys(eventTarget.listeners_)).to.have.length(0);

View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import Map from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
@@ -35,7 +35,7 @@ describe('ol.render.Box', function() {
it('creates an instance', function() {
var obj = new _ol_render_Box_('test-box');
expect(obj).to.be.a(_ol_render_Box_);
expect(obj).to.be.a(_ol_Disposable_);
expect(obj).to.be.a(Disposable);
obj.dispose();
});
it('creates an absolutely positioned DIV with a className', function() {

View File

@@ -1,4 +1,4 @@
import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
import Disposable from '../../../../src/ol/Disposable.js';
import Map from '../../../../src/ol/Map.js';
import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js';
@@ -11,7 +11,7 @@ describe('ol.renderer.Map', function() {
var map = new Map({});
var renderer = new _ol_renderer_Map_(null, map);
expect(renderer).to.be.a(_ol_renderer_Map_);
expect(renderer).to.be.a(_ol_Disposable_);
expect(renderer).to.be.a(Disposable);
renderer.dispose();
map.dispose();
});