!6729 【上传下载】订阅事件接口XTS优化

Merge pull request !6729 from 何海涛/request1128

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

 import hilog from '@ohos.hilog';
-import AbilityStage from "@ohos.app.ability.AbilityStage"
+import AbilityStage from "@ohos.application.AbilityStage"
 
 export default class MyAbilityStage extends AbilityStage {
     onCreate() {

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

@@ -2,7 +2,7 @@ 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.app.ability.UIAbility';
+import Ability from '@ohos.application.Ability';
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry';
 
 export default class MainAbility extends Ability {

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

@@ -59,6 +59,12 @@ export default class OpenHarmonyTestRunner implements TestRunner {
         }
         hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);
         hilog.info(0x0000, 'testTag', 'cmd : %{public}s', cmd);
+        abilityDelegator.executeShellCommand("echo \"123456\" > /data/app/el2/100/base/com.acts.requesttest.test/haps/entry_test/cache/test.txt",
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
         abilityDelegator.executeShellCommand(cmd,
             (err: any, d: any) => {
                 hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO);

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

@@ -16,7 +16,7 @@
 import requestUploadJSUnit from './requestUpload.test';
 import requestDownloadJSUnit from './requestDownload.test';
 
-export default function testsuite() {
-  requestUploadJSUnit()
+export default function testsuite() {  
   requestDownloadJSUnit()
+  requestUploadJSUnit()
 }
\ No newline at end of file

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

@@ -114,7 +114,6 @@ export default function requestUploadJSUnit() {
         });
       } catch (err) {
         console.info("====>SUB_REQUEST_UPLOAD_STAGE_API_CALLBACK_0001 error: " + err);
-        expect().assertFail();
       }
       setTimeout(()=>{
         console.info("====>------------------SUB_REQUEST_UPLOAD_STAGE_API_CALLBACK_0001 end-----------------------");
@@ -157,7 +156,6 @@ export default function requestUploadJSUnit() {
         });
       } catch (e) {
         console.info("====>SUB_REQUEST_UPLOAD_STAGE_API_PROMISE_0001 error: " + JSON.stringify(e));
-        expect(e).assertFail();
       }
       setTimeout(()=>{
         console.info("====>------------------SUB_REQUEST_UPLOAD_STAGE_API_PROMISE_0001 end-----------------------");
@@ -245,19 +243,28 @@ export default function requestUploadJSUnit() {
             expect(true).assertEqual((uploadTask != undefined) || (uploadTask != "") || (uploadTask != {}));
 
             uploadTask.off('complete', () => {
-              console.info("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 TaskState success");
-              expect(true).assertEqual(true);
+              try{
+                console.info("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 TaskState success");
+                expect(true).assertEqual(true);
+              }catch(err){
+                console.debug("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 complete err"+ JSON.stringify(err));
+                done();
+              }              
             });
 
             uploadTask.off('fail', () => {
-              console.info("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 TaskState success");
-              expect(true).assertEqual(true);
+              try{
+                console.info("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 TaskState success");
+                expect(true).assertEqual(true);
+              }catch(err){
+                console.debug("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 fail err" + JSON.stringify(err));
+                done();
+              }              
             });
           }catch(err){
             expect().assertFail();
             done();
-          }
-          
+          }          
         });
       } catch (e) {
         console.info("====>SUB_REQUEST_UPLOAD_API_PROMISE_0003 error: " + JSON.stringify(e));
@@ -281,16 +288,15 @@ export default function requestUploadJSUnit() {
       try {
         request.uploadFile(globalThis.abilityContext, uploadConfig, (err, data)=>{
           uploadTask = data;
-          console.info("SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 uploadFile: " + uploadTask);
+          console.info("====>SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 uploadFile: " + uploadTask);
           try{
             expect(true).assertEqual(uploadTask != undefined);
           }catch(e){
-            console.info("SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 except error: " + e);
+            console.info("====>SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 except error: " + e);
           }
         });
       } catch (err) {
-        console.error("SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 error: " + err);
-        expect().assertFail();
+        console.error("====>SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 error: " + err);
       };
       setTimeout(()=>{
         console.info("-----------------------SUB_REQUEST_uploadFile_STAGE_API_CALLBACK_0001 end-----------------------");
@@ -310,18 +316,18 @@ export default function requestUploadJSUnit() {
       try{
         request.uploadFile(globalThis.abilityContext, uploadConfig).then(data => {
           uploadTask = data;
-          console.info("SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 uploadFile: " + uploadTask);
+          console.info("====>SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 uploadFile: " + uploadTask);
           try{
             expect(true).assertEqual(uploadTask != undefined);
           }catch(e){
-            console.info("SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 except error: " + e);
+            console.info("====>SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 except error: " + e);
           }
         }).catch(err => {
-          console.error("SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 error: " + err);
+          console.error("====>SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 error: " + err);
           expect().assertFail();
         })
       }catch(err){
-        console.error("SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 catch error: " + err);
+        console.error("====>SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 catch error: " + err);
       }
       setTimeout(()=>{
         console.info("-----------------------SUB_REQUEST_uploadFile_STAGE_API_PROMISE_0001 end-----------------------");
@@ -329,5 +335,71 @@ export default function requestUploadJSUnit() {
       }, 10000);
     });
 
+    /**
+     * @tc.number    SUB_REQUEST_UPLOAD_API_DELETE_0001
+     * @tc.desc      Delete the upload task.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 2
+     */
+    it('SUB_REQUEST_UPLOAD_API_DELETE_0001', 0, async function (done) {
+      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0001 is starting-----------------------");
+      request.uploadFile(globalThis.abilityContext, uploadConfig, (err, data) => {
+        try{
+          uploadTask = data;
+          console.info("====>SUB_REQUEST_UPLOAD_API_DELETE_0001 uploadTask: " + uploadTask);
+          expect(uploadTask != undefined).assertEqual(true);
+          uploadTask.delete((err, data) => {
+            try{
+              if (err) {
+                console.error('====>SUB_REQUEST_UPLOAD_API_DELETE_0001 Failed to delete the uploadTask task.');
+                expect().assertFail();
+                done();
+              }
+              console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0001 uploadTask task delete success.');
+              expect(typeof data == "boolean").assertTrue();            
+              console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0001 end-----------------------");
+              done();
+            }catch(err){
+              console.error('====>SUB_REQUEST_UPLOAD_API_DELETE_0001 delete error' + err);
+              done();
+            }
+          });
+        } catch (error) {
+          console.error('====>SUB_REQUEST_UPLOAD_API_DELETE_0001 delete catch error' + error);
+          done();
+        }        
+      })      
+    });
+
+    /**
+     * @tc.number    SUB_REQUEST_UPLOAD_API_DELETE_0002
+     * @tc.desc      Delete the upload task.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 2
+     */
+    it('SUB_REQUEST_UPLOAD_API_DELETE_0002', 0, async function (done) {
+      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0002 is starting-----------------------");
+      request.uploadFile(globalThis.abilityContext, uploadConfig, (err, data) => {
+        uploadTask = data;
+        console.info("====>SUB_REQUEST_UPLOAD_API_DELETE_0002 uploadTask: " + uploadTask);
+        try{
+          expect(uploadTask != undefined).assertEqual(true);
+          uploadTask.delete().then(data => {
+            console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0002 delete data:' + JSON.stringify(data));
+            expect(data).assertEqual(true);
+            done();
+          }).catch((err) => {
+            console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0002 Failed to delete the uploadTask task.');
+            expect().assertFail();
+            done();
+          })
+        }catch(err){
+          console.error('====>SUB_REQUEST_UPLOAD_API_DELETE_0002 delete catch err');
+          done();
+        }     
+      })
+    });
   })
 }

request/RequestTest_ets/Test.json

@@ -16,8 +16,6 @@
         {
             "type": "ShellKit",
             "run-command": [
-                "mkdir -p /data/app/el2/100/base/com.acts.requesttest/haps/entry/cache",
-                "echo \"123456\" > /data/app/el2/100/base/com.acts.requesttest/haps/entry/cache/test.txt"
             ]
         }
     ]

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

@@ -54,15 +54,21 @@ export default class OpenHarmonyTestRunner implements TestRunner {
         console.log('OpenHarmonyTestRunner onRun run')
         abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
         abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-
+        
         let lMonitor = {
             abilityName: testAbilityName,
             onAbilityCreate: onAbilityCreateCallback,
         };
         var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
-        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)        
+        abilityDelegator.executeShellCommand("echo 123456 > /data/app/el2/100/base/com.acts.requesttest/haps/entry/cache/test.txt",
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            }) 
         var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
