fixed 9d26e064 from https://gitee.com/quanli125/xts_acts/pulls/2826

add location testcase
Signed-off-by: Nq00313334 <quanli1@huawei.com>

communication/bluetooth_ble/src/main/js/default/test/BluetoothBle.test.js

@@ -69,6 +69,7 @@ describe('bluetoothhostTest', function() {
         let sta = bluetooth.getState();
         switch(sta){
             case 0:
+                console.info('[bluetooth_js] bt turn off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;
@@ -77,9 +78,10 @@ describe('bluetoothhostTest', function() {
                 await sleep(3000);
                 break;
             case 2:
-                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                console.info('[bluetooth_js] bt turn on:'+ JSON.stringify(sta));
                 break;
             case 3:
+                console.info('[bluetooth_js] bt turning off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;

communication/bluetooth_on/src/main/js/default/test/BluetoothOn.test.js

@@ -135,6 +135,7 @@ describe('bluetoothhostTest', function() {
         let sta = bluetooth.getState();
         switch(sta){
             case 0:
+                console.info('[bluetooth_js] bt turn off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;
@@ -143,9 +144,10 @@ describe('bluetoothhostTest', function() {
                 await sleep(3000);
                 break;
             case 2:
-                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                console.info('[bluetooth_js] bt turn on:'+ JSON.stringify(sta));
                 break;
             case 3:
+                console.info('[bluetooth_js] bt turning off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;

communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js

@@ -62,6 +62,7 @@ describe('bluetoothhostTest', function() {
         let sta = bluetooth.getState();
         switch(sta){
             case 0:
+                console.info('[bluetooth_js] bt turn off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;
@@ -70,9 +71,10 @@ describe('bluetoothhostTest', function() {
                 await sleep(3000);
                 break;
             case 2:
-                console.info('[bluetooth_js] state is On:'+ JSON.stringify(sta));
+                console.info('[bluetooth_js] bt turn on:'+ JSON.stringify(sta));
                 break;
             case 3:
+                console.info('[bluetooth_js] bt turning off:'+ JSON.stringify(sta));
                 bluetooth.enableBluetooth();
                 await sleep(3000);
                 break;

location/geolocation_standard/src/main/config.json

@@ -4,17 +4,19 @@
     "vendor": "acts",
     "version": {
       "code": 1000000,
-      "name": "1.0.0"
+      "name": "1.0"
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 5
+      "target": 5,
+      "releaseType": "Beta1"
     }
   },
   "deviceConfig": {},
   "module": {
-    "package": "ohos.acts.location.geolocation.function",
+    "package": "ohos.acts.location.geolocation",
     "name": ".MyApplication",
+    "mainAbility": "ohos.acts.location.geolocation.function.MainAbility",
     "deviceType": [
       "phone"
     ],
@@ -25,7 +27,6 @@
     },
     "abilities": [
       {
-        "visible": true,
         "skills": [
           {
             "entities": [
@@ -36,6 +37,7 @@
             ]
           }
         ],
+        "visible": true,
         "name": "ohos.acts.location.geolocation.function.MainAbility",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
@@ -44,6 +46,81 @@
         "launchType": "standard"
       }
     ],
+    "defPermissions": [
+      {
+        "availableScope": [],
+        "grantMode": "system_grant",
+        "name": "ohos.permission.ACCESS_LOCATION"
+      },
+      {
+        "availableScope": [],
+        "grantMode": "system_grant",
+        "name": "ohos.permission.LOCATION"
+      }
+    ],
+    "reqPermissions": [
+      {
+        "name": "ohos.permission.LOCATION",
+        "reason": "need use ohos.permission.LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.ACCESS_LOCATION",
+        "reason":"need use ohos.permission.ACCESS_LOCATION",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.LOCATION_IN_BACKGROUND",
+        "reason":"need use ohos.permission.LOCATION_IN_BACKGROUND",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+
+      {
+        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.GET_WIFI_LOCAL_MAC",
+        "reason":"need use ohos.permission.GET_WIFI_LOCAL_MAC",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      },
+      {
+        "name":"ohos.permission.GET_WIFI_INFO_INTERNAL",
+        "reason":"need use ohos.permission.GET_WIFI_INFO_INTERNAL",
+        "usedScene": {
+          "ability": [
+            "ohos.acts.location.geolocation.function.MainAbility"
+          ],
+          "when": "inuse"
+        }
+      }
+    ],
     "js": [
       {
         "pages": [