Skip to content

Commit c47b7ac

Browse files
优化VT
1 parent 7a8c823 commit c47b7ac

18 files changed

+56
-50
lines changed

examples-test/leaflet/01_layerServiceIT.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
var exampleName = '01_layerService';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check element exist*/
8-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
99
/*check the info showing in leaflet-popup is equal to our expectation*/
1010
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';
1111
browser.expect.element('.leaflet-popup-content').text.to.equal(layerInfo);
1212
browser.pause(1000);
1313
browser.click('.leaflet-popup-close-button', function () {
14-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
14+
browser.pause(1000);
15+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1516
});
1617
browser.pause(1000);
1718
browser.end();

examples-test/leaflet/01_mapQueryByBoundsIT.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
var exampleName = '01_mapQueryByBounds';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(3000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
1010
browser.end();
1111
}
1212
};

examples-test/leaflet/01_mapQueryByDistanceIT.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ module.exports = {
55
var exampleName = '01_mapQueryByDistance';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
99
var popupContent = 'distance\ =\ 10';
1010
browser.expect.element('.leaflet-popup-content').text.to.equal(popupContent);
1111
browser.pause(1000);
12-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(3000);
13-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(3000);
12+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
13+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
1414
browser.click('.leaflet-popup-close-button', function () {
15-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
15+
browser.pause(1000);
16+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1617
});
1718
browser.pause(1000);
1819
browser.end();

examples-test/leaflet/01_mapQueryByGeometryIT.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
var exampleName = '01_mapQueryByGeometry';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(3000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
1010
browser.end();
1111
}
1212
};

examples-test/leaflet/01_mapQueryBySQLIT.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ module.exports = {
55
var exampleName = '01_mapQueryBySQL';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(3000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
1010
browser.end();
1111
}
1212
};

examples-test/leaflet/01_mapServiceIT.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
var exampleName = '01_mapService';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check element exist*/
8-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
99
/*check the info showing in leaflet-popup is equal to our expectation*/
1010
var mapInfo = '(map信息太多,只打印一部分)\n\n地图名:"World"\n中心点:{ "x": 0, "y": 0 }\nBounds:{\ "top":\ 90,\ "left":\ -180,\ "bottom":\ -90,\ "leftBottom":\ {\ "x":\ -180,\ "y":\ -90\ },\ "right":\ 180,\ "rightTop":\ {\ "x":\ 180,\ "y":\ 90\ }\ }';
1111
browser.expect.element('.leaflet-popup-content').text.to.equal(mapInfo);
1212
browser.pause(1000);
1313
browser.click('.leaflet-popup-close-button', function () {
14-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
14+
browser.pause(1000);
15+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1516
});
1617
browser.pause(1000);
1718
browser.end();

examples-test/leaflet/01_measure_areaIT.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
var exampleName = '01_measure_area';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check element exist*/
8-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
99
/*check the info showing in leaflet-popup is equal to our expectation*/
1010
var areaInfo = '面积:\ 3323393352194.927\ 平方米';
1111
browser.expect.element('.leaflet-popup-content').text.to.equal(areaInfo);
1212
browser.pause(1000);
1313
browser.click('.leaflet-popup-close-button', function () {
14-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
14+
browser.pause(1000);
15+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1516
});
1617
browser.pause(1000);
1718
browser.end();

examples-test/leaflet/01_measure_distanceIT.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ module.exports = {
55
var exampleName = '01_measure_distance';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check elements exist*/
8-
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(3000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(3000);
10-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-pane.leaflet-marker-pane').to.be.present.before(10000);
9+
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
10+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
1111
/*check the info showing in leaflet-popup is equal to our expectation*/
1212
var distanceInfo = '距离:\ 2115093.3333095433\ 米';
1313
browser.expect.element('.leaflet-popup-content').text.to.equal(distanceInfo);
1414
browser.pause(1000);
1515
browser.click('.leaflet-popup-close-button', function () {
16-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
16+
browser.pause(1000);
17+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1718
});
1819
browser.pause(1000);
1920
browser.end();

examples-test/leaflet/02_fieldStatisticsIT.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ module.exports = {
55
var exampleName = '02_fieldStatistics';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check element exist*/
8-
browser.expect.element('.resultInfo.leaflet-control').to.be.present.before(3000);
9-
browser.expect.element('#trafficRes').to.be.present.before(3000);
10-
browser.expect.element('.table.table-bordered tbody tr td').to.be.present.before(3000);
8+
browser.expect.element('.resultInfo.leaflet-control').to.be.present.before(10000);
9+
browser.expect.element('#trafficRes').to.be.present.before(10000);
10+
browser.expect.element('.table.table-bordered tbody tr td').to.be.present.before(10000);
1111
browser.pause(1000);
1212
browser.end();
1313
}

examples-test/leaflet/02_fieldsServiceIT.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module.exports = {
55
var exampleName = '02_fieldsService';
66
commonTools.openExampleAndLoadMap(browser, type, exampleName);
77
/*check element exist*/
8-
browser.expect.element('.leaflet-popup-content').to.be.present.before(3000);
8+
browser.expect.element('.leaflet-popup-content').to.be.present.before(10000);
99
/*check the info showing in leaflet-popup is equal to our expectation*/
1010
var fieldsInfo = 'SmID,\ SmSdriW,\ SmSdriN,\ SmSdriE,\ SmSdriS,\ SmUserID,\ SmGeometrySize';
1111
browser.expect.element('.leaflet-popup-content').text.to.equal(fieldsInfo);
1212
browser.pause(1000);
1313
browser.click('.leaflet-popup-close-button', function () {
14-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(2000);
14+
browser.pause(1000);
15+
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
1516
});
1617
browser.pause(1000);
1718
browser.end();

0 commit comments

Comments
 (0)