Skip to content

Commit 0013447

Browse files
xiongjiaojiaoxiongjiaojiao
committed
fix: ut
AI-GEN: 0 %
1 parent 9d3def6 commit 0013447

1 file changed

Lines changed: 49 additions & 40 deletions

File tree

‎test/common/mapping/utils/SourceListModelV3Spec.js‎

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ describe('SourceListV3', () => {
12251225
{
12261226
msDatasetId: 'ms_test_dataset_123',
12271227
datasetId: 'test_dataset',
1228-
datasetName: 'test:test_dataset'
1228+
datasetName: 'test_dataset'
12291229
}
12301230
]
12311231
}
@@ -1244,9 +1244,9 @@ describe('SourceListV3', () => {
12441244
const layers = sourceListModel.getLayers();
12451245
const restDataLayer = layers.find(layer => layer.id === 'rest-data-layer');
12461246
expect(restDataLayer).toBeTruthy();
1247-
expect(restDataLayer.layerInfo.dataSource.type).toBe('REST_DATA');
1248-
expect(restDataLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1249-
expect(restDataLayer.layerInfo.dataSource.dataSourceName).toBe('test:test_dataset');
1247+
expect(restDataLayer.dataSource.type).toBe('REST_DATA');
1248+
expect(restDataLayer.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1249+
expect(restDataLayer.dataSource.dataSourceName).toBe('test:test_dataset');
12501250
done();
12511251
});
12521252

@@ -1278,6 +1278,7 @@ describe('SourceListV3', () => {
12781278
],
12791279
version: '3.0.0'
12801280
};
1281+
map.addSource('rest-map-source', mapInfo.sources['rest-map-source']);
12811282
const sourceListModel = new SourceListModelV3({
12821283
map,
12831284
mapInfo,
@@ -1291,9 +1292,9 @@ describe('SourceListV3', () => {
12911292
const layers = sourceListModel.getLayers();
12921293
const restMapLayer = layers.find(layer => layer.id === 'rest-map-layer');
12931294
expect(restMapLayer).toBeTruthy();
1294-
expect(restMapLayer.layerInfo.dataSource.type).toBe('REST_MAP');
1295-
expect(restMapLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/iserver/services/map-test/rest/maps');
1296-
expect(restMapLayer.layerInfo.dataSource.mapName).toBe('test_map');
1295+
expect(restMapLayer.dataSource.type).toBe('REST_MAP');
1296+
expect(restMapLayer.dataSource.url).toBe('http://localhost:8090/iserver/services/map-test/rest/maps');
1297+
expect(restMapLayer.dataSource.mapName).toBe('test_map');
12971298
done();
12981299
});
12991300

@@ -1312,7 +1313,7 @@ describe('SourceListV3', () => {
13121313
sources: {
13131314
'restjsr-source': {
13141315
type: 'vector',
1315-
tiles: ['http://localhost:8090/restjsr/v1/maps/test_map/tiles/{z}/{x}/{y}.mvt']
1316+
tiles: ['http://localhost:8090/restjsr/v1/test_map/tiles/{z}/{x}/{y}.mvt']
13161317
}
13171318
},
13181319
layers: [
@@ -1325,6 +1326,7 @@ describe('SourceListV3', () => {
13251326
],
13261327
version: '3.0.0'
13271328
};
1329+
map.addSource('restjsr-source', mapInfo.sources['restjsr-source']);
13281330
const sourceListModel = new SourceListModelV3({
13291331
map,
13301332
mapInfo,
@@ -1338,9 +1340,9 @@ describe('SourceListV3', () => {
13381340
const layers = sourceListModel.getLayers();
13391341
const restjsrLayer = layers.find(layer => layer.id === 'restjsr-layer');
13401342
expect(restjsrLayer).toBeTruthy();
1341-
expect(restjsrLayer.layerInfo.dataSource.type).toBe('RESTJSR');
1342-
expect(restjsrLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/restjsr/v1/vectortile/maps');
1343-
expect(restjsrLayer.layerInfo.dataSource.mapName).toBe('test_map');
1343+
expect(restjsrLayer.dataSource.type).toBe('RESTJSR');
1344+
expect(restjsrLayer.dataSource.url).toBe('http://localhost:8090/restjsr/v1/vectortile/maps');
1345+
expect(restjsrLayer.dataSource.mapName).toBe('test_map');
13441346
done();
13451347
});
13461348

@@ -1372,6 +1374,7 @@ describe('SourceListV3', () => {
13721374
],
13731375
version: '3.0.0'
13741376
};
1377+
map.addSource('other-vector-source', mapInfo.sources['other-vector-source']);
13751378
const sourceListModel = new SourceListModelV3({
13761379
map,
13771380
mapInfo,
@@ -1385,8 +1388,8 @@ describe('SourceListV3', () => {
13851388
const layers = sourceListModel.getLayers();
13861389
const otherLayer = layers.find(layer => layer.id === 'other-vector-layer');
13871390
expect(otherLayer).toBeTruthy();
1388-
expect(otherLayer.layerInfo.dataSource.type).toBe('VECTOR_OTHER');
1389-
expect(otherLayer.layerInfo.dataSource.url).toBe('http://localhost:8080/tiles/{z}/{x}/{y}.mvt');
1391+
expect(otherLayer.dataSource.type).toBe('VECTOR_OTHER');
1392+
expect(otherLayer.dataSource.url).toBe('http://localhost:8080/tiles/{z}/{x}/{y}.mvt');
13901393
done();
13911394
});
13921395

@@ -1434,7 +1437,7 @@ describe('SourceListV3', () => {
14341437
{
14351438
msDatasetId: 'ms_test_dataset_123',
14361439
datasetId: 'test_dataset',
1437-
datasetName: 'test:test_dataset'
1440+
datasetName: 'test_dataset'
14381441
}
14391442
]
14401443
}
@@ -1453,10 +1456,10 @@ describe('SourceListV3', () => {
14531456
const layers = sourceListModel.getLayers();
14541457
const serviceLayer = layers.find(layer => layer.id === 'service-layer');
14551458
expect(serviceLayer).toBeTruthy();
1456-
expect(serviceLayer.layerInfo.dataSource.serviceLayerId).toBe('1.2');
1457-
expect(serviceLayer.layerInfo.dataSource.type).toBe('REST_DATA');
1458-
expect(serviceLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1459-
expect(serviceLayer.layerInfo.dataSource.dataSourceName).toBe('test:test_dataset');
1459+
expect(serviceLayer.dataSource.serviceLayerId).toBe('1.2');
1460+
expect(serviceLayer.dataSource.type).toBe('REST_DATA');
1461+
expect(serviceLayer.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1462+
expect(serviceLayer.dataSource.dataSourceName).toBe('test:test_dataset');
14601463
done();
14611464
});
14621465

@@ -1503,7 +1506,7 @@ describe('SourceListV3', () => {
15031506
{
15041507
msDatasetId: 'ms_test_dataset_123',
15051508
datasetId: 'test_dataset',
1506-
datasetName: 'test:test_dataset'
1509+
datasetName: 'test_dataset'
15071510
}
15081511
]
15091512
}
@@ -1522,10 +1525,10 @@ describe('SourceListV3', () => {
15221525
const layers = sourceListModel.getLayers();
15231526
const noServiceLayer = layers.find(layer => layer.id === 'no-service-layer');
15241527
expect(noServiceLayer).toBeTruthy();
1525-
expect(noServiceLayer.layerInfo.dataSource.serviceLayerId).toBeUndefined();
1526-
expect(noServiceLayer.layerInfo.dataSource.type).toBe('REST_DATA');
1527-
expect(noServiceLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1528-
expect(noServiceLayer.layerInfo.dataSource.dataSourceName).toBe('test:test_dataset');
1528+
expect(noServiceLayer.dataSource.serviceLayerId).toBeUndefined();
1529+
expect(noServiceLayer.dataSource.type).toBe('REST_DATA');
1530+
expect(noServiceLayer.dataSource.url).toBe('http://localhost:8090/iserver/services/data-test/rest/data');
1531+
expect(noServiceLayer.dataSource.dataSourceName).toBe('test:test_dataset');
15291532
done();
15301533
});
15311534

@@ -1573,7 +1576,7 @@ describe('SourceListV3', () => {
15731576
{
15741577
msDatasetId: 'ms_test_dataset_123',
15751578
datasetId: 'test_dataset',
1576-
datasetName: 'test:test_dataset'
1579+
datasetName: 'test_dataset'
15771580
}
15781581
]
15791582
}
@@ -1592,8 +1595,8 @@ describe('SourceListV3', () => {
15921595
const layers = sourceListModel.getLayers();
15931596
const emptyServiceLayer = layers.find(layer => layer.id === 'empty-service-layer');
15941597
expect(emptyServiceLayer).toBeTruthy();
1595-
expect(emptyServiceLayer.layerInfo.dataSource.serviceLayerId).toBe('');
1596-
expect(emptyServiceLayer.layerInfo.dataSource.type).toBe('REST_DATA');
1598+
expect(emptyServiceLayer.dataSource.serviceLayerId).toBe('');
1599+
expect(emptyServiceLayer.dataSource.type).toBe('REST_DATA');
15971600
done();
15981601
});
15991602

@@ -1634,6 +1637,7 @@ describe('SourceListV3', () => {
16341637
],
16351638
datas: []
16361639
};
1640+
map.addSource('rest-map-service-source', mapInfo.sources['rest-map-service-source']);
16371641
const sourceListModel = new SourceListModelV3({
16381642
map,
16391643
mapInfo,
@@ -1647,10 +1651,10 @@ describe('SourceListV3', () => {
16471651
const layers = sourceListModel.getLayers();
16481652
const restMapLayer = layers.find(layer => layer.id === 'rest-map-service-layer');
16491653
expect(restMapLayer).toBeTruthy();
1650-
expect(restMapLayer.layerInfo.dataSource.type).toBe('REST_MAP');
1651-
expect(restMapLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/iserver/services/map-test/rest/maps');
1652-
expect(restMapLayer.layerInfo.dataSource.mapName).toBe('test_map');
1653-
expect(restMapLayer.layerInfo.dataSource.serviceLayerId).toBe('2');
1654+
expect(restMapLayer.dataSource.type).toBe('REST_MAP');
1655+
expect(restMapLayer.dataSource.url).toBe('http://localhost:8090/iserver/services/map-test/rest/maps');
1656+
expect(restMapLayer.dataSource.mapName).toBe('test_map');
1657+
expect(restMapLayer.dataSource.serviceLayerId).toBe('2');
16541658
done();
16551659
});
16561660

@@ -1669,7 +1673,7 @@ describe('SourceListV3', () => {
16691673
sources: {
16701674
'restjsr-service-source': {
16711675
type: 'vector',
1672-
tiles: ['http://localhost:8090/restjsr/v1/maps/test_map/tiles/{z}/{x}/{y}.mvt']
1676+
tiles: ['http://localhost:8090/restjsr/v1/test_map/tiles/{z}/{x}/{y}.mvt']
16731677
}
16741678
},
16751679
layers: [
@@ -1691,6 +1695,7 @@ describe('SourceListV3', () => {
16911695
],
16921696
datas: []
16931697
};
1698+
map.addSource('restjsr-service-source', mapInfo.sources['restjsr-service-source']);
16941699
const sourceListModel = new SourceListModelV3({
16951700
map,
16961701
mapInfo,
@@ -1704,10 +1709,10 @@ describe('SourceListV3', () => {
17041709
const layers = sourceListModel.getLayers();
17051710
const restjsrLayer = layers.find(layer => layer.id === 'restjsr-service-layer');
17061711
expect(restjsrLayer).toBeTruthy();
1707-
expect(restjsrLayer.layerInfo.dataSource.type).toBe('RESTJSR');
1708-
expect(restjsrLayer.layerInfo.dataSource.url).toBe('http://localhost:8090/restjsr/v1/vectortile/maps');
1709-
expect(restjsrLayer.layerInfo.dataSource.mapName).toBe('test_map');
1710-
expect(restjsrLayer.layerInfo.dataSource.serviceLayerId).toBe('3');
1712+
expect(restjsrLayer.dataSource.type).toBe('RESTJSR');
1713+
expect(restjsrLayer.dataSource.url).toBe('http://localhost:8090/restjsr/v1/vectortile/maps');
1714+
expect(restjsrLayer.dataSource.mapName).toBe('test_map');
1715+
expect(restjsrLayer.dataSource.serviceLayerId).toBe('3');
17111716
done();
17121717
});
17131718

@@ -1748,6 +1753,7 @@ describe('SourceListV3', () => {
17481753
],
17491754
datas: []
17501755
};
1756+
map.addSource('other-service-source', mapInfo.sources['other-service-source']);
17511757
const sourceListModel = new SourceListModelV3({
17521758
map,
17531759
mapInfo,
@@ -1761,9 +1767,9 @@ describe('SourceListV3', () => {
17611767
const layers = sourceListModel.getLayers();
17621768
const otherLayer = layers.find(layer => layer.id === 'other-service-layer');
17631769
expect(otherLayer).toBeTruthy();
1764-
expect(otherLayer.layerInfo.dataSource.type).toBe('VECTOR_OTHER');
1765-
expect(otherLayer.layerInfo.dataSource.url).toBe('http://localhost:8080/tiles/{z}/{x}/{y}.mvt');
1766-
expect(otherLayer.layerInfo.dataSource.serviceLayerId).toBe('4');
1770+
expect(otherLayer.dataSource.type).toBe('VECTOR_OTHER');
1771+
expect(otherLayer.dataSource.url).toBe('http://localhost:8080/tiles/{z}/{x}/{y}.mvt');
1772+
expect(otherLayer.dataSource.serviceLayerId).toBe('4');
17671773
done();
17681774
});
17691775

@@ -1807,10 +1813,11 @@ describe('SourceListV3', () => {
18071813
getL7MarkerLayers: () => ({})
18081814
}
18091815
});
1810-
const layers = sourceListModel.getLayers();
1816+
const layers = sourceListModel.getLayers(false);
18111817
const chartLayer = layers.find(layer => layer.id === 'chart-layer');
18121818
expect(chartLayer).toBeTruthy();
1813-
expect(chartLayer.layerInfo.metadata.SM_Layer_Order).toBe('top');
1819+
expect(chartLayer.metadata).toBeTruthy();
1820+
expect(chartLayer.metadata.SM_Layer_Order).toBe('top');
18141821
done();
18151822
});
18161823

@@ -1910,6 +1917,8 @@ describe('SourceListV3', () => {
19101917
],
19111918
version: '3.0.0'
19121919
};
1920+
map.addSource('overlay-layer', mapInfo.sources['overlay-layer']);
1921+
map.addSource('base-layer', mapInfo.sources['base-layer']);
19131922
const sourceListModel = new SourceListModelV3({
19141923
map,
19151924
mapInfo,

0 commit comments

Comments
 (0)