quanli1@huawei.com

Signed-off-by: Nquanli <quanli1@huawei.com>

communication/bluetooth_gatt/src/main/js/test/BtManagerGattManager.test.js

@@ -51,7 +51,7 @@ describe('btManagerGattManagerTest', function() {
     beforeAll(function () {
         console.info('beforeAll called')
         gattServer = bluetooth.BLE.createGattServer();
-        gattClient = bluetooth.BLE.createGattClientDevice("11:22:33:44:55:66");
+        gattClient = bluetooth.BLE.createGattClientDevice("92:3A:C0:3A:4C:28");
     })
     beforeEach(async function(done) {
         console.info('beforeEach called')
@@ -300,8 +300,8 @@ describe('btManagerGattManagerTest', function() {
     it('SUB_COMMUNICATION_BTMANAGER_GETSERVICE_0200', 0, async function (done) {
         try {
             gattClient.getServices((code, data)=> {
-                if(code.code==0){
-                    console.info("bluetooth services size is ", data.length)
+                if(code.code == 0) {
+                    console.info("bluetooth services size is ", data.length);
                     expect(true).assertEqual(data.length >= 0);
                 } else {
                     console.info('[bluetooth_js] get services code ' + JSON.stringify(code));
@@ -310,11 +310,11 @@ describe('btManagerGattManagerTest', function() {
                 done();
             });
         } catch (error) {
-            console.error(`[bluetooth_js]GetService_0200 failed, code is ${error.code}, 
-            message is ${error.message}`);
+            console.error(`[bluetooth_js]GetService_0200 failed, code is ${error.code},message is ${error.message}`);
             expect(true).assertFalse();
-            done()
+            done();
         }
+        done();
        
     })
 
@@ -467,11 +467,14 @@ describe('btManagerGattManagerTest', function() {
     it('SUB_COMMUNICATION_BTMANAGER_READCHARACTERISTIC_2000', 0, async function(done) {  
         try {
             function readCcc(code, BLECharacteristic) {
+                console.log('bluetooth characteristic code:'+ code.code);
                 if (code.code != 0) {
                     return;
                 }
-                console.log('bluetooth characteristic uuid:'+ BLECharacteristic.characteristicUuid);
-                expect(true).assertEqual(data==null);
+                console.log('bluetooth characteristic serviceUuid:'+ BLECharacteristic.serviceUuid);
+                console.log('bluetooth characteristic characteristicUuid:'+ BLECharacteristic.characteristicUuid);
+                console.log('bluetooth characteristic characteristicValue:'+ BLECharacteristic.characteristicValue);
+                console.log('bluetooth characteristic descriptors:'+ BLECharacteristic.descriptors);
                 let value = new Uint8Array(BLECharacteristic.characteristicValue);
                 console.log('bluetooth characteristic value: ' 
                 + value[0] +','+ value[1]+','+ value[2]+','+ value[3]);
@@ -492,15 +495,13 @@ describe('btManagerGattManagerTest', function() {
                 characteristicUuid: '00001820-0000-1000-8000-00805F9B34FB',
                 characteristicValue: arrayBufferCCC, descriptors:descriptors};
             gattClient.readCharacteristicValue(characteristic,readCcc);
-            expect(true).assertFalse();
-            done()
+            done();
         } catch (error) {
-            console.error(`[bluetooth_js]readDescrValue20 failed, code is ${error.code}, 
-            message is ${error.message}`);
+            console.error(`[bluetooth_js]readDescrValue20 failed, code is ${error.code},message is ${error.message}`);
             expect(error.code).assertEqual('401');
-            done()
+            done();
         }                             
-       
+        done();
     })
 
     /**

location/geolocation_standard/src/main/js/test/GeocoderMTest.test.js

@@ -130,13 +130,14 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2000', 0, async function (done) {
-        try {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 1 };
+            try {
                 geolocationm.getAddressesFromLocation(reverseGeocodeRequest, (err, data) => {
                     if (err) {
                         console.info('[lbs_js] getAddressesFromLocation4 callback err is:' + JSON.stringify(err));
-                    console.info('[lbs_js] not support now');
-                    expect(err.code).assertEqual(801);
+                        expect(err.code).assertEqual(3301300);
                     } else {
                         console.info("[lbs_js] getAddressesFromLocation4 callback data is:" + JSON.stringify(data));
                         expect(true).assertEqual((JSON.stringify(data)) != null);
@@ -147,6 +148,9 @@ export default function geolocationTest_geo5() {
                 expect(true).assertFalse();
             }
             await sleep(2000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -160,6 +164,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2100', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             try {
                 let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 5};
                 await geolocationm.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
@@ -189,13 +195,16 @@ export default function geolocationTest_geo5() {
                 }).catch(error => {
                     console.info("[lbs_js] getAddressesFromLocation21 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocation21 try err." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -208,6 +217,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2200', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             try {
                 let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 5 };
                 await geolocationm.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
@@ -216,13 +227,16 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocation22 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocation22 try err." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -235,6 +249,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2300', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let reverseGeocodeRequest1 = { "latitude": 90, "longitude": 121.62771, "maxItems": 1 };
             try {
                 await geolocationm.getAddressesFromLocation(reverseGeocodeRequest1).then((data) => {
@@ -243,7 +259,7 @@ export default function geolocationTest_geo5() {
                 }).catch(error => {
                     console.info("[lbs_js] getAddressesFromLocation2301 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
@@ -270,7 +286,7 @@ export default function geolocationTest_geo5() {
                 }).catch(error => {
                     console.info("[lbs_js] getAddressesFromLocation2303 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
@@ -290,6 +306,9 @@ export default function geolocationTest_geo5() {
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -302,6 +321,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2400', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 180, "maxItems": 1 };
             try {
                 await geolocationm.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
@@ -310,10 +331,10 @@ export default function geolocationTest_geo5() {
                 }).catch(error => {
                     console.info("[lbs_js] getAddressesFromLocation2401 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
-            console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
+                console.info("[lbs_js] getAddressesFromLocation message1." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
@@ -327,8 +348,8 @@ export default function geolocationTest_geo5() {
                     expect(true).assertFalse();
                 });
             } catch (error) {
-            console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
-            expect(true).assertEqual((JSON.stringify(error.message)) != null);
+                console.info("[lbs_js] getAddressesFromLocation message2." + JSON.stringify(error));
+                expect(error.code).assertEqual("401");
             }
             await sleep(1000);
             let reverseGeocodeRequest2 = { "latitude": 31.265496, "longitude": 180, "maxItems": 1 };
@@ -339,10 +360,10 @@ export default function geolocationTest_geo5() {
                 }).catch(error => {
                     console.info("[lbs_js] getAddressesFromLocation2403 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301300);
                 });
             } catch (error) {
-            console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
+                console.info("[lbs_js] getAddressesFromLocation message3." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
@@ -356,10 +377,13 @@ export default function geolocationTest_geo5() {
                     expect(true).assertFalse();
                 });
             } catch (error) {
-            console.info("[lbs_js] getAddressesFromLocation message." + JSON.stringify(error));
-            expect(true).assertEqual((JSON.stringify(error.message)) != null);
+                console.info("[lbs_js] getAddressesFromLocation message4." + JSON.stringify(error));
+                expect(error.code).assertEqual("401");
             } 
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -373,12 +397,14 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2500', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
+            try {
                 let geocodeRequest = {
                     "description": "上海市浦东新区金穗路1800号",
                     "maxItems": 1,
                     "locale": "zh",
                 };
-        try {
                 geolocationm.getAddressesFromLocationName(geocodeRequest, (err, data) => {
                     if (err) {
                         switch (err) {
@@ -412,16 +438,20 @@ export default function geolocationTest_geo5() {
                             default:
                                 console.info('getAddressesFromLocationName callback err: ' + JSON.stringify(err));
                         }
-                } else {
+                    }
+                    else {
                             console.info("[lbs_js] getAddressesFromLocationName08 callback data is: " + JSON.stringify(data));
                     }
                     done();
                 });
-        }catch(error){
+            } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName08 message." + JSON.stringify(error.message));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable."); 
+        }
         done();
     })
 
@@ -434,6 +464,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2600', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 3 };
             try {
                 await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
@@ -442,13 +474,16 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName09 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName26 try err." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -461,6 +496,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2700', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             try {
                 let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 5 };
                 await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
@@ -469,13 +506,16 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName10 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName27 try err." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -489,6 +529,8 @@ export default function geolocationTest_geo5() {
      需要实测！！！！
      */
     it('SUB_HSS_LocationSystem_Geo_2800', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             try {
                 let geocodeRequest = { "description": "", "maxItems": 1 };
                 await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
@@ -517,6 +559,9 @@ export default function geolocationTest_geo5() {
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -529,6 +574,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_2900', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest = {
                 "description": "上海金穗路1800号",
                 "maxItems": 1,
@@ -544,13 +591,16 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName29 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName29 try err." + JSON.stringify(error));
                 expect(true).assertFalse();
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -564,6 +614,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_3000', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest = {
                 "description": "",
                 "maxItems": 1,
@@ -607,6 +659,9 @@ export default function geolocationTest_geo5() {
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -620,6 +675,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_3100', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest = {
                 "description": "北京天安门",
                 "maxItems": 1,
@@ -634,13 +691,16 @@ export default function geolocationTest_geo5() {
                     expect(result.length >= 0).assertTrue();
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName31 promise then error." + JSON.stringify(error));
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName31 message." + JSON.stringify(error));
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -662,6 +722,8 @@ export default function geolocationTest_geo5() {
             "maxLatitude": 39.85,
             "maxLongitude": 116.35
         };
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             try {
                 await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
                     console.info("[lbs_js]  getAddressesFromLocationName32 promise data is:" + JSON.stringify(result));
@@ -669,13 +731,16 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName32 promise then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             } catch (error) {
                 console.info("[lbs_js] getAddressesFromLocationName32 message." + JSON.stringify(error));
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -688,6 +753,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_3300', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest1 = {
                 "description": "上海金穗路1800号",
                 "maxItems": 1,
@@ -703,7 +770,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName33 promise1 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName33 message1." + JSON.stringify(error.message));
@@ -725,7 +792,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName33 promise2 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName33 message2." + JSON.stringify(error.message));
@@ -790,7 +857,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName33 promise5 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName33 message5." + JSON.stringify(error.message));
@@ -812,7 +879,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName33 promise6 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName33 message6." + JSON.stringify(error.message));
@@ -861,6 +928,9 @@ export default function geolocationTest_geo5() {
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
@@ -873,6 +943,8 @@ export default function geolocationTest_geo5() {
      * @tc.level Level 2
      */
     it('SUB_HSS_LocationSystem_Geo_3400', 0, async function (done) {
+        let geocoder1 = geolocationm.isGeocoderAvailable();
+        if (geocoder1) {
             let geocodeRequest1 = {
                 "description": "北京天安门",
                 "maxItems": 1,
@@ -888,7 +960,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName34 promise1 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName34 message1." + JSON.stringify(error.message));
@@ -910,7 +982,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName34 promise2 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName34 message2." + JSON.stringify(error.message));
@@ -974,7 +1046,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName34 promise5 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName34 message5." + JSON.stringify(error.message));
@@ -995,7 +1067,7 @@ export default function geolocationTest_geo5() {
                 }).catch((error) => {
                     console.info("[lbs_js] getAddressesFromLocationName34 promise6 then error." + JSON.stringify(error));
                     console.info('[lbs_js] not support now');
-                expect(error.code).assertEqual(801);
+                    expect(error.code).assertEqual(3301400);
                 });
             }catch(error){
                 console.info("[lbs_js] getAddressesFromLocationName34 message6." + JSON.stringify(error.message));
@@ -1043,12 +1115,11 @@ export default function geolocationTest_geo5() {
                 expect(error.code).assertEqual("401");
             }
             await sleep(1000);
+        } else {
+            console.info("[lbs_js] The geocoding service is unavailable.");
+        }
         done();
     })
 
-
-
     })
 }
\ No newline at end of file
-
-

location/geolocation_standard/src/main/js/test/LocationMTest.test.js

@@ -1656,6 +1656,35 @@ export default function geolocationTest_geo7() {
         done();
     })
 
+    /**
+     * @tc.number SUB_HSS_LocationSystem_SingleLoc_3500
+     * @tc.name Test getCurrentLocation
+     * @tc.desc Initiate a single location request in a specified scenario and set the navigation scenario..
+     * @tc.size MEDIUM
+     * @tc.type Function
+     * @tc.level Level 2
+     */
+    it('SUB_HSS_LocationSystem_SingleLoc_3500', 0, async function (done) {
+        let currentLocationRequest = { "priority": 0x200, "scenario": 0x301, "timeoutMs": 1000, "maxAccuracy": 0 };
+        try {
+            geolocationm.getCurrentLocation(currentLocationRequest, (err, result) => {
+                if (err) {
+                    console.info("[lbs_js] getCurrentLocation callback err:  " + JSON.stringify(err));
+                    expect(err.code).assertEqual(3301200);
+                    console.info('[lbs_js] getCurrentLocationCallback reject after')
+                } else {
+                    console.info("[lbs_js] getCurrentLocation callback, result:  " + JSON.stringify(result));
+                    expect(true).assertEqual(result != null);
+                }
+            });
+        } catch (error) {
+            console.info("[lbs_js] getCurrentLocation callback try err." + JSON.stringify(error));
+            expect(true).assertEqual(JSON.stringify(error) != null);
+        }
+        await sleep(1000);
+        done();
+    })
+
     })
 }