!5070 to subcontract

Merge pull request !5070 from 马利/master

multimedia/BUILD.gn

@@ -18,7 +18,12 @@ group("multimedia") {
   if (is_standard_system) {
     deps = [
       "audio/audio_js_standard/audioManager:audio_manager_js_hap",
-      "camera/camera_js_standard:camera_standard_ets_hap",
+      "camera/cameraDepthOffield:camera_depthoffield_ets_hap",
+      "camera/cameraExceedWideAngle:camera_exceedwideangle_ets_hap",
+      "camera/cameraLongFocus:camera_longfocus_ets_hap",
+      "camera/cameraUnspc:camera_unspc_ets_hap",
+      "camera/cameraWideAngle:camera_wideangle_ets_hap",
+      "camera/cameraWideAngleRK:camera_wideanglerk_ets_hap",
       "image/image_js_standard/image:image_js_hap",
       "image/image_js_standard/imageColorspace:image_colorspace_js_hap",
       "image/image_js_standard/imageCreator:image_creator_js_hap",

multimedia/camera/cameraDepthOffield/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("camera_depthoffield_ets_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":camera_ets_assets",
+    ":camera_ets_resources",
+  ]
+  ets2abc = true
+
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsCameraDepthOffieldETSTest"
+  subsystem_name = "multimedia"
+  part_name = "multimedia_camera_standard"
+}
+ohos_js_assets("camera_ets_assets") {
+  source_dir = "./src/main/ets/MainAbility"
+}
+ohos_resources("camera_ets_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/camera/cameraDepthOffield/Test.json

+{
+    "description": "Configuration for camerastandard DepthOffield Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "1000000",
+        "package": "com.open.harmony.multimedia.cameradftest",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "touch /data/media/01.mp4",
+                "chmod -R 777 /data/media"
+                
+            ],
+            "teardown-command":[
+               
+            ]
+        },
+        {
+            "test-file-name": [
+                "ActsCameraDepthOffieldETSTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/config.json → multimedia/camera/cameraDepthOffield/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.open.harmony.multimedia.cameratest",
-    "vendor": "open",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 7,
-      "releaseType": "Release",
-      "target": 7
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.open.harmony.multimedia.cameratest",
-    "name": ".MyApplication",
-    "mainAbility": "com.open.harmony.multimedia.cameratest.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "visible": true,
-        "srcPath": "MainAbility",
-        "name": ".MainAbility",
-        "srcLanguage": "ets",
-        "icon": "$media:icon",
-        "description": "$string:description_mainability",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "reqPermissions": [
-      {
-        "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.CAMERA",
-        "reason": "use ohos.permission.CAMERA"
-      },
-      {
-        "name": "ohos.permission.MICROPHONE",
-        "reason": "use ohos.permission.MICROPHONE"
-      },
-      {
-        "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"
-      }
-    ],
-    "js": [
-      {
-        "mode": {
-          "syntax": "ets",
-          "type": "pageAbility"
-        },
-        "pages": [
-          "pages/index"
-        ],
-        "name": ".MainAbility",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.open.harmony.multimedia.cameradftest",
+    "vendor": "open",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 7,
+      "releaseType": "Release",
+      "target": 7
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.open.harmony.multimedia.cameradftest",
+    "name": ".MyApplication",
+    "mainAbility": "com.open.harmony.multimedia.cameradftest.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "reqPermissions": [
+      {
+        "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.CAMERA",
+        "reason": "use ohos.permission.CAMERA"
+      },
+      {
+        "name": "ohos.permission.MICROPHONE",
+        "reason": "use ohos.permission.MICROPHONE"
+      },
+      {
+        "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"
+      }
+    ],
+    "js": [
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/ets/MainAbility/test/Camera.test.ets → multimedia/camera/cameraDepthOffield/src/main/ets/MainAbility/test/Camera.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 cameraJSUnitEnum from './CameraJSUnitEnum.test.ets'
-import cameraJSUnitCameraFormat from './CameraJSUnitCameraFormat.test.ets'
-import cameraJSUnitPhotoAsync from './CameraJSUnitPhotoAsync.test.ets'
-import cameraJSUnitPhotoPromise from './CameraJSUnitPhotoPromise.test.ets'
-import cameraJSUnitVideoAsync from './CameraJSUnitVideoAsync.test.ets'
-import cameraJSUnitVideoPromise from './CameraJSUnitVideoPromise.test.ets'
-
-let TAG = 'CameraModuleTest: '
-
-export default function cameraKit(surfaceId: any) {
-  console.info(TAG + 'Entering cameraKit')
-  console.info(TAG + 'surfaceId: ' + surfaceId)
-
-  cameraJSUnitEnum(surfaceId)
-  cameraJSUnitCameraFormat(surfaceId)
-  cameraJSUnitPhotoAsync(surfaceId)
-  cameraJSUnitPhotoPromise(surfaceId)
-  cameraJSUnitVideoAsync(surfaceId)
-  cameraJSUnitVideoPromise(surfaceId)
+/*
+ * 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 cameraJSUnitEnum from './CameraJSUnitEnum.test.ets'
+import cameraJSUnitCameraFormat from './CameraJSUnitCameraFormat.test.ets'
+import cameraJSUnitPhotoAsync from './CameraJSUnitPhotoAsync.test.ets'
+import cameraJSUnitPhotoPromise from './CameraJSUnitPhotoPromise.test.ets'
+import cameraJSUnitVideoAsync from './CameraJSUnitVideoAsync.test.ets'
+import cameraJSUnitVideoPromise from './CameraJSUnitVideoPromise.test.ets'
+
+let TAG = 'CameraModuleTest: '
+
+export default function cameraKit(surfaceId: any) {
+  console.info(TAG + 'Entering cameraKit')
+  console.info(TAG + 'surfaceId: ' + surfaceId)
+
+  cameraJSUnitEnum(surfaceId)
+  cameraJSUnitCameraFormat(surfaceId)
+  cameraJSUnitPhotoAsync(surfaceId)
+  cameraJSUnitPhotoPromise(surfaceId)
+  cameraJSUnitVideoAsync(surfaceId)
+  cameraJSUnitVideoPromise(surfaceId)
 }
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/resources/base/element/string.json → multimedia/camera/cameraDepthOffield/src/main/resources/base/element/string.json

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

multimedia/camera/cameraExceedWideAngle/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("camera_exceedwideangle_ets_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":camera_ets_assets",
+    ":camera_ets_resources",
+  ]
+  ets2abc = true
+
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsCameraExceedWideAngleETSTest"
+  subsystem_name = "multimedia"
+  part_name = "multimedia_camera_standard"
+}
+ohos_js_assets("camera_ets_assets") {
+  source_dir = "./src/main/ets/MainAbility"
+}
+ohos_resources("camera_ets_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/camera/cameraExceedWideAngle/Test.json

+{
+    "description": "Configuration for camerastandard ExceedWideAngle Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "1000000",
+        "package": "com.open.harmony.multimedia.cameraewatest",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "touch /data/media/01.mp4",
+                "chmod -R 777 /data/media"
+                
+            ],
+            "teardown-command":[
+               
+            ]
+        },
+        {
+            "test-file-name": [
+                "ActsCameraExceedWideAngleETSTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

multimedia/camera/cameraExceedWideAngle/src/main/config.json

+{
+  "app": {
+    "bundleName": "com.open.harmony.multimedia.cameraewatest",
+    "vendor": "open",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 7,
+      "releaseType": "Release",
+      "target": 7
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.open.harmony.multimedia.cameraewatest",
+    "name": ".MyApplication",
+    "mainAbility": "com.open.harmony.multimedia.cameraewatest.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "visible": true,
+        "srcPath": "MainAbility",
+        "name": ".MainAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:description_mainability",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "reqPermissions": [
+      {
+        "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.CAMERA",
+        "reason": "use ohos.permission.CAMERA"
+      },
+      {
+        "name": "ohos.permission.MICROPHONE",
+        "reason": "use ohos.permission.MICROPHONE"
+      },
+      {
+        "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"
+      }
+    ],
+    "js": [
+      {
+        "mode": {
+          "syntax": "ets",
+          "type": "pageAbility"
+        },
+        "pages": [
+          "pages/index"
+        ],
+        "name": ".MainAbility",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

multimedia/camera/camera_js_standard/src/main/ets/default/pages/index.ets → multimedia/camera/cameraExceedWideAngle/src/main/ets/MainAbility/pages/index.ets

@@ -14,10 +14,8 @@
  */
 
 import {Core, ExpectExtend} from "deccjsunit/index"
-//import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index"
 import cameraKit from "../test/Camera.test"
 import featureAbility from "@ohos.ability.featureAbility"
-//import {PreviewArea} from '../view/PreviewArea.ets'
 
 let TAG = 'CameraModuleTest: '
 var mXComponentController: XComponentController = new XComponentController()
@@ -31,62 +29,19 @@ struct CameraIndex {
 
   aboutToAppear() {
     console.info('--------------aboutToAppear--------------')
-//    featureAbility.getWant()
-//      .then((Want) => {
-//        const core = Core.getInstance()
-////        const instrumentLog = new InstrumentLog({
-////          'id': 'report', 'unity': 'true'
-////        })
-////        console.info(TAG + 'Entering instrumentLog')
-//        const expectExtend = new ExpectExtend({
-//          'id': 'extend'
-//        })
-//        console.info(TAG + 'Entering expectExtend')
-//        core.addService('expect', expectExtend)
-////        core.addService('report', instrumentLog)
-//        console.info(TAG + 'Entering addService')
-//        core.init()
-//        console.info(TAG + 'Entering core.init()')
-////        core.subscribeEvent('spec', instrumentLog)
-////        core.subscribeEvent('suite', instrumentLog)
-////        core.subscribeEvent('task', instrumentLog)
-//        console.info(TAG + 'Entering subscribeEvent')
-//        const configService = core.getDefaultService('config')
-//        configService.setConfig(Want.parameters)
-//        console.info(TAG + 'Entering configService')
-//        cameraKit(surfaceId)
-////        console.info(TAG + 'Entering PreviewArea')
-////        PreviewArea({
-////          previewSize: $previewSize
-////        })
-//        core.execute()
-//        console.info(TAG + 'Operation successful. Data: ' + JSON.stringify(Want));
-//      })
-//      .catch((error) => {
-//        console.error(TAG + 'Operation failed. Cause: ' + JSON.stringify(error));
-//      })
   }
 
-  /*build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text('Hello World')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-    }
-    .width('100%')
-    .height('100%')
-  }*/
   build() {
     Flex() {
       XComponent({
         id: '',
         type: 'surface',
         libraryname: '',
-        source: '',
         controller: mXComponentController
       })
         .onLoad(() => {
           console.info('CameraModuleTest: OnLoad() is called!')
+          mXComponentController.setXComponentSurfaceSize({ surfaceWidth: 1920, surfaceHeight: 1080 });
           surfaceId = mXComponentController.getXComponentSurfaceId()
           console.info('CameraModuleTest: XComponent onLoad surfaceId: ' + surfaceId)
           featureAbility.getWant()
@@ -112,8 +67,8 @@ struct CameraIndex {
               console.error(TAG + 'Operation failed. Cause: ' + JSON.stringify(error));
             })
         })
-        .width('640px')
-        .height('480px')
+        .width('1920px')
+        .height('1080px')
     }
   }
-}
\ No newline at end of file
+}

multimedia/camera/cameraExceedWideAngle/src/main/ets/MainAbility/test/Camera.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 cameraJSUnitEnum from './CameraJSUnitEnum.test.ets'
+import cameraJSUnitCameraFormat from './CameraJSUnitCameraFormat.test.ets'
+import cameraJSUnitPhotoAsync from './CameraJSUnitPhotoAsync.test.ets'
+import cameraJSUnitPhotoPromise from './CameraJSUnitPhotoPromise.test.ets'
+import cameraJSUnitVideoAsync from './CameraJSUnitVideoAsync.test.ets'
+import cameraJSUnitVideoPromise from './CameraJSUnitVideoPromise.test.ets'
+
+let TAG = 'CameraModuleTest: '
+
+export default function cameraKit(surfaceId: any) {
+  console.info(TAG + 'Entering cameraKit')
+  console.info(TAG + 'surfaceId: ' + surfaceId)
+
+  cameraJSUnitEnum(surfaceId)
+  cameraJSUnitCameraFormat(surfaceId)
+  cameraJSUnitPhotoAsync(surfaceId)
+  cameraJSUnitPhotoPromise(surfaceId)
+  cameraJSUnitVideoAsync(surfaceId)
+  cameraJSUnitVideoPromise(surfaceId)
+}
\ No newline at end of file

multimedia/camera/cameraExceedWideAngle/src/main/resources/base/element/string.json

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

multimedia/camera/cameraLongFocus/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("camera_longfocus_ets_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":camera_ets_assets",
+    ":camera_ets_resources",
+  ]
+  ets2abc = true
+
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsCameraLongFocusETSTest"
+  subsystem_name = "multimedia"
+  part_name = "multimedia_camera_standard"
+}
+ohos_js_assets("camera_ets_assets") {
+  source_dir = "./src/main/ets/MainAbility"
+}
+ohos_resources("camera_ets_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/camera/cameraLongFocus/Test.json

+{
+    "description": "Configuration for camerastandard LongFocus Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "1000000",
+        "package": "com.open.harmony.multimedia.cameralftest",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "touch /data/media/01.mp4",
+                "chmod -R 777 /data/media"
+                
+            ],
+            "teardown-command":[
+               
+            ]
+        },
+        {
+            "test-file-name": [
+                "ActsCameraLongFocusETSTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

multimedia/camera/cameraLongFocus/src/main/resources/base/element/string.json

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

multimedia/camera/camera_js_standard/BUILD.gn → multimedia/camera/cameraUnspc/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-ohos_js_hap_suite("camera_standard_ets_hap") {
+ohos_js_hap_suite("camera_unspc_ets_hap") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":camera_ets_assets",
@@ -21,7 +21,7 @@ ohos_js_hap_suite("camera_standard_ets_hap") {
   ets2abc = true
 
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsCameraStandardETSTest"
+  hap_name = "ActsCameraUnspcETSTest"
   subsystem_name = "multimedia"
   part_name = "multimedia_camera_standard"
 }