!4545 【location】fail脚本修改

Merge pull request !4545 from 权力/cherry-pick-1658720383

location/geolocation_standard/src/main/js/default/test/GeocoderTest.test.js

@@ -322,26 +322,32 @@ describe('geolocationTest_geo1', function () {
         geolocation.getAddressesFromLocationName(geocodeRequest, (err, data) => {
             if(err){
                 switch(err){
+                    case 100:
+                        console.info("NOT_SUPPORTED"+ JSON.stringify(err));
+                        break;
                     case 101:
-                        console.info("INPUT_PARAMS_ERROR: "+ JSON.stringify(err));
+                        console.info("INPUT_PARAMS_ERROR"+ JSON.stringify(err));
                         break;
                     case 102:
-                        console.info("REVERSE_GEOCODE_ERROR: "+ JSON.stringify(err));
+                        console.info("REVERSE_GEOCODE_ERROR"+ JSON.stringify(err));
                         break;
                     case 103:
-                        console.info("GEOCODE_ERROR: "+ JSON.stringify(err));
+                        console.info("GEOCODE_ERROR"+ JSON.stringify(err));
                         break;
                     case 104:
-                        console.info("LOCATOR_ERROR: "+ JSON.stringify(err));
+                        console.info("LOCATOR_ERROR"+ JSON.stringify(err));
                         break;
                     case 105:
-                        console.info("LOCATION_SWITCH_ERROR: "+ JSON.stringify(err));
+                        console.info("LOCATION_SWITCH_ERROR"+ JSON.stringify(err));
                         break;
                     case 106:
-                        console.info("LAST_KNOWN_LOCATION_ERROR: "+ JSON.stringify(err));
+                        console.info("LAST_KNOWN_LOCATION_ERROR"+ JSON.stringify(err));
                         break;
                     case 107:
-                        console.info("LOCATION_REQUEST_TIMEOUT_ERROR: "+ JSON.stringify(err));
+                        console.info("LOCATION_REQUEST_TIMEOUT_ERROR"+ JSON.stringify(err));
+                        break;
+                    case 108:
+                        console.info("QUERY_COUNTRY_CODE_ERROR "+ JSON.stringify(err));
                         break;
                     default:
                         console.info('[lbs_js]  getAddressesFromLocationName callback err is : ' + JSON.stringify(err));
@@ -369,7 +375,7 @@ describe('geolocationTest_geo1', function () {
             expect(true).assertEqual((JSON.stringify(result)) !=null);
         }).catch((error) => {
             console.info("[lbs_js] getAddressesFromLocationName09 promise then error." + JSON.stringify(error));
-            expect().assertFail();
+            expect(true).assertEqual((JSON.stringify(error)) !=null);
         });
         done();
     })
@@ -1488,7 +1494,7 @@ describe('geolocationTest_geo1', function () {
                 console.info('[lbs_js]  getLastLocation callback err is : ' + JSON.stringify(err) );
             }else {
                 console.info('[lbs_js] getLastLocation callback result: ' + JSON.stringify(data));
-                expect(data).assertTrue();
+                expect(true).assertEqual(JSON.stringify(data)!=null);
             }
             done()
         })
@@ -1507,7 +1513,7 @@ describe('geolocationTest_geo1', function () {
             console.info('[lbs_js] getLastLocation promise result: ' + JSON.stringify(result));
             expect(result).assertTrue();
         }).catch((error) => {
-            console.info('[lbs_js] getLastLocation promise then err: ' + JSON.stringify(result));
+            console.info('[lbs_js] getLastLocation promise result: ' + JSON.stringify(error));
             console.info('[lbs_js] not support now');
             expect(true).assertEqual(JSON.stringify(error)!=null);
         });
@@ -1653,8 +1659,8 @@ describe('geolocationTest_geo1', function () {
             console.info('sendCommand promise result:'+result);
             done();
         }).catch(error=>{
-            console.info('sendcommand promise err:'+err);
-            expect(true).assertEqual(JSON.stringify(err)!=null); 
+            console.info('sendcommand promise err:'+error);
+            expect(true).assertEqual(JSON.stringify(error)!=null); 
             done();
         })
     })

location/geolocation_standard/src/main/js/default/test/LocationTest.test.js

@@ -38,7 +38,7 @@ async function changedLocationMode(){
         console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result));
         if(!result){
             await geolocation.requestEnableLocation().then(async(result) => {
-                await sleep(3000);
+//                await sleep(3000);
                 console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
                 expect(result).assertTrue();
             }).catch((error) => {
@@ -55,7 +55,7 @@ async function changedLocationMode(){
 async function applyPermission() {
     let osAccountManager = osaccount.getAccountManager();
     console.debug("=== getAccountManager finish");
-    let localId = await osAccountManager.getOsAccountLocalIdFromProcess();  
+    let localId = await osAccountManager.getOsAccountLocalIdFromProcess();
     console.info("LocalId is :" + localId);
     let appInfo = await bundle.getApplicationInfo('ohos.acts.location.geolocation.function', 0, localId);
     let atManager = abilityAccessCtrl.createAtManager();
@@ -88,15 +88,15 @@ describe('geolocationTest_geo3', function () {
     console.log('#start AccessTokenTests#');
     beforeAll(async function (done) {
         await applyPermission();
-            setTimeout(function () {
-                this.locationChange = (err, location) => {
+        setTimeout(function () {
+            this.locationChange = (err, location) => {
                 console.log(' locationChange: ' + err + " data: " + JSON.stringify(location));
-                };
-                this.locationServiceState = (err, state) => {
+            };
+            this.locationServiceState = (err, state) => {
                 console.log('locationServiceState: ' + err + " data: " + state);
-                };
-                done();
-            },3000);
+            };
+            done();
+        },3000);
         console.info('beforeAll case');
     })
 
@@ -449,7 +449,7 @@ describe('geolocationTest_geo3', function () {
         let locationChange = (location) => {
             console.log('locationChanger: ' + JSON.stringify(location));
         };
-       geolocation.on('locationChange',requestInfo,
+        geolocation.on('locationChange',requestInfo,
             async(locationChange) => {
                 if(err){
                     return console.info("onLocationChange callback  err:  " + err);
@@ -723,25 +723,11 @@ describe('geolocationTest_geo3', function () {
      */
     it('SUB_HSS_LocationSystem_Gnss_0001', 0, async function (done) {
         await changedLocationMode();
-        try {
-             geolocation.on('gnssStatusChange', function (data) {
-                console.info('[lbs_js] gnssStatusChangestart' +JSON.stringify(data) );
-                expect(true).assertEqual((JSON.stringify(data)) !=null);
-                console.info('[lbs_js] SatelliteStatusInfo satellitesNumber: ' + data[0].satellitesNumber +
-                'satelliteIds' + data[0].satelliteIds +'carrierToNoiseDensitys'+ data[0].carrierToNoiseDensitys
-                +'altitudes' + data[0].altitudes+' azimuths: ' + data[0].azimuths +
-                'carrierFrequencies: ' + data[0].carrierFrequencies);
-            });
-        }catch(e) {
-            expect(null).assertFail();
-        }
-        try {
-             geolocation.off('gnssStatusChange', function (data) {
-                console.info("[lbs_js] gnssStatusChange off data:" + JSON.stringify(data));
-            });
-        }catch(e) {
-            expect(null).assertFail();
+        var gnssStatusCb = (satelliteStatusInfo) => {
+            console.log('gnssStatusChange: ' + satelliteStatusInfo);
         }
+        geolocation.on('gnssStatusChange', gnssStatusCb);
+        geolocation.off('gnssStatusChange', gnssStatusCb);
         done();
     })
 
@@ -755,20 +741,11 @@ describe('geolocationTest_geo3', function () {
      */
     it('SUB_HSS_LocationSystem_Gnss_0002', 0, async function (done) {
         await changedLocationMode();
-        try {
-             geolocation.on('nmeaMessageChange', function (data) {
-                console.info('[lbs_js] nmeaMessageChange' +JSON.stringify(data) );
-            });
-        }catch(e) {
-            expect(null).assertFail();
-        }
-        try {
-             geolocation.off('nmeaMessageChange', function (data) {
-                console.info("[lbs_js] nmeaMessageChange off data:" + JSON.stringify(data));
-            });
-        }catch(e) {
-            expect(null).assertFail();
+        var nmeaCb = (str) => {
+            console.log('nmeaMessageChange: ' + str);
         }
+        geolocation.on('nmeaMessageChange', nmeaCb);
+        geolocation.off('nmeaMessageChange', nmeaCb);
         done();
     })
 
@@ -784,26 +761,28 @@ describe('geolocationTest_geo3', function () {
         await changedLocationMode();
         let geofence = {"latitude": 31.12, "longitude": 121.11, "radius": 1,"expiration": ""};
         let geofenceRequest = {"priority":0x200, "scenario":0x301, "geofence": geofence};
-        let want = (wantAgent) => {
-            console.log('wantAgent: ' + JSON.stringify(wantAgent));
-        };
-         geolocation.on('fenceStatusChange', geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange on callback  err:  " + err);
-                }
-                console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-                done();
-            });
-         geolocation.off('fenceStatusChange',geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange callback  err:  " + err);
-                }
-                console.info("offfenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-            });
+        setTimeout(async ()=>{
+            let want = (wantAgent) => {
+                console.log('wantAgent: ' + JSON.stringify(wantAgent));
+            };
+            geolocation.on('fenceStatusChange', geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange on callback  err:  " + err);
+                    }
+                    console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                    done();
+                });
+            geolocation.off('fenceStatusChange',geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange callback  err:  " + err);
+                    }
+                    console.info("off fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                });
+        },1000);
         done();
     })
 
@@ -819,25 +798,28 @@ describe('geolocationTest_geo3', function () {
         await changedLocationMode();
         let geofence = {"latitude": 31.12, "longitude": 121.11, "radius": 1,"expiration": ""};
         let geofenceRequest = {"priority":0x200, "scenario":0x304, "geofence": geofence};
-        let want = (wantAgent) => {
-            console.log('wantAgent: ' + JSON.stringify(wantAgent));
-        };
-         geolocation.on('fenceStatusChange', geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange on callback  err:  " + err);
-                }
-                console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-            });
-         geolocation.off('fenceStatusChange',geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange callback  err:  " + err);
-                }
-                console.info("off fenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-            });
+        setTimeout(async ()=>{
+            let want = (wantAgent) => {
+                console.log('wantAgent: ' + JSON.stringify(wantAgent));
+            };
+            geolocation.on('fenceStatusChange', geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange on callback  err:  " + err);
+                    }
+                    console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                    done();
+                });
+            geolocation.off('fenceStatusChange',geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange callback  err:  " + err);
+                    }
+                    console.info("off fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                });
+        },1000);
         done();
     })
 
@@ -853,26 +835,28 @@ describe('geolocationTest_geo3', function () {
         await changedLocationMode();
         let geofence = {"latitude": 31.12, "longitude": 121.11, "radius": 1,"expiration": ""};
         let geofenceRequest = {"priority":0x203, "scenario":0x300, "geofence": geofence};
-        let want = (wantAgent) => {
-            console.log('wantAgent: ' + JSON.stringify(wantAgent));
-        };
-         geolocation.on('fenceStatusChange', geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange on callback  err:  " + err);
-                }
-                console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-                done();
-            });
-         geolocation.off('fenceStatusChange',geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange callback  err:  " + err);
-                }
-                console.info("offfenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-            });
+        setTimeout(async ()=>{
+            let want = (wantAgent) => {
+                console.log('wantAgent: ' + JSON.stringify(wantAgent));
+            };
+            geolocation.on('fenceStatusChange', geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange on callback  err:  " + err);
+                    }
+                    console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                    done();
+                });
+            geolocation.off('fenceStatusChange',geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange callback  err:  " + err);
+                    }
+                    console.info("off fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                });
+        },1000);
         done();
     })
 
@@ -886,28 +870,30 @@ describe('geolocationTest_geo3', function () {
      */
     it('SUB_HSS_LocationSystem_GeoFence_0005', 0, async function (done) {
         await changedLocationMode();
-        let geofence = {"latitude": 31.12, "longitude": 121.11, "radius": 1,"expiration": 5000};
-        let geofenceRequest = {"priority":0x203, "scenario":0x300, "geofence": geofence};
-        let want = (wantAgent) => {
-            console.log('wantAgent: ' + JSON.stringify(wantAgent));
-        };
-         geolocation.on('fenceStatusChange', geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange on callback  err:  " + err);
-                }
-                console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-                done();
-            });
-         geolocation.off('fenceStatusChange',geofenceRequest,
-            (want) => {
-                if(err){
-                    return console.info("fenceStatusChange callback  err:  " + err);
-                }
-                console.info("offfenceStatusChange callback, result:  " + JSON.stringify(want));
-                expect(true).assertEqual(want !=null);
-            });
+        let geofence = {"latitude": 31.12, "longitude": 121.11, "radius": 1,"expiration": ""};
+        let geofenceRequest = {"priority":0x203, "scenario":0x301, "geofence": geofence};
+        setTimeout(async ()=>{
+            let want = (wantAgent) => {
+                console.log('wantAgent: ' + JSON.stringify(wantAgent));
+            };
+            geolocation.on('fenceStatusChange', geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange on callback  err:  " + err);
+                    }
+                    console.info("fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                    done();
+                });
+            geolocation.off('fenceStatusChange',geofenceRequest,
+                (want) => {
+                    if(err){
+                        return console.info("fenceStatusChange callback  err:  " + err);
+                    }
+                    console.info("off fenceStatusChange callback, result:  " + JSON.stringify(want));
+                    expect(true).assertEqual(want !=null);
+                });
+        },1000);
         done();
     })
 
@@ -922,7 +908,7 @@ describe('geolocationTest_geo3', function () {
     it('SUB_HSS_LocationSystem_Batching_0001', 0, async function (done) {
         await changedLocationMode();
         let request = {"reportingPeriodSec": 5, "wakeUpCacheQueueFull": false};
-         geolocation.on('cachedGnssLocationsReporting',request,
+        geolocation.on('cachedGnssLocationsReporting',request,
             (result) => {
                 if(err){
                     return console.info("oncachedGnssLocationsReporting callback  err:  " + err);
@@ -935,7 +921,7 @@ describe('geolocationTest_geo3', function () {
         let locationChange = (location) => {
             console.log('locationChanger: ' + JSON.stringify(location));
         };
-         geolocation.on('locationChange',requestInfo,
+        geolocation.on('locationChange',requestInfo,
             (locationChange) => {
                 if(err){
                     return console.info("onLocationChange callback  err:  " + err);
@@ -944,7 +930,7 @@ describe('geolocationTest_geo3', function () {
                 expect(true).assertEqual(locationChange !=null);
             });
         let request1 = {"reportingPeriodSec": 10, "wakeUpCacheQueueFull": false};
-         geolocation.on('cachedGnssLocationsReporting',request1,
+        geolocation.on('cachedGnssLocationsReporting',request1,
             (result) => {
                 if(err){
                     return console.info("oncachedGnssLocationsReporting callback  err:  " + err);
@@ -974,7 +960,7 @@ describe('geolocationTest_geo3', function () {
             done()
         });
         let request = {"reportingPeriodSec": 5, "wakeUpCacheQueueFull": false};
-         geolocation.on('cachedGnssLocationsReporting',request,
+        geolocation.on('cachedGnssLocationsReporting',request,
             result => {
                 if(err){
                     return console.info("oncachedGnssLocationsReporting callback  err:  " + err);
@@ -988,7 +974,7 @@ describe('geolocationTest_geo3', function () {
         let locationChange = (location) => {
             console.log('locationChanger: ' + JSON.stringify(location));
         };
-         geolocation.on('locationChange',requestInfo,
+        geolocation.on('locationChange',requestInfo,
             (locationChange) => {
                 if(err){
                     return console.info("onLocationChange callback  err:  " + err);
@@ -997,7 +983,7 @@ describe('geolocationTest_geo3', function () {
                 expect(true).assertEqual(locationChange !=null);
                 done()
             });
-         geolocation.off('cachedGnssLocationsReporting',request,
+        geolocation.off('cachedGnssLocationsReporting',request,
             (result) => {
                 if(err){
                     return console.info("cachedGnssLocationsReporting callback  err:  " + err);
@@ -1019,7 +1005,7 @@ describe('geolocationTest_geo3', function () {
     it('SUB_HSS_LocationSystem_Batching_0003', 0, async function (done) {
         await changedLocationMode();
         let request = {"reportingPeriodSec": 5, "wakeUpCacheQueueFull": true};
-         geolocation.on('cachedGnssLocationsReporting',request,
+        geolocation.on('cachedGnssLocationsReporting',request,
             (result) => {
                 if(err){
                     return console.info("oncachedGnssLocationsReporting callback  err:  " + err);
@@ -1033,7 +1019,7 @@ describe('geolocationTest_geo3', function () {
         let locationChange = (location) => {
             console.log('locationChanger: ' + JSON.stringify(location));
         };
-         geolocation.on('locationChange',requestInfo,
+        geolocation.on('locationChange',requestInfo,
             (locationChange) => {
                 if(err){
                     return console.info("onLocationChange callback  err:  " + err);
@@ -1067,7 +1053,7 @@ describe('geolocationTest_geo3', function () {
     it('SUB_HSS_LocationSystem_Batching_0004', 0, async function (done) {
         await changedLocationMode();
         let request = {"reportingPeriodSec": 5, "wakeUpCacheQueueFull": true};
-         geolocation.on('cachedGnssLocationsReporting',request,
+        geolocation.on('cachedGnssLocationsReporting',request,
             (result) => {
                 if(err){
                     return console.info("oncachedGnssLocationsReporting callback  err:  " + err);
@@ -1201,3 +1187,4 @@ describe('geolocationTest_geo3', function () {
 
 
 
+