[fix]维护vt review by qw

Author: jinnanyang

examples-test/leaflet/01_layersLegend.js

@@ -8,21 +8,12 @@ module.exports = {
     var type = 'leaflet';
     var exampleName = '01_layersLegend';
     commonTools.openExampleAndLoadMap(browser, type, exampleName);
-    /*check element exist*/
-    // browser.waitForElementPresent('.leaflet-popup-content', 10000);
-    /*check the info showing in leaflet-popup is equal to our expectation*/
-    browser.elements('css selector', '.panel.panel-primary', function (result) {
-      console.log('----Hope number of panel to be 2, actual is ' + result.value.length);
-    });
+    browser.expect.elements('.panel.panel-primary').count.to.equal(2).before(5000);
     browser.waitForElementVisible('#mapLegend>div');
+    browser.waitForElementVisible('#layersList label');
     browser.expect.elements('#layersList label').count.to.equal(9);
-    browser.click('.panel.panel-primary #layersList input');
-    browser.click('.btn.btn-default');
-    browser.waitForElementVisible('#mapLegend>div');
-    browser.pause(1000);
-    browser.expect.elements('#mapLegend>div').count.to.equal(4);
-    browser.expect.element('#mapLegend div:nth-child(1)').text.to.equal('CoordsysLabel@Jingjin');
-    browser.expect.element('#mapLegend div:nth-child(3)').text.to.equal('Landuse_R@Jingjin#1');
+    browser.expect.elements('#mapLegend>div').count.to.equal(2);
+    browser.expect.element('#mapLegend div:nth-child(1)').text.to.equal('Landuse_R@Jingjin#1');
     browser.expect
       .elements(
         'img[src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAAa0lEQVR4XmNgoAWYsXz3f0IYXQ9WAFOMC4DkInMbwBhdLwogxiAYwGsY3QyCeQsZo5sBBtgMErETgWN0QLRB6JrR+UQbhA4oNohir8EANkNAgGSDcAGSDaKai6hmEC5AP4PQswE+jG4GxQAAXHqikucMHGcAAAAASUVORK5CYII="]'

examples-test/leaflet/03_themeRangeIT.js

@@ -1,35 +1,44 @@
 var commonTools = require('../base/commonTools');
 module.exports = {
-    after: function (browser) {
-        console.log('Closing down...');
-        browser.end();
-    },
-    'leaflet_03_themeRange': function (browser) {
-        var type = 'leaflet';
-        var exampleName = '03_themeRange';
-        commonTools.openExampleAndLoadMap(browser, type, exampleName);
-        /*check elements exist*/
-        browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
-        browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
-        browser.waitForElementPresent('.leaflet-layer', 10000)
-        browser.elements('css selector', '.leaflet-layer', function (result) {
-            console.log('----Hope number of leaflet-layer to be 2, actual is '+ result.value.length)
-        })
-        browser.elements('css selector', '.leaflet-tile-container', function (result) {
-            console.log('----Hope number of leaflet-tile-container to be 2, actual is '+ result.value.length)
-        })
-        browser.expect.element('.leaflet-layer:nth-child(2)').to.be.visible.before(10000);
-        browser.expect.element('.leaflet-pane .leaflet-layer:nth-child(2) .leaflet-tile-container').to.be.visible.before(10000);
-        // browser.pause(10000);
-        // browser.elements('css selector', '.leaflet-layer', function (result) {
-        //     this.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
-        // });
-        // browser.elements('css selector', '.leaflet-tile-container', function (result) {
-        //     this.assert.equal(result.value.length, 2, "expect Number of leaflet-tile-container to be 2, actual is " + result.value.length);
-        // });
-        //测试版权点击的正确性
-        //commonTools.verifyCopyrightOfLeaflet(browser);
-        // browser.pause(1000);
-        // browser.end();
+  after: function (browser) {
+    console.log('Closing down...');
+    browser.end();
+  },
+  leaflet_03_themeRange: async function (browser) {
+    var type = 'leaflet';
+    var exampleName = '03_themeRange';
+    commonTools.openExampleAndLoadMap(browser, type, exampleName);
+    /*check elements exist*/
+    browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
+    browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
+    browser.waitForElementPresent('.leaflet-layer', 10000);
+    browser.pause(1000);
+    var result = await browser.elements('css selector', '.leaflet-layer');
+    console.log('----Hope number of leaflet-layer to be 2, actual is', result.length);
+    for (i = 0; i < 2; i++) {
+      if (result.length > 1) {
+        break;
+      } else {
+        console.log('refresh:', i);
+        browser.refresh();
+        browser.waitForElementPresent('body', 5000);
+        browser.waitForElementPresent('#map', 5000);
+        browser.waitForElementPresent('.leaflet-layer', 10000);
+        browser.pause(10000);
+        var result = await browser.elements('css selector', '.leaflet-layer');
+        console.log('----Hope number of leaflet-layer to be 2, actual is', result.length);
+      }
     }
+    browser.elements('css selector', '.leaflet-tile-container', function (result) {
+      console.log('----Hope number of leaflet-tile-container to be 2, actual is ' + result.value.length);
+    });
+    browser.expect.element('.leaflet-layer:nth-child(2)').to.be.visible.before(10000);
+    browser.expect
+      .element('.leaflet-pane .leaflet-layer:nth-child(2) .leaflet-tile-container')
+      .to.be.visible.before(10000);
+    //测试版权点击的正确性
+    //commonTools.verifyCopyrightOfLeaflet(browser);
+    // browser.pause(1000);
+    // browser.end();
+  }
 };