Skip to content

Commit d93b2c2

Browse files
bianxiabianxia
committed
【update】修复vt review by yangmy
1 parent 4c7a930 commit d93b2c2

File tree

3 files changed

+55
-45
lines changed

3 files changed

+55
-45
lines changed

‎examples-test/leaflet/01_layerServiceIT.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3-
'leaflet_01_layerService': function (browser) {
4-
var type = 'leaflet';
5-
var exampleName = '01_layerService';
6-
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7-
/*check element exist*/
8-
browser.waitForElementPresent('.leaflet-popup-content', 10000);
9-
/*check the info showing in leaflet-popup is equal to our expectation*/
10-
var layerInfo = 'continent_T@World\nOcean_Label_1@World\nCapitals@World#3\nCapitals@World#2\nCapitals@World#1\nCountries@World#1\nChina_Boundary_nanhai@World\nChina_Boundary_1@World\nCountry_Label@World\nRivers@World\nChina_island_part@World\nLakes@World\nCountries@World#2\nCountries@World\nOceanL@World\ngl_latlong_1km_landcover@World';
11-
browser.expect.element('.leaflet-popup-content').text.to.equal(layerInfo);
12-
browser.pause(1000);
13-
browser.click('.leaflet-popup-close-button', function () {
14-
browser.pause(1000);
15-
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
16-
});
17-
//测试版权点击的正确性
18-
//commonTools.verifyCopyrightOfLeaflet(browser);
19-
browser.pause(1000);
20-
browser.end();
21-
}
3+
'leaflet_01_layerService': function (browser) {
4+
var type = 'leaflet';
5+
var exampleName = '01_layerService';
6+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
7+
/*check element exist*/
8+
browser.waitForElementPresent('.leaflet-popup-content', 10000);
9+
/*check the info showing in leaflet-popup is equal to our expectation*/
10+
var layerInfo = 'continent_T@World\nOcean_Label_1@World\nCapitals@World#3\nCapitals@World#2\nCapitals@World#1\nCountries@World\nChina_Boundary_nanhai@World\nChina_Boundary_1@World\nCountry_Label@World\nRivers@World\nChina_island_part@World\nLakes@World\nCountries@World#1\nCountries@World#2\nOceanL@World\ngl_latlong_1km_landcover@World';
11+
browser.expect.element('.leaflet-popup-content').text.to.equal(layerInfo);
12+
browser.pause(1000);
13+
browser.click('.leaflet-popup-close-button', function () {
14+
browser.pause(1000);
15+
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
16+
});
17+
//测试版权点击的正确性
18+
//commonTools.verifyCopyrightOfLeaflet(browser);
19+
browser.pause(1000);
20+
browser.end();
21+
}
2222
};

‎examples-test/leaflet/04_densityKernelAnalystServiceIT.js

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,41 @@
11
var commonTools = require('../base/commonTools');
22
var request = require('request');
33
require('../base/ExampleTestGlobeParameter');
4-
4+
// 核密度分析
55
module.exports = {
6-
'leaflet_04_densityKernelAnalystService': function (browser) {
7-
var type = 'leaflet';
8-
var exampleName = '04_densityKernelAnalystService';
9-
commonTools.openExampleAndLoadMap(browser, type, exampleName);
10-
/*check elements exist*/
11-
browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
12-
browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
13-
browser.waitForElementPresent('.leaflet-layer', 10000);
14-
browser.pause(10000);
15-
browser.elements('css selector', '.leaflet-layer', function (result) {
16-
browser.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
17-
});
18-
browser.elements('css selector', '.leaflet-tile-container', function (result) {
19-
browser.assert.equal(result.value.length, 2, "expect Number of leaflet-tile-container to be 2, actual is " + result.value.length);
20-
});
21-
//测试版权点击的正确性
22-
//commonTools.verifyCopyrightOfLeaflet(browser);
6+
'@disabled': true,
7+
leaflet_04_densityKernelAnalystService: function (browser) {
8+
var type = 'leaflet';
9+
var exampleName = '04_densityKernelAnalystService';
10+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
11+
/*check elements exist*/
12+
browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
13+
browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
14+
browser.waitForElementPresent('.leaflet-layer', 10000);
15+
// browser.pause(10000);
16+
browser.waitForElementPresent('.leaflet-layer:nth-child(2)', 10000);
17+
browser.elements('css selector', '.leaflet-layer', function (result) {
18+
browser.assert.equal(
19+
result.value.length,
20+
2,
21+
'expect Number of leaflet-layer to be 2, actual is ' + result.value.length
22+
);
23+
});
24+
browser.elements('css selector', '.leaflet-tile-container', function (result) {
25+
browser.assert.equal(
26+
result.value.length,
27+
2,
28+
'expect Number of leaflet-tile-container to be 2, actual is ' + result.value.length
29+
);
30+
});
31+
//测试版权点击的正确性
32+
//commonTools.verifyCopyrightOfLeaflet(browser);
2333

24-
//删除测试中产生的数据集
25-
browser.pause(1000, function () {
26-
var exampleTestResult = "KernelDensity_Result";
27-
request.delete(GlobeParameter.datachangchunURL + exampleTestResult);
28-
});
29-
browser.end();
30-
}
34+
//删除测试中产生的数据集
35+
browser.pause(1000, function () {
36+
var exampleTestResult = 'KernelDensity_Result';
37+
request.delete(GlobeParameter.datachangchunURL + exampleTestResult);
38+
});
39+
browser.end();
40+
}
3141
};

‎examples-test/openlayers/01_layerServiceIT.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = {
55
var exampleName = '01_layerService';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
browser.waitForElementPresent('#popup-content',10000);
8-
var layerInfo = 'continent_T@World\nOcean_Label_1@World\nCapitals@World#3\nCapitals@World#2\nCapitals@World#1\nCountries@World#1\nChina_Boundary_nanhai@World\nChina_Boundary_1@World\nCountry_Label@World\nRivers@World\nChina_island_part@World\nLakes@World\nCountries@World#2\nCountries@World\nOceanL@World\ngl_latlong_1km_landcover@World';
8+
var layerInfo = 'continent_T@World\nOcean_Label_1@World\nCapitals@World#3\nCapitals@World#2\nCapitals@World#1\nCountries@World\nChina_Boundary_nanhai@World\nChina_Boundary_1@World\nCountry_Label@World\nRivers@World\nChina_island_part@World\nLakes@World\nCountries@World#1\nCountries@World#2\nOceanL@World\ngl_latlong_1km_landcover@World';
99
browser.expect.element('#popup-content').text.to.equal(layerInfo);
1010
browser.pause(1000);
1111
browser.end();

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy