Skip to content

Commit c3467fa

Browse files
songyumengsongyumeng
committed
【ut】add UT
1 parent 6fa76dd commit c3467fa

File tree

3 files changed

+102
-77
lines changed

3 files changed

+102
-77
lines changed

‎test/openlayers/mapping/WebMap2Spec.js‎

Lines changed: 101 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -103,20 +103,18 @@ describe('openlayers_WebMap', () => {
103103
},
104104
coordUnit: 'DEGREE'
105105
};
106-
const dataSourceInfo ={
107-
datasourceNames: ['supermap1_pg'],
108-
childUriList: [
109-
'http://fack:8090/iserver/services/data_sichuan-3-/rest/data/datasources/name/supermap1_pg'
110-
],
111-
datasourceCount: 1
112-
}
113-
const datasetsInfo = {
114-
datasetCount: 1,
115-
datasetNames: ['dataGeoJson_2529638'],
116-
childUriList: [
117-
'http://fack:8090/iserver/services/data_sichuan-3-/rest/data/datasources/supermap1_pg/datasets/dataGeoJson_2529638'
118-
]
119-
}
106+
const dataSourceInfo = {
107+
datasourceNames: ['supermap1_pg'],
108+
childUriList: ['http://fack:8090/iserver/services/data_sichuan-3-/rest/data/datasources/name/supermap1_pg'],
109+
datasourceCount: 1
110+
};
111+
const datasetsInfo = {
112+
datasetCount: 1,
113+
datasetNames: ['dataGeoJson_2529638'],
114+
childUriList: [
115+
'http://fack:8090/iserver/services/data_sichuan-3-/rest/data/datasources/supermap1_pg/datasets/dataGeoJson_2529638'
116+
]
117+
};
120118
beforeAll(() => {
121119
Object.defineProperty(document, 'cookie', {
122120
get() {
@@ -410,18 +408,10 @@ describe('openlayers_WebMap', () => {
410408
return Promise.resolve(new Response(JSON.stringify(result1)));
411409
}
412410
if (url.indexOf('data_sichuan-7-/rest/data/datasources.json') > -1) {
413-
return Promise.resolve(
414-
new Response(
415-
JSON.stringify(dataSourceInfo)
416-
)
417-
);
411+
return Promise.resolve(new Response(JSON.stringify(dataSourceInfo)));
418412
}
419413
if (url.indexOf('data_sichuan-7-/rest/data/datasources/supermap1_pg/datasets') > -1) {
420-
return Promise.resolve(
421-
new Response(
422-
JSON.stringify(datasetsInfo)
423-
)
424-
);
414+
return Promise.resolve(new Response(JSON.stringify(datasetsInfo)));
425415
}
426416
return Promise.resolve(new Response(JSON.stringify({})));
427417
});
@@ -465,12 +455,12 @@ describe('openlayers_WebMap', () => {
465455
setTimeout(() => {
466456
expect(datavizWebmap.map.getLayers().getLength()).toBe(2);
467457
expect(datavizWebmap.layers[0].autoUpdateInterval).not.toBeNull();
468-
clearInterval(datavizWebmap.layers[0].autoUpdateInterval);
458+
clearInterval(datavizWebmap.layers[0].autoUpdateInterval);
469459
done();
470460
}, 30);
471-
472461
}
473462
});
463+
474464
it('webmap_relationRestMap', (done) => {
475465
let options = {
476466
server: server,
@@ -489,18 +479,10 @@ describe('openlayers_WebMap', () => {
489479
return Promise.resolve(new Response(JSON.stringify(result1)));
490480
}
491481
if (url.indexOf('data_sichuan-7-/rest/data/datasources.json') > -1) {
492-
return Promise.resolve(
493-
new Response(
494-
JSON.stringify(dataSourceInfo)
495-
)
496-
);
482+
return Promise.resolve(new Response(JSON.stringify(dataSourceInfo)));
497483
}
498484
if (url.indexOf('data_sichuan-7-/rest/data/datasources/supermap1_pg/datasets') > -1) {
499-
return Promise.resolve(
500-
new Response(
501-
JSON.stringify(datasetsInfo)
502-
)
503-
);
485+
return Promise.resolve(new Response(JSON.stringify(datasetsInfo)));
504486
}
505487
if (url.indexOf('/map_sichuan-7-/rest/maps.json') > -1) {
506488
return Promise.resolve(new Response(JSON.stringify(mapsInfo)));
@@ -513,12 +495,94 @@ describe('openlayers_WebMap', () => {
513495
var datavizWebmap = new WebMap(id, options);
514496

515497
async function successCallback() {
516-
setTimeout(() => {
498+
setTimeout(() => {
517499
expect(datavizWebmap.map.getLayers().getLength()).toBe(2);
518500
expect(datavizWebmap.layers[0].autoUpdateInterval).not.toBeNull();
519501
clearInterval(datavizWebmap.layers[0].autoUpdateInterval);
520502
done();
521503
}, 30);
522504
}
523505
});
506+
it('createLayer_migration', (done) => {
507+
let add = false;
508+
let elayer = null;
509+
class ol3Echarts extends obj {
510+
appendTo() {
511+
elayer = this;
512+
add = true;
513+
return true;
514+
}
515+
getChartOptions() {
516+
return {};
517+
}
518+
clear() {
519+
return true;
520+
}
521+
setChartOptions() {
522+
return true;
523+
}
524+
unset() {
525+
return true;
526+
}
527+
}
528+
window.ol3Echarts = ol3Echarts;
529+
let options = {
530+
server: server,
531+
successCallback,
532+
errorCallback: function () {}
533+
};
534+
spyOn(FetchRequest, 'get').and.callFake((url) => {
535+
if (url.indexOf('map.json') > -1) {
536+
var mapJson = migrationLayer;
537+
return Promise.resolve(new Response(mapJson));
538+
} else if (url.indexOf('1184572358') > -1) {
539+
return Promise.resolve(new Response(csvData_migration));
540+
}
541+
return Promise.resolve(new Response(JSON.stringify({})));
542+
});
543+
544+
var datavizWebmap = new WebMap(id, options);
545+
546+
function successCallback() {
547+
expect(datavizWebmap.server).toBe(server);
548+
expect(datavizWebmap.errorCallback).toBeDefined();
549+
expect(datavizWebmap.credentialKey).toBeUndefined();
550+
expect(datavizWebmap.credentialValue).toBeUndefined();
551+
expect(datavizWebmap.map.getLayers().getArray()[0].getProperties().name).toBe('中国暗色地图');
552+
expect(add).toBeTrue();
553+
expect(elayer).not.toBeNull();
554+
expect(elayer.type).toBe('ECHARTS');
555+
elayer.setVisible(false);
556+
elayer.setVisible(true);
557+
done();
558+
}
559+
});
560+
it('createLayer_mvt', (done) => {
561+
function successCallback() {
562+
const layerInfo = {
563+
url: 'https://fack:8090/iserver/services/map-mvt-test/rest/maps/test',
564+
projection: 'EPSG:3857',
565+
featureType: 'LINE' // REGION
566+
};
567+
const layer = datavizWebmap.addVectorTileLayer(layerInfo, 1, 'RESTDATA').then((layer) => {
568+
expect(layerInfo.layerID).not.toBeNull();
569+
debugger;
570+
done();
571+
});
572+
}
573+
let options = {
574+
server: server,
575+
successCallback,
576+
errorCallback: function () {}
577+
};
578+
spyOn(FetchRequest, 'get').and.callFake((url) => {
579+
if (url.indexOf('map.json') > -1) {
580+
var mapJson = datavizWebmap_ZXYTILE;
581+
return Promise.resolve(new Response(mapJson));
582+
}
583+
return Promise.resolve(new Response(JSON.stringify({})));
584+
});
585+
586+
var datavizWebmap = new WebMap(id, options);
587+
});
524588
});

‎test/openlayers/mapping/WebMapSpec.js‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,45 +2041,6 @@ describe('openlayers_WebMap', () => {
20412041
done();
20422042
}
20432043
});
2044-
it('createLayer_migration', (done) => {
2045-
let add = false;
2046-
class ol3Echarts extends obj {
2047-
appendTo() {
2048-
add = true;
2049-
return true;
2050-
}
2051-
}
2052-
window.ol3Echarts = ol3Echarts;
2053-
let options = {
2054-
server: server,
2055-
successCallback,
2056-
errorCallback: function () {}
2057-
};
2058-
spyOn(CommonUtil, 'isInTheSameDomain').and.callFake((url) => {
2059-
return true;
2060-
});
2061-
spyOn(FetchRequest, 'get').and.callFake((url) => {
2062-
if (url.indexOf('map.json') > -1) {
2063-
var mapJson = migrationLayer;
2064-
return Promise.resolve(new Response(mapJson));
2065-
} else if (url.indexOf('1184572358') > -1) {
2066-
return Promise.resolve(new Response(csvData_migration));
2067-
}
2068-
return Promise.resolve(new Response(JSON.stringify({})));
2069-
});
2070-
2071-
var datavizWebmap = new WebMap(id, options);
2072-
2073-
function successCallback() {
2074-
expect(datavizWebmap.server).toBe(server);
2075-
expect(datavizWebmap.errorCallback).toBeDefined();
2076-
expect(datavizWebmap.credentialKey).toBeUndefined();
2077-
expect(datavizWebmap.credentialValue).toBeUndefined();
2078-
expect(datavizWebmap.map.getLayers().getArray()[0].getProperties().name).toBe('中国暗色地图');
2079-
expect(add).toBeTrue();
2080-
done();
2081-
}
2082-
});
20832044

20842045
it('createBaseLayer-SUPERMAP_REST-token', (done) => {
20852046
spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {

‎test/resources/WebMapV5.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)