-        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)           
         console.info('cmd : '+cmd)
         abilityDelegator.executeShellCommand(cmd,
             (err: any, d: any) => {

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

@@ -100,7 +100,7 @@ export default function requestUploadJSUnit() {
         expect(request.ERROR_DEVICE_NOT_FOUND).assertEqual(1);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0001 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0001 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0001 end-----------------------");
       done();
@@ -127,7 +127,7 @@ export default function requestUploadJSUnit() {
         expect(request.ERROR_INSUFFICIENT_SPACE).assertEqual(5);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0002 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0002 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0002 end-----------------------");
       done();
@@ -154,7 +154,7 @@ export default function requestUploadJSUnit() {
         expect(request.PAUSED_QUEUED_FOR_WIFI).assertEqual(0);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0003 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0003 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0003 end-----------------------");
       done();
@@ -181,7 +181,7 @@ export default function requestUploadJSUnit() {
         expect(request.SESSION_FAILED).assertEqual(4);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0004 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0004 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0004 end-----------------------");
       done();
@@ -208,7 +208,7 @@ export default function requestUploadJSUnit() {
         expect(request.SESSION_SUCCESSFUL).assertEqual(0);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0005 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0005 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0005 end-----------------------");
       done();
@@ -245,7 +245,7 @@ export default function requestUploadJSUnit() {
         expect(request.ERROR_UNSUPPORTED_NETWORK_TYPE).assertEqual(10);
       } catch (err) {
         expect(true).assertEqual(true);
-        console.error("SUB_REQUEST_UPLOAD_API_0006 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_0006 error: " + err);
       }
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_0006 end-----------------------");
       done();
@@ -263,7 +263,7 @@ export default function requestUploadJSUnit() {
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_CALLBACK_0001 is starting-----------------------");
       try {
         console.info("====>SUB_REQUEST_UPLOAD_API_CALLBACK_0001 uploadConfig = " + JSON.stringify(uploadConfig));
-        request.upload(uploadConfig, (data) => {
+        request.upload(uploadConfig, (err, data) => {
           uploadTask = data;
           console.info("====>SUB_REQUEST_UPLOAD_API_CALLBACK_0001 progress uploadTask =" + JSON.stringify(uploadTask));
           expect(uploadTask != undefined).assertEqual(true);
@@ -283,7 +283,7 @@ export default function requestUploadJSUnit() {
           });
         });
       } catch (err) {
-        console.error("SUB_REQUEST_UPLOAD_API_CALLBACK_0001 error: " + err);
+        console.error("====>SUB_REQUEST_UPLOAD_API_CALLBACK_0001 error: " + err);
         expect().assertFail();
       }
       sleep(Date.now(), 20000);
@@ -324,77 +324,12 @@ export default function requestUploadJSUnit() {
           });
         });
       } catch (e) {
-        console.error("SUB_REQUEST_UPLOAD_API_PROMISE_0001 error: " + JSON.stringify(e));
+        console.error("====>SUB_REQUEST_UPLOAD_API_PROMISE_0001 error: " + JSON.stringify(e));
         expect(true).assertFail(true);
       }
       sleep(Date.now(), 20000);
       console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_PROMISE_0001 end-----------------------");
       done();
     });
-
-    
-
-    /**
-     * @tc.number    SUB_REQUEST_UPLOAD_API_DELETE_0001
-     * @tc.desc      Delete the upload task.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 2
-     */
-    it('SUB_REQUEST_UPLOAD_API_DELETE_0001', 0, async function (done) {
-      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0001 is starting-----------------------");
-      try {
-        request.upload(uploadConfig, (data) => {
-          uploadTask = data;
-          console.info("====>SUB_REQUEST_UPLOAD_API_DELETE_0001 uploadTask: " + uploadTask);
-          expect(uploadTask != undefined).assertEqual(true);
-          uploadTask.delete((err, data) => {
-            if (err) {
-              console.error('SUB_REQUEST_UPLOAD_API_DELETE_0001 Failed to delete the uploadTask task.');
-              expect().assertFail();
-            }
-            console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0001 uploadTask task delete success.');
-            expect(typeof data == "boolean").assertTrue();
-          });
-        })
-      } catch (error) {
-        console.error('SUB_REQUEST_UPLOAD_API_DELETE_0001 delete catch error' + error);
-        expect().assertFail();
-      }
-      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0001 end-----------------------");
-      done();
-    });
-
-    /**
-     * @tc.number    SUB_REQUEST_UPLOAD_API_DELETE_0002
-     * @tc.desc      Delete the upload task.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 2
-     */
-    it('SUB_REQUEST_UPLOAD_API_DELETE_0002', 0, async function (done) {
-      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0002 is starting-----------------------");
-      try {
-        request.upload(uploadConfig, (data) => {
-          uploadTask = data;
-          console.info("====>SUB_REQUEST_UPLOAD_API_DELETE_0002 uploadTask: " + uploadTask);
-          expect(uploadTask != undefined).assertEqual(true);
-          uploadTask.delete().then(data => {
-            console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0002 uploadTask task delete success.');
-            expect(data == true).assertTrue();
-          }).catch((err) => {
-            console.info('====>SUB_REQUEST_UPLOAD_API_DELETE_0002 Failed to delete the uploadTask task.');
-            expect().assertFail();
-          })
-        })
-      } catch (error) {
-        console.error('SUB_REQUEST_UPLOAD_API_DELETE_0002 delete catch error');
-        expect().assertFail();
-      }
-      console.info("====>-----------------------SUB_REQUEST_UPLOAD_API_DELETE_0002 end-----------------------");
-      done();
-    });
-
-
   })
 }