!5770 【杂散】【上传下载】优化request测试用例

Merge pull request !5770 from 张育帅/master

request/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
+# 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

request/RequestTest_Stage/AppScope/app.json

 {
-    "app":{
-        "bundleName":"com.acts.request.test",
-        "vendor":"huawei",
-        "versionCode":1000000,
-        "versionName":"1.0.0",
-        "debug":false,
-        "icon":"$media:icon",
-        "label":"$string:app_name",
-        "description":"$string:description_application",
-        "distributedNotificationEnabled":true,
+  "app": {
+    "bundleName": "com.acts.request.test",
+    "vendor": "huawei",
+    "versionCode": 1000000,
+    "versionName": "1.0.0",
+    "icon": "$media:app_icon",
+    "label": "$string:app_name",
+    "distributedNotificationEnabled": true,
     "keepAlive":true,
     "singleUser":true,
     "minAPIVersion":9,
-                          "targetAPIVersion":9,
-        "car":{
-            "apiCompatibleVersion":9,
-            "singleUser":false
-        }
+    "targetAPIVersion":9
   }
 }

request/RequestTest_Stage/AppScope/resources/base/element/string.json

 {
- "string":[
+  "string": [
     {
-      "name":"app_name",
-      "value":"ohosProject"
+      "name": "app_name",
+      "value": "ActsTimeAPITest"
     }
   ]
 }

request/RequestTest_Stage/BUILD.gn

@@ -14,17 +14,17 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsRequestStageTest") {
-  hap_profile = "entry/src/main/module.json"
-  js_build_mode = "debug"
   deps = [
     ":requestStage_ets_assets",
     ":requestStage_resources",
   ]
   ets2abc = true
-  certificate_profile = "signature/actsRequestStageTest.p7b"
-  hap_name = "ActsRequestStageTest"
-  subsystem_name = "request"
+  js_build_mode = "debug"
   part_name = "request"
+  subsystem_name = "request"
+  hap_name = "ActsRequestStageTest"
+  hap_profile = "entry/src/main/module.json"
+  certificate_profile = "signature/actsRequestStageTest.p7b"
 }
 
 ohos_app_scope("requestStage_app_profile") {

request/RequestTest_Stage/Test.json

@@ -4,9 +4,9 @@
         "type": "OHJSUnitTest",
         "test-timeout": "180000",
         "bundle-name": "com.acts.request.test",
-        "module-name": "phone",
-        "shell-timeout": "600000",
-        "testcase-timeout": 70000
+        "module-name": "entry_test",
+        "shell-timeout": "180000",
+        "testcase-timeout": 600000
     },
     "kits": [{
         "test-file-name": [

request/RequestTest_Stage/entry/src/main/ets/Application/AbilityStage.ts

-/*
- * 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 AbilityStage from "@ohos.application.AbilityStage"
-
-export default class MyAbilityStage extends AbilityStage {
-    onCreate() {
-        console.log("MyAbilityStage onCreate");
-        globalThis.stageOnCreateRun = 1;
-        globalThis.stageContext = this.context;
-    }
-}

request/RequestTest_Stage/entry/src/main/ets/Application/MyAbilityStage.ts

+import hilog from '@ohos.hilog';
+import AbilityStage from "@ohos.application.AbilityStage"
+
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'AbilityStage onCreate');
+    }
+}
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/ets/MainAbility/MainAbility.ts

-/*
- * 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 Ability from '@ohos.application.Ability'
+import hilog from '@ohos.hilog';
+import Window from '@ohos.window';
+import { Hypium } from '@ohos/hypium';
+import testsuite from '../test/List.test';
+import Ability from '@ohos.application.Ability';
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 
 export default class MainAbility extends Ability {
-    onCreate(want,launchParam){
-        // Ability is creating, initialize resources for this ability
-        console.info("requestStageTestAbility onCreate")
-        globalThis.abilityWant = want;
+    onCreate(want, launchParam) {
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? '');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? '');
+
+        var abilityDelegator: any;
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator();
+        var abilityDelegatorArguments: any;
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments();
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        if (abilityDelegator != undefined && abilityDelegatorArguments != undefined) {
+            hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!');
+            Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite);
+        } else {
+            hilog.info(0x0000, 'testTag', '%{public}s', 'abilityDelegator or abilityDelegatorArguments is undefined!!!');
+        }
     }
 
     onDestroy() {
-        // Ability is destroying, release resources for this ability
-        console.info("requestStageTestAbility onDestroy")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onDestroy');
     }
 
-    onWindowStageCreate(windowStage) {
+    onWindowStageCreate(windowStage: Window.WindowStage) {
         // Main window is created, set main page for this ability
-        console.info("requestStageTestAbility onWindowStageCreate")
-        globalThis.abilityContext = this.context
-        windowStage.setUIContent(this.context, "pages/index/index", null)
-        console.info("requestStageTestAbility onWindowStageCreate finish")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
+
+        windowStage.loadContent('pages/index', (err, data) => {
+            if (err.code) {
+                hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.ERROR);
+                hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
+                return;
+            }
+            hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+            hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
+        });
     }
 
     onWindowStageDestroy() {
         // Main window is destroyed, release UI related resources
-        console.info("requestStageTestAbility onWindowStageDestroy")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageDestroy');
     }
 
     onForeground() {
         // Ability has brought to foreground
-        console.info("requestStageTestAbility onForeground")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onForeground');
     }
 
     onBackground() {
         // Ability has back to background
-        console.info("requestStageTestAbility onBackground")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onBackground');
     }
-};
\ No newline at end of file
+}

request/RequestTest_Stage/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

-/*
- * 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 hilog from '@ohos.hilog';
 import TestRunner from '@ohos.application.testRunner'
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 
@@ -34,11 +21,13 @@ function translateParamsToString(parameters) {
 }
 
 async function onAbilityCreateCallback() {
-    console.log("onAbilityCreateCallback");
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', '%{public}s', 'onAbilityCreateCallback');
 }
 
 async function addAbilityMonitorCallback(err: any) {
-    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', 'addAbilityMonitorCallback : %{public}s', JSON.stringify(err) ?? '');
 }
 
 export default class OpenHarmonyTestRunner implements TestRunner {
@@ -46,11 +35,13 @@ export default class OpenHarmonyTestRunner implements TestRunner {
     }
 
     onPrepare() {
-        console.info("OpenHarmonyTestRunner OnPrepare ")
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner OnPrepare ');
     }
 
     async onRun() {
-        console.log('OpenHarmonyTestRunner onRun run')
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun run');
         abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
         abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
         var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
@@ -59,20 +50,22 @@ export default class OpenHarmonyTestRunner implements TestRunner {
             onAbilityCreate: onAbilityCreateCallback,
         };
         abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
-        var cmd = 'aa start -d 0 -a com.acts.request.test.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        var cmd = 'aa start -d 0 -a MainAbility ' + ' -b ' + abilityDelegatorArguments.bundleName
         cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
-        var debug = abilityDelegatorArguments.parameters["-D"]
+        var debug = abilityDelegatorArguments.parameters['-D']
         if (debug == 'true')
         {
             cmd += ' -D'
         }
-        console.info('cmd : '+cmd)
+        hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+        hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
         abilityDelegator.executeShellCommand(cmd,
             (err: any, d: any) => {
-                console.info('executeShellCommand : err : ' + JSON.stringify(err));
-                console.info('executeShellCommand : data : ' + d.stdResult);
-                console.info('executeShellCommand : data : ' + d.exitCode);
+                hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : err : %{public}s', JSON.stringify(err) ?? '');
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.stdResult ?? '');
+                hilog.info(0x0000, 'testTag', 'executeShellCommand : data : %{public}s', d.exitCode ?? '');
             })
-        console.info('OpenHarmonyTestRunner onRun end')
+        hilog.info(0x0000, 'testTag', '%{public}s', 'OpenHarmonyTestRunner onRun end');
     }
-};
\ No newline at end of file
+}
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/ets/pages/second/second.ets → request/RequestTest_Stage/entry/src/main/ets/pages/index.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.
@@ -12,32 +12,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import router from '@system.router';
+
+import hilog from '@ohos.hilog';
 
 @Entry
 @Component
-struct Second {
-  private content: string = "Second Page"
+struct Index {
+  aboutToAppear() {
+    hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
+    hilog.info(0x0000, 'testTag', '%{public}s', 'TestAbility index aboutToAppear');
+  }
 
+  @State message: string = 'REQUEST TEST'
   build() {
-    Flex({ direction: FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
+    Row() {
+      Column() {
+        Text(this.message)
           .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

request/RequestTest_Stage/entry/src/main/ets/pages/index/index.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
-import { Hypium } from '@ohos/hypium'
-import testsuite from '../../test/List.test'
-
-@Entry
-@Component
-struct Index {
-  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%')
-  }
-
-  aboutToAppear(){
-    let abilityDelegator: any
-    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-    let abilityDelegatorArguments: any
-    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
-    console.info('start run testcase!!!')
-    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
-  }
-}
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/ets/test/List.test.ets

@@ -12,7 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import requestUploadJSUnit from './requestUpload.test'
+
+import requestUploadJSUnit from './requestUpload.test';
 import requestDownloadJSUnit from './requestDownload.test';
 
 export default function testsuite() {

request/RequestTest_Stage/entry/src/main/ets/test/requestDownload.test.ets

-// @ts-nocheck
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * 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
@@ -14,12 +13,12 @@
  * limitations under the License.
  */
 
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 import request from "@ohos.request";
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function requestDownloadJSUnit() {
-  describe('requestDownloadTest', function () {
+  describe('requestDownloadJSUnit', function () {
     console.info('################################request download Test start');
 
     /**
@@ -112,6 +111,5 @@ export default function requestDownloadJSUnit() {
       console.info("-----------------------SUB_REQUEST_DOWNLOAD_STAGE_API_PROMISE_0001 end-----------------------");
       done();
     });
-
-  })
+  });
 }
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/ets/test/requestUpload.test.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +13,12 @@
  * limitations under the License.
  */
 
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 import request from "@ohos.request";
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
 
 export default function requestUploadJSUnit() {
-  describe('requestUploadTest', function () {
+  describe('requestUploadJSUnit', function () {
     console.info('################################request upload Test start');
 
     /**

request/RequestTest_Stage/entry/src/main/module.json

 {
   "module": {
-        "name": "phone",
+    "name": "entry_test",
     "type": "entry",
-        "srcEntrance": "./ets/Application/AbilityStage.ts",
-        "description": "$string:phone_entry_dsc",
+    "srcEntrance": "./ets/Application/MyAbilityStage.ts",
+    "description": "$string:entry_desc",
     "mainElement": "MainAbility",
     "deviceTypes": [
       "phone"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
-        "uiSyntax": "ets",
     "pages": "$profile:main_pages",
     "abilities": [
       {
-                "name": "com.acts.request.test.MainAbility",
+        "name": "MainAbility",
         "srcEntrance": "./ets/MainAbility/MainAbility.ts",
-                "description": "$string:phone_entry_main",
+        "description": "$string:MainAbility_desc",
         "icon": "$media:icon",
-                "label": "$string:entry_label",
+        "label": "$string:MainAbility_label",
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:white",
         "visible": true,
-                "orientation": "portrait",
-                "launchType": "singleton",
         "skills": [
           {
+            "entities": [
+              "entity.system.home"
+            ],
             "actions": [
               "action.system.home"
-                        ],
-                        "entities":[
-                            "entity.system.home"
             ]
           }
         ]

request/RequestTest_Stage/entry/src/main/resources/base/element/color.json

+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/resources/base/element/string.json

 {
   "string": [
     {
-            "name": "phone_entry_dsc",
-            "value": "i am an entry for phone"
+      "name": "entry_desc",
+      "value": "description"
     },
     {
-            "name": "phone_entry_main",
-            "value": "the phone entry ability"
+      "name": "MainAbility_desc",
+      "value": "description"
     },
     {
-            "name": "entry_label",
-            "value": "ActsImeAbilityTest"
-        },
-        {
-            "name": "ime_description",
-            "value": "input method extension ability."
-        },
-        {
-            "name": "ime_label",
-            "value": "inputMethod extension ability services."
-        },
-        {
-            "name": "ime_label_1",
-            "value": "inputMethod extension ability services_1."
-        },
-        {
-            "name": "description_application",
-            "value": "demo for test"
-        },
-        {
-            "name": "app_name",
-            "value": "Demo"
+      "name": "MainAbility_label",
+      "value": "ActsTimeAPITest"
     }
   ]
 }
\ No newline at end of file

request/RequestTest_Stage/entry/src/main/resources/base/profile/main_pages.json

 {
   "src": [
-        "pages/index/index",
-        "pages/second/second"
+    "pages/index"
   ]
 }

request/RequestTest_ets/entry/src/main/ets/MainAbility/pages/index.ets

@@ -26,7 +26,7 @@ struct MyComponent {
       alignItems: ItemAlign.Center,
       justifyContent: FlexAlign.Center
     }) {
-      Text('REQUEST ETS TEST')
+      Text('REQUEST TEST')
         .fontSize(50)
         .fontWeight(FontWeight.Bold)
     }

request/RequestTest_ets/entry/src/main/ets/test/List.test.ets

@@ -15,7 +15,7 @@
 
 import requestUploadJSUnit from './requestUpload.test';
 import requestDownloadJSUnit from './requestDownload.test';
-import requestSystemJSUnit from './requestSystemJSUnit';
+import requestSystemJSUnit from './requestSystem.test';
 
 export default function testsuite() {
   requestUploadJSUnit()

request/RequestTest_ets/entry/src/main/ets/test/requestDownload.test.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +13,9 @@
  * limitations under the License.
  */
 
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 import request from "@ohos.request";
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
 
 export default function requestDownloadJSUnit() {
   describe('requestDownloadTest', function () {

request/RequestTest_ets/entry/src/main/ets/test/requestSystemJSUnit.ets → request/RequestTest_ets/entry/src/main/ets/test/requestSystem.test.ets

-// @ts-nocheck
 /**
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,20 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, it, expect} from 'hypium/index';
+
 import request from '@system.request';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
 
 export default function requestSystemJSUnit() {
   describe('requestSystemJSUnit', function () {
     console.info('****************start requestSystemTest*****************')
 
-    /**
-     * sleep function.
-     */
-    function sleep(date, time){
-      while(Date.now() - date <= time);
-    }
-
     /**
      * @tc.name: ohos.SUB_REQUESTSYSTEM_UPLOAD_API_0001
      * @tc.desc: Upload files.
@@ -70,14 +63,13 @@ export default function requestSystemJSUnit() {
       }
       try{
         let result = request.upload(UploadRequestOptions);
-        sleep(500)
         console.info('SUB_REQUESTSYSTEM_UPLOAD_API_0001 upload err:' + result);
-        expect(true).assertEqual(true)
+        expect(true).assertEqual(true);
       }catch(err){
         console.info('SUB_REQUESTSYSTEM_UPLOAD_API_0001 upload err:' + err);
       }
       console.info("-----------------------SUB_REQUESTSYSTEM_UPLOAD_API_0001 end-----------------------");
-      done()
+      done();
     });
 
     /**
@@ -109,15 +101,14 @@ export default function requestSystemJSUnit() {
         }
       }
       try{
-        let result = request.download(DownloadRequestOptions)
-        sleep(500)
+        let result = request.download(DownloadRequestOptions);
         console.info('SUB_REQUESTSYSTEM_DOWNLOAD_API_0001 upload err:' + result);
-        expect(result == null).assertEqual(true)
+        expect(result == null).assertEqual(true);
       }catch(err){
         console.info('SUB_REQUESTSYSTEM_DOWNLOAD_API_0001 download complete' + err);
       }
-      done()
       console.info("-----------------------SUB_REQUESTSYSTEM_DOWNLOAD_API_0001 end-----------------------");
+      done();
     });
 
     /**
@@ -145,12 +136,11 @@ export default function requestSystemJSUnit() {
           console.info('SUB_REQUESTSYSTEM_DOWNLOADCOMPLETE_API_0001 download complete');
         }
       }
-      let result = request.onDownloadComplete(OnDownloadCompleteOptions)
-      sleep(500)
+      let result = request.onDownloadComplete(OnDownloadCompleteOptions);
       console.info('SUB_REQUESTSYSTEM_DOWNLOADCOMPLETE_API_0001 upload err:' + result);
-      expect(result == null).assertEqual(true)
-      done()
+      expect(result == null).assertEqual(true);
       console.info("-----------------------SUB_REQUESTSYSTEM_DOWNLOADCOMPLETE_API_0001 end-----------------------");
+      done();
     });
   })
 }

request/RequestTest_ets/entry/src/main/ets/test/requestUpload.test.ets

-// @ts-nocheck
 /*
  * Copyright (c) 2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +13,9 @@
  * limitations under the License.
  */
 
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
-import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 import request from "@ohos.request";
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index";
 
 export default function requestUploadJSUnit() {
   describe('requestUploadTest', function () {