Skip to content

Commit ec000c4

Browse files
chenmeiyiSupermapchenmeiyiSupermap
committed
修改VT测试html地址，并修改对应的测试案例；优化VT；补充leaflet地址匹配VT
1 parent ae94185 commit ec000c4

File tree

63 files changed

+395
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+395
-377
lines changed

‎examples-test/base/commonTools.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ var commonTools = ({
1616
console.log('invalid input : type or exampleName is not a string');
1717
return;
1818
}
19-
var baseDir = path.resolve(__dirname, '../../').replace(/\\/g, '/');
20-
var exampleUrl = baseDir + '/examples/' + type + '/' + exampleName + '.html';
19+
//var baseDir = path.resolve(__dirname, '../../').replace(/\\/g, '/');
20+
//var exampleUrl = baseDir + '/examples/' + type + '/' + exampleName + '.html';
21+
var basePath = 'http://192.168.169.249:8090/iserver/iClient/forJavaScript';
22+
var exampleUrl = basePath + '/examples/' + type + '/' + exampleName + '.html';
2123
browser.url(exampleUrl);
2224
browser.pause(2000);
23-
browser.expect.element('body').to.be.present.before(5000);
24-
browser.expect.element('#map').to.be.present.before(5000);
25+
browser.waitForElementPresent('body', 5000);
26+
browser.waitForElementPresent('#map', 5000);
2527
browser.pause(1000);
2628
},
2729

‎examples-test/leaflet/01_layerServiceIT.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +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(10000);
8+
browser.waitForElementPresent('.leaflet-popup-content', 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 () {
1414
browser.pause(1000);
15-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
15+
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
1616
});
1717
browser.pause(1000);
1818
browser.end();

‎examples-test/leaflet/01_mapQueryByBoundsIT.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ 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(10000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane canvas', 10000);
10+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
11+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
12+
browser.elements('class name', 'leaflet-marker-icon', function (result) {
13+
browser.assert.ok(result.value.length > 0, "expect Number of query result to be greater than 0, actual is " + result.value.length);
14+
});
15+
browser.pause(1000);
1016
browser.end();
1117
}
1218
};

‎examples-test/leaflet/01_mapQueryByDistanceIT.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@ 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(10000);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane canvas', 10000);
10+
browser.waitForElementPresent('.leaflet-popup-content',10000);
911
var popupContent = 'distance\ =\ 10';
1012
browser.expect.element('.leaflet-popup-content').text.to.equal(popupContent);
11-
browser.pause(1000);
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);
13+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
14+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
1415
browser.click('.leaflet-popup-close-button', function () {
15-
browser.pause(1000);
16-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
16+
browser.waitForElementNotPresent('.leaflet-popup-content',10000);
17+
});
18+
browser.elements('class name', 'leaflet-marker-icon', function (result) {
19+
browser.assert.ok(result.value.length > 0, "expect Number of query result to be greater than 0, actual is " + result.value.length);
1720
});
1821
browser.pause(1000);
1922
browser.end();

‎examples-test/leaflet/01_mapQueryByGeometryIT.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ 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(10000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane canvas', 10000);
10+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
11+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
12+
browser.elements('class name', 'leaflet-marker-icon', function (result) {
13+
browser.assert.ok(result.value.length > 0, "expect Number of query result to be greater than 0, actual is " + result.value.length);
14+
});
15+
browser.pause(1000);
1016
browser.end();
1117
}
1218
};

‎examples-test/leaflet/01_mapQueryBySQLIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@ 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(10000);
9-
browser.expect.element('.leaflet-pane.leaflet-marker-pane img').to.be.present.before(10000);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
10+
browser.elements('class name', 'leaflet-marker-icon', function (result) {
11+
browser.assert.ok(result.value.length > 0, "expect Number of query result to be greater than 0, actual is " + result.value.length);
12+
});
13+
browser.pause(1000);
1014
browser.end();
1115
}
1216
};

‎examples-test/leaflet/01_mapServiceIT.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +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(10000);
8+
browser.waitForElementPresent('.leaflet-popup-content', 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 () {
1414
browser.pause(1000);
15-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
15+
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
1616
});
1717
browser.pause(1000);
1818
browser.end();

‎examples-test/leaflet/01_measure_areaIT.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +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(10000);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane canvas', 10000);
10+
browser.waitForElementPresent('.leaflet-popup-content', 10000);
911
/*check the info showing in leaflet-popup is equal to our expectation*/
1012
var areaInfo = '面积：\ 3323393352194.927\ 平方米';
1113
browser.expect.element('.leaflet-popup-content').text.to.equal(areaInfo);
12-
browser.pause(1000);
13-
browser.click('.leaflet-popup-close-button', function () {
14-
browser.pause(1000);
15-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
16-
});
14+
15+
1716
browser.pause(1000);
1817
browser.end();
1918
}

‎examples-test/leaflet/01_measure_distanceIT.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +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(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);
8+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane', 10000);
9+
browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane canvas', 10000);
10+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
11+
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
12+
browser.waitForElementPresent('.leaflet-popup-content', 10000);
1113
/*check the info showing in leaflet-popup is equal to our expectation*/
1214
var distanceInfo = '距离：\ 2115093.3333095433\ 米';
1315
browser.expect.element('.leaflet-popup-content').text.to.equal(distanceInfo);
14-
browser.pause(1000);
1516
browser.click('.leaflet-popup-close-button', function () {
16-
browser.pause(1000);
17-
browser.expect.element('.leaflet-popup-content').to.not.be.present.before(10000);
17+
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
1818
});
1919
browser.pause(1000);
2020
browser.end();

‎examples-test/leaflet/01_tiledMapLayerProj4IT.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)