Skip to content

Commit dfae15d

Browse files
mpulkki-mapboxmpulkki-mapbox
committed
Fix unit tests
1 parent 4a0b385 commit dfae15d

File tree

4 files changed

+59
-58
lines changed

4 files changed

+59
-58
lines changed

‎test/unit/source/raster_dem_tile_source.test.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ test('RasterTileSource', (t) => {
9898
source.loadTile(tile, () => {});
9999

100100
t.deepEqual(Object.keys(tile.neighboringTiles), [
101+
new OverscaledTileID(10, 0, 10, 4, 5).key,
102+
new OverscaledTileID(10, 0, 10, 6, 5).key,
101103
new OverscaledTileID(10, 0, 10, 4, 4).key,
102104
new OverscaledTileID(10, 0, 10, 5, 4).key,
103105
new OverscaledTileID(10, 0, 10, 6, 4).key,
104-
new OverscaledTileID(10, 0, 10, 4, 5).key,
105-
new OverscaledTileID(10, 0, 10, 6, 5).key,
106106
new OverscaledTileID(10, 0, 10, 4, 6).key,
107107
new OverscaledTileID(10, 0, 10, 5, 6).key,
108108
new OverscaledTileID(10, 0, 10, 6, 6).key
@@ -134,13 +134,13 @@ test('RasterTileSource', (t) => {
134134
source.loadTile(tile, () => {});
135135

136136
t.deepEqual(Object.keys(tile.neighboringTiles), [
137-
new OverscaledTileID(5, 0, 5, 30, 4).key,
138-
new OverscaledTileID(5, 0, 5, 31, 4).key,
139-
new OverscaledTileID(5, 0, 5, 30, 5).key,
140137
new OverscaledTileID(5, 0, 5, 30, 6).key,
141138
new OverscaledTileID(5, 0, 5, 31, 6).key,
142-
new OverscaledTileID(5, 1, 5, 0, 4).key,
139+
new OverscaledTileID(5, 0, 5, 30, 5).key,
143140
new OverscaledTileID(5, 1, 5, 0, 5).key,
141+
new OverscaledTileID(5, 0, 5, 30, 4).key,
142+
new OverscaledTileID(5, 0, 5, 31, 4).key,
143+
new OverscaledTileID(5, 1, 5, 0, 4).key,
144144
new OverscaledTileID(5, 1, 5, 0, 6).key
145145
]);
146146
t.end();

‎test/unit/source/source_cache.test.js

+41-40
Original file line numberDiff line numberDiff line change
@@ -779,20 +779,20 @@ test('SourceCache#update', (t) => {
779779
if (e.sourceDataType === 'metadata') {
780780
sourceCache.update(transform);
781781
t.deepEqual(sourceCache.getRenderableIds(), [
782-
new OverscaledTileID(16, 0, 16, 8192, 8192).key,
783-
new OverscaledTileID(16, 0, 16, 8191, 8192).key,
784-
new OverscaledTileID(16, 0, 16, 8192, 8191).key,
785-
new OverscaledTileID(16, 0, 16, 8191, 8191).key
782+
new OverscaledTileID(16, 0, 14, 8192, 8192).key,
783+
new OverscaledTileID(16, 0, 14, 8191, 8192).key,
784+
new OverscaledTileID(16, 0, 14, 8192, 8191).key,
785+
new OverscaledTileID(16, 0, 14, 8191, 8191).key
786786
]);
787787

788788
transform.zoom = 15;
789789
sourceCache.update(transform);
790790

791791
t.deepEqual(sourceCache.getRenderableIds(), [
792-
new OverscaledTileID(16, 0, 16, 8192, 8192).key,
793-
new OverscaledTileID(16, 0, 16, 8191, 8192).key,
794-
new OverscaledTileID(16, 0, 16, 8192, 8191).key,
795-
new OverscaledTileID(16, 0, 16, 8191, 8191).key
792+
new OverscaledTileID(16, 0, 14, 8192, 8192).key,
793+
new OverscaledTileID(16, 0, 14, 8191, 8192).key,
794+
new OverscaledTileID(16, 0, 14, 8192, 8191).key,
795+
new OverscaledTileID(16, 0, 14, 8191, 8191).key
796796
]);
797797
t.end();
798798
}
@@ -877,14 +877,14 @@ test('SourceCache#_updateRetainedTiles', (t) => {
877877
}
878878

879879
const retained = sourceCache._updateRetainedTiles([idealTile], 3);
880-
t.deepEqual(Object.keys(retained), [
880+
t.deepEqual(Object.keys(retained).sort(), [
881881
// parents are requested because ideal ideal tile is not completely covered by
882882
// loaded child tiles
883883
new OverscaledTileID(0, 0, 0, 0, 0),
884-
new OverscaledTileID(1, 0, 1, 0, 0),
885884
new OverscaledTileID(2, 0, 2, 0, 1),
885+
new OverscaledTileID(1, 0, 1, 0, 0),
886886
idealTile
887-
].concat(loadedChildren).map(t => String(t.key)));
887+
].concat(loadedChildren).map(t => t.key).sort());
888888

889889
t.end();
890890
});
@@ -912,12 +912,12 @@ test('SourceCache#_updateRetainedTiles', (t) => {
912912
// retained tiles include all ideal tiles and any parents that were loaded to cover
913913
// non-existant tiles
914914
t.deepEqual(retained, {
915-
// parent
916-
'0': new OverscaledTileID(0, 0, 0, 0, 0),
917-
// 1/0/1
918-
'65': new OverscaledTileID(1, 0, 1, 0, 1),
915+
// 1/0/1
916+
'211': new OverscaledTileID(1, 0, 1, 0, 1),
919917
// 1/1/1
920-
'97': new OverscaledTileID(1, 0, 1, 1, 1)
918+
'311': new OverscaledTileID(1, 0, 1, 1, 1),
919+
// parent
920+
'000': new OverscaledTileID(0, 0, 0, 0, 0)
921921
});
922922
addTileSpy.restore();
923923
getTileSpy.restore();
@@ -970,10 +970,11 @@ test('SourceCache#_updateRetainedTiles', (t) => {
970970
}
971971
});
972972
const idealTile = new OverscaledTileID(1, 0, 1, 0, 1);
973+
const parentTile = new OverscaledTileID(0, 0, 0, 0, 0);
973974
sourceCache._tiles[idealTile.key] = new Tile(idealTile);
974975
sourceCache._tiles[idealTile.key].state = 'loading';
975-
sourceCache._tiles['0'] = new Tile(new OverscaledTileID(0, 0, 0, 0, 0));
976-
sourceCache._tiles['0'].state = 'loaded';
976+
sourceCache._tiles[parentTile.key] = new Tile(parentTile);
977+
sourceCache._tiles[parentTile.key].state = 'loaded';
977978

978979
const addTileSpy = t.spy(sourceCache, '_addTile');
979980
const getTileSpy = t.spy(sourceCache, 'getTile');
@@ -987,9 +988,9 @@ test('SourceCache#_updateRetainedTiles', (t) => {
987988

988989
t.deepEqual(retained, {
989990
// parent of ideal tile 0/0/0
990-
'0' : new OverscaledTileID(0, 0, 0, 0, 0),
991+
'000' : new OverscaledTileID(0, 0, 0, 0, 0),
991992
// ideal tile id 1/0/1
992-
'65' : new OverscaledTileID(1, 0, 1, 0, 1)
993+
'211' : new OverscaledTileID(1, 0, 1, 0, 1)
993994
}, 'retain ideal and parent tile when ideal tiles aren\'t loaded');
994995

995996
addTileSpy.resetHistory();
@@ -1002,7 +1003,7 @@ test('SourceCache#_updateRetainedTiles', (t) => {
10021003
t.ok(getTileSpy.notCalled);
10031004
t.deepEqual(retainedLoaded, {
10041005
// only ideal tile retained
1005-
'65' : new OverscaledTileID(1, 0, 1, 0, 1)
1006+
'211' : new OverscaledTileID(1, 0, 1, 0, 1)
10061007
}, 'only retain ideal tiles when they\'re all loaded');
10071008

10081009
addTileSpy.restore();
@@ -1059,24 +1060,24 @@ test('SourceCache#_updateRetainedTiles', (t) => {
10591060
t.deepEqual(retained, {
10601061
// parent of ideal tile (0, 0, 0) (only partially covered by loaded child
10611062
// tiles, so we still need to load the parent)
1062-
'0' : new OverscaledTileID(0, 0, 0, 0, 0),
1063+
'000' : new OverscaledTileID(0, 0, 0, 0, 0),
10631064
// ideal tile id (1, 0, 0)
1064-
'1' : new OverscaledTileID(1, 0, 1, 0, 0),
1065+
'011' : new OverscaledTileID(1, 0, 1, 0, 0),
10651066
// loaded child tile (2, 0, 0)
1066-
'2': new OverscaledTileID(2, 0, 2, 0, 0)
1067+
'022': new OverscaledTileID(2, 0, 2, 0, 0)
10671068
}, 'retains children and parent when ideal tile is partially covered by a loaded child tile');
10681069

10691070
getTileSpy.restore();
10701071
// remove child tile and check that it only uses parent tile
1071-
delete sourceCache._tiles['2'];
1072+
delete sourceCache._tiles['022'];
10721073
retained = sourceCache._updateRetainedTiles([idealTile], 1);
10731074

10741075
t.deepEqual(retained, {
10751076
// parent of ideal tile (0, 0, 0) (only partially covered by loaded child
10761077
// tiles, so we still need to load the parent)
1077-
'0' : new OverscaledTileID(0, 0, 0, 0, 0),
1078+
'000' : new OverscaledTileID(0, 0, 0, 0, 0),
10781079
// ideal tile id (1, 0, 0)
1079-
'1' : new OverscaledTileID(1, 0, 1, 0, 0)
1080+
'011' : new OverscaledTileID(1, 0, 1, 0, 0)
10801081
}, 'only retains parent tile if no child tiles are loaded');
10811082

10821083
t.end();
@@ -1104,7 +1105,7 @@ test('SourceCache#_updateRetainedTiles', (t) => {
11041105

11051106
t.deepEqual(retained, {
11061107
// ideal tile id (2, 0, 0)
1107-
'2' : new OverscaledTileID(2, 0, 2, 0, 0)
1108+
'022' : new OverscaledTileID(2, 0, 2, 0, 0)
11081109
}, 'doesn\'t retain parent tiles below minzoom');
11091110

11101111
getTileSpy.restore();
@@ -1134,7 +1135,7 @@ test('SourceCache#_updateRetainedTiles', (t) => {
11341135

11351136
t.deepEqual(retained, {
11361137
// ideal tile id (2, 0, 0)
1137-
'2' : new OverscaledTileID(2, 0, 2, 0, 0)
1138+
'022' : new OverscaledTileID(2, 0, 2, 0, 0)
11381139
}, 'doesn\'t retain child tiles above maxzoom');
11391140

11401141
getTileSpy.restore();
@@ -1203,10 +1204,10 @@ test('SourceCache#_updateRetainedTiles', (t) => {
12031204
const retained = sourceCache._updateRetainedTiles(idealTiles, 8);
12041205

12051206
t.deepEqual(Object.keys(retained), [
1206-
new OverscaledTileID(7, 0, 7, 0, 0).key,
1207-
new OverscaledTileID(8, 0, 7, 0, 0).key,
12081207
new OverscaledTileID(7, 0, 7, 1, 0).key,
1209-
new OverscaledTileID(8, 0, 7, 1, 0).key
1208+
new OverscaledTileID(8, 0, 7, 1, 0).key,
1209+
new OverscaledTileID(8, 0, 7, 0, 0).key,
1210+
new OverscaledTileID(7, 0, 7, 0, 0).key
12101211
]);
12111212

12121213
t.end();
@@ -1302,12 +1303,12 @@ test('SourceCache#tilesIn', (t) => {
13021303
tiles.sort((a, b) => { return a.tile.tileID.canonical.x - b.tile.tileID.canonical.x; });
13031304
tiles.forEach((result) => { delete result.tile.uid; });
13041305

1305-
t.equal(tiles[0].tile.tileID.key, 1);
1306+
t.equal(tiles[0].tile.tileID.key, "011");
13061307
t.equal(tiles[0].tile.tileSize, 512);
13071308
t.equal(tiles[0].scale, 1);
13081309
t.deepEqual(round(tiles[0].queryGeometry), [{x: 4096, y: 4050}, {x:12288, y: 8146}]);
13091310

1310-
t.equal(tiles[1].tile.tileID.key, 33);
1311+
t.equal(tiles[1].tile.tileID.key, "111");
13111312
t.equal(tiles[1].tile.tileSize, 512);
13121313
t.equal(tiles[1].scale, 1);
13131314
t.deepEqual(round(tiles[1].queryGeometry), [{x: -4096, y: 4050}, {x: 4096, y: 8146}]);
@@ -1340,10 +1341,10 @@ test('SourceCache#tilesIn', (t) => {
13401341
sourceCache.update(transform);
13411342

13421343
t.deepEqual(sourceCache.getIds(), [
1343-
new OverscaledTileID(2, 0, 2, 1, 1).key,
1344-
new OverscaledTileID(2, 0, 2, 0, 1).key,
1345-
new OverscaledTileID(2, 0, 2, 1, 0).key,
1346-
new OverscaledTileID(2, 0, 2, 0, 0).key
1344+
new OverscaledTileID(2, 0, 1, 1, 1).key,
1345+
new OverscaledTileID(2, 0, 1, 0, 1).key,
1346+
new OverscaledTileID(2, 0, 1, 1, 0).key,
1347+
new OverscaledTileID(2, 0, 1, 0, 0).key
13471348
]);
13481349

13491350
const tiles = sourceCache.tilesIn([
@@ -1354,12 +1355,12 @@ test('SourceCache#tilesIn', (t) => {
13541355
tiles.sort((a, b) => { return a.tile.tileID.canonical.x - b.tile.tileID.canonical.x; });
13551356
tiles.forEach((result) => { delete result.tile.uid; });
13561357

1357-
t.equal(tiles[0].tile.tileID.key, 2);
1358+
t.equal(tiles[0].tile.tileID.key, "012");
13581359
t.equal(tiles[0].tile.tileSize, 1024);
13591360
t.equal(tiles[0].scale, 1);
13601361
t.deepEqual(round(tiles[0].queryGeometry), [{x: 4096, y: 4050}, {x:12288, y: 8146}]);
13611362

1362-
t.equal(tiles[1].tile.tileID.key, 34);
1363+
t.equal(tiles[1].tile.tileID.key, "112");
13631364
t.equal(tiles[1].tile.tileSize, 1024);
13641365
t.equal(tiles[1].scale, 1);
13651366
t.deepEqual(round(tiles[1].queryGeometry), [{x: -4096, y: 4050}, {x: 4096, y: 8146}]);

‎test/unit/source/tile_id.test.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ test('CanonicalTileID', (t) => {
2323
});
2424

2525
t.test('.key', (t) => {
26-
t.deepEqual(new CanonicalTileID(0, 0, 0).key, 0);
27-
t.deepEqual(new CanonicalTileID(1, 0, 0).key, 1);
28-
t.deepEqual(new CanonicalTileID(1, 1, 0).key, 33);
29-
t.deepEqual(new CanonicalTileID(1, 1, 1).key, 97);
26+
t.deepEqual(new CanonicalTileID(0, 0, 0).key, "000");
27+
t.deepEqual(new CanonicalTileID(1, 0, 0).key, "011");
28+
t.deepEqual(new CanonicalTileID(1, 1, 0).key, "111");
29+
t.deepEqual(new CanonicalTileID(1, 1, 1).key, "311");
3030
t.end();
3131
});
3232

@@ -77,11 +77,11 @@ test('OverscaledTileID', (t) => {
7777
});
7878

7979
t.test('.key', (t) => {
80-
t.deepEqual(new OverscaledTileID(0, 0, 0, 0, 0).key, 0);
81-
t.deepEqual(new OverscaledTileID(1, 0, 1, 0, 0).key, 1);
82-
t.deepEqual(new OverscaledTileID(1, 0, 1, 1, 0).key, 33);
83-
t.deepEqual(new OverscaledTileID(1, 0, 1, 1, 1).key, 97);
84-
t.deepEqual(new OverscaledTileID(1, -1, 1, 1, 1).key, 225);
80+
t.deepEqual(new OverscaledTileID(0, 0, 0, 0, 0).key, "000");
81+
t.deepEqual(new OverscaledTileID(1, 0, 1, 0, 0).key, "011");
82+
t.deepEqual(new OverscaledTileID(1, 0, 1, 1, 0).key, "111");
83+
t.deepEqual(new OverscaledTileID(1, 0, 1, 1, 1).key, "311");
84+
t.deepEqual(new OverscaledTileID(1, -1, 1, 1, 1).key, "711");
8585
t.end();
8686
});
8787

‎test/unit/ui/map.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,11 @@ test('Map', (t) => {
322322
const map = createMap(t, {style});
323323
t.equal(map.areTilesLoaded(), true, 'returns true if there are no sources on the map');
324324
map.on('load', () => {
325-
325+
const fakeTileId = new OverscaledTileID(0, 0, 0, 0, 0);
326326
map.addSource('geojson', createStyleSource());
327-
map.style.sourceCaches.geojson._tiles.fakeTile = new Tile(new OverscaledTileID(0, 0, 0, 0, 0));
327+
map.style.sourceCaches.geojson._tiles[fakeTileId.key] = new Tile(fakeTileId);
328328
t.equal(map.areTilesLoaded(), false, 'returns false if tiles are loading');
329-
map.style.sourceCaches.geojson._tiles.fakeTile.state = 'loaded';
329+
map.style.sourceCaches.geojson._tiles[fakeTileId.key].state = 'loaded';
330330
t.equal(map.areTilesLoaded(), true, 'returns true if tiles are loaded');
331331
t.end();
332332
});

0 commit comments

Comments
 (0)