XTS Split 0813

 fix mediaLibrary_file Promise
Signed-off-by: Ncaochuan <weiyufeng@neusoft.com>

multimedia/BUILD.gn

@@ -37,6 +37,7 @@ group("multimedia") {
       "media/media_js_standard/videoPlayer:video_player_js_hap",
       "medialibrary/mediaLibrary_album:mediaLibrary_album_hap",
       "medialibrary/mediaLibrary_favorite:mediaLibrary_favorite_hap",
+      "medialibrary/mediaLibrary_file:mediaLibrary_file_hap",
       "medialibrary/mediaLibrary_fileAsset:mediaLibrary_fileAsset_hap",
       "medialibrary/mediaLibrary_fileKey:mediaLibrary_fileKey_hap",
       "medialibrary/mediaLibrary_fileResult:mediaLibrary_fileResult_hap",

multimedia/medialibrary/mediaLibrary_file/AppScope/app.json

+{
+    "app":{
+        "bundleName":"ohos.acts.multimedia.mediaLibrary",
+        "vendor":"huawei",
+        "versionCode":1000000,
+        "versionName":"1.0.0",
+        "debug":false,
+        "icon":"$media:icon",
+        "label":"$string:entry_MainAbility",
+        "description":"$string:mainability_description",
+        "distributedNotificationEnabled":true,
+        "keepAlive":true,
+        "singleUser":true,
+        "minAPIVersion":8,
+        "targetAPIVersion":8,
+        "car":{
+            "apiCompatibleVersion":8,
+            "singleUser":false
+        }
+    }
+}

multimedia/medialibrary/mediaLibrary_file/AppScope/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "MediaLibraryJSTestMain"
+    },
+    {
+      "name": "mainability_description",
+      "value": "MediaLibraryJSTestMain Ability"
+    }
+  ]
+}
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/BUILD.gn

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("mediaLibrary_file_hap") {
+  hap_profile = "entry/src/main/module.json"
+  deps = [
+    ":mediaLibrary_js_assets",
+    ":mediaLibrary_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsMediaLibraryFile"
+}
+
+ohos_app_scope("medialibrary_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("mediaLibrary_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("mediaLibrary_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":medialibrary_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
+}

multimedia/medialibrary/mediaLibrary_file/Test.json

+{
+    "description": "Configuration for mediaLibrary Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "300000",
+        "package": "ohos.acts.multimedia.mediaLibrary",
+        "shell-timeout": "600000"
+    },
+    "kits": [
+        {
+            "type": "ShellKit",
+            "pre-push": [
+            ],
+            "run-command": [
+                "rm -rf /storage/media/100/local/files/*",
+                "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*",
+                "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}",
+                "mkdir -p /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata"
+            ]
+        },
+        {
+            "type": "PushKit",
+            "pre-push": [
+            ],
+            "push": [
+                "./resource/medialibrary/01.jpg ->/data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata",
+                "./resource/medialibrary/01.mp3 ->/data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata",
+                "./resource/medialibrary/01.mp4 ->/data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata",
+                "./resource/medialibrary/01.dat ->/data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata"
+            ]
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "mkdir -pv /storage/media/100/local/files/Pictures/{Static,Dynamic}",
+                "mkdir -pv /storage/media/100/local/files/Videos/{Static,Dynamic}",
+                "mkdir -pv /storage/media/100/local/files/Audios/{Static,Dynamic}",
+                "mkdir -pv /storage/media/100/local/files/Documents/{Static,Dynamic}",
+
+                "for d in Static; do for i in $$(seq 6); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.jpg /storage/media/100/local/files/Pictures/$$d/0$$i.jpg; done;done;",
+                "for d in Static; do for i in $$(seq 6); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.mp3 /storage/media/100/local/files/Audios/$$d/0$$i.mp3; done;done;",
+                "for d in Static; do for i in $$(seq 6); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.mp4 /storage/media/100/local/files/Videos/$$d/0$$i.mp4; done;done;",
+                "for d in Static; do for i in $$(seq 6); do cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.dat /storage/media/100/local/files/Documents/$$d/0$$i.dat; done;done;",
+                
+                "cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.jpg /storage/media/100/local/files/Pictures/Dynamic/01.jpg",
+                "cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.mp4 /storage/media/100/local/files/Videos/Dynamic/01.mp4",
+                "cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.mp3 /storage/media/100/local/files/Audios/Dynamic/01.mp3",
+                "cp /data/accounts/account_0/appdata/com.ohos.medialibrary.medialibrarydata/01.dat /storage/media/100/local/files/Documents/Dynamic/01.dat",
+
+                "chmod -R 777 /storage/media/100/local/files/*",
+                "chmod -R 777 /data/service/el2/100/hmdfs/account/files/*",
+                "hilog -Q pidoff",
+                "hilog -p off",
+                "hilog -b D -D 0xD002B70", 
+                "scanner_demo",
+                "sleep 10"
+            ]
+        },
+        {
+            "test-file-name": [
+                "ActsMediaLibraryFile.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/Application/AbilityStage.ts

+import AbilityStage from "@ohos.application.AbilityStage"
+
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        console.log("[Demo] MyAbilityStage onCreate")
+	globalThis.stageOnCreateRun = 1;
+	globalThis.stageContext = this.context;
+    }
+}

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/MainAbility/MainAbility.ts

+import Ability from '@ohos.application.Ability'
+
+export default class MainAbility extends Ability {
+    onCreate(want,launchParam){
+        // Ability is creating, initialize resources for this ability
+        console.log("[Demo] MainAbility onCreate")
+        globalThis.abilityWant = want;
+    }
+
+    onDestroy() {
+        // Ability is destroying, release resources for this ability
+        console.log("[Demo] MainAbility onDestroy")
+    }
+
+    onWindowStageCreate(windowStage) {
+        // Main window is created, set main page for this ability
+        console.log("[Demo] MainAbility onWindowStageCreate")
+        globalThis.abilityContext = this.context
+        windowStage.setUIContent(this.context, "pages/index/index", null)
+    }
+
+    onWindowStageDestroy() {
+        //Main window is destroyed, release UI related resources
+        console.log("[Demo] MainAbility onWindowStageDestroy")
+    }
+
+    onForeground() {
+        // Ability has brought to foreground
+        console.log("[Demo] MainAbility onForeground")
+    }
+
+    onBackground() {
+        // Ability has back to background
+        console.log("[Demo] MainAbility onBackground")
+    }
+};
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/pages/index/index.ets

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import file from '@system.file';
+
+import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
+import testsuite from "../../test/List.test.ets"
+
+@Entry
+@Component
+struct Index {
+
+  aboutToAppear(){
+    console.info("start run testcase!!!!")
+    const core = Core.getInstance()
+    const expectExtend = new ExpectExtend({
+      'id': 'extend'
+    })
+    core.addService('expect', expectExtend)
+    const reportExtend = new ReportExtend(file)
+
+    core.addService('report', reportExtend)
+    core.init()
+    core.subscribeEvent('task', reportExtend)
+    const configService = core.getDefaultService('config')
+    console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters))
+    globalThis.abilityWant.parameters.timeout = 70000;
+    configService.setConfig(globalThis.abilityWant.parameters)
+    console.info('testsuite()---->')
+    testsuite(globalThis.abilityContext)
+    core.execute()
+    console.info('core.execute()---->')
+  }
+
+  build() {
+    Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text('Hello World')
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Button() {
+        Text('next page')
+          .fontSize(25)
+          .fontWeight(FontWeight.Bold)
+      }.type(ButtonType.Capsule)
+      .margin({
+        top: 20
+      })
+      .backgroundColor('#0D9FFB')
+      .onClick(() => {
+
+      })
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/pages/second/second.ets

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import router from '@system.router';
+
+@Entry
+@Component
+struct Second {
+  private content: string = "Second Page"
+
+  build() {
+    Flex({ direction: FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+      Text(`${this.content}`)
+        .fontSize(50)
+        .fontWeight(FontWeight.Bold)
+      Button() {
+        Text('back to index')
+          .fontSize(20)
+          .fontWeight(FontWeight.Bold)
+      }.type(ButtonType.Capsule)
+      .margin({
+        top: 20
+      })
+      .backgroundColor('#0D9FFB')
+      .onClick(() => {
+        router.back()
+      })
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/entry/src/main/ets/test/List.test.ets

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fileTestPromise from './fileTestPromise.test.ets'
+export default function testsuite(abilityContext) {
+  fileTestPromise(abilityContext)
+}

multimedia/medialibrary/mediaLibrary_file/entry/src/main/module.json

+{
+    "module": {
+        "name": "phone",
+        "type": "entry",
+        "srcEntrance": "./ets/Application/AbilityStage.ts",
+        "description": "$string:mainability_description",
+        "mainElement": "MainAbility",
+        "deviceTypes": [
+            "phone"
+        ],
+        "deliveryWithInstall": true,
+        "installationFree": false,
+        "uiSyntax": "ets",
+        "pages": "$profile:main_pages",
+        "abilities": [
+            {
+                "name": "ohos.acts.multimedia.mediaLibrary.MainAbility",
+                "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+                "description": "$string:mainability_description",
+                "icon": "$media:icon",
+                "label": "$string:entry_MainAbility",
+                "visible": true,
+                "orientation": "portrait",
+                "skills": [
+                    {
+                        "actions": [
+                            "action.system.home"
+                        ],
+                        "entities":[
+                            "entity.system.home"
+                        ]
+                    }
+                ]
+            }
+        ],
+		"requestPermissions": [
+            {
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "use ohos.permission.GET_BUNDLE_INFO"
+            },
+            {
+                "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
+                "reason":"use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
+            },
+            {
+                "name" : "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
+                "reason" : "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
+            },
+            {
+                "name" : "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
+                "reason" : "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
+            },
+            {
+                "name": "ohos.permission.MEDIA_LOCATION",
+                "reason":"use ohos.permission.MEDIA_LOCATION"
+            },
+            {
+                "name": "ohos.permission.READ_MEDIA",
+                "reason":"use ohos.permission.READ_MEDIA"
+            },
+            {
+                "name": "ohos.permission.WRITE_MEDIA",
+                "reason":"use ohos.permission.WRITE_MEDIA"
+            }
+        ]
+    }
+}

multimedia/medialibrary/mediaLibrary_file/entry/src/main/resources/base/element/string.json

+{
+    "string": [
+      {
+        "name": "entry_MainAbility",
+        "value": "MediaLibraryJSTestMain"
+      },
+      {
+        "name": "mainability_description",
+        "value": "MediaLibraryJSTestMain Ability"
+      }
+    ]
+  }
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_file/entry/src/main/resources/base/profile/main_pages.json

+{
+    "src": [
+        "pages/index/index",
+        "pages/second/second"
+    ]
+}
\ No newline at end of file

multimedia/medialibrary/mediaLibrary_js_standard/entry/src/main/ets/test/List.test.ets

@@ -20,7 +20,6 @@ import fileAssetTestCallbackTest from './fileAssetTestCallback.test.ets'
 import fileAssetUriTestCallBackTest from './fileAssetUriTestCallBack.test.ets'
 import fileAssetUriTestPromiseTest from './fileAssetUriTestPromise.test.ets'
 import fileTestCallBackTest from './fileTestCallBack.test.ets'
-import fileTestPromiseTest from './fileTestPromise.test.ets'
 import mediaLibraryTestCallBackTest from './mediaLibraryTestCallBack.test.ets'
 import mediaLibraryTestPromiseTest from './mediaLibraryTestPromise.test.ets'
 import mediaLibraryTestPromiseOnOffTest from './mediaLibraryTestPromiseOnOff.test.ets'
@@ -34,7 +33,6 @@ export default function testsuite(abilityContext) {
   fileAssetUriTestCallBackTest(abilityContext)
   fileAssetUriTestPromiseTest(abilityContext)
   fileTestCallBackTest(abilityContext)
-  fileTestPromiseTest(abilityContext)
   mediaLibraryTestCallBackTest(abilityContext)
   mediaLibraryTestPromiseTest(abilityContext)
   mediaLibraryTestPromiseOnOffTest(abilityContext)