调整callback keepAlive自动化测试例

pages/index/basicTest.test.js

@@ -42,7 +42,20 @@ if (process.env.UNI_PROJECT_TYPE === '2.0' && process.env.uniTestPlatformInfo.to
       const res = await page.callMethod('jest_testTypeFromAppJs')
       expect(res).toEqual(true)
     })     
+  })
+}
+
+if (process.env.UNI_PROJECT_TYPE === '2.0' && (process.env.uniTestPlatformInfo.toLocaleLowerCase().startsWith('ios') || process.env.uniTestPlatformInfo.startsWith('android'))) {
+  describe('testCallbackKeepAlive',  () => {
+    it("jest_testCallbackKeepAlive", async () => {
+      const res = await page.callMethod('jest_testCallbackKeepAlive')
+      expect(res).toEqual(true)
+    })
+  })
+}
 
+if (process.env.UNI_PROJECT_TYPE === '1.0' && (process.env.uniTestPlatformInfo.toLocaleLowerCase().startsWith('ios') || process.env.uniTestPlatformInfo.startsWith('android'))) {
+  describe('testCallbackKeepAlive',  () => {
     it("jest_testCallbackKeepAlive", async () => {
       const res = await page.callMethod('jest_testCallbackKeepAlive')
       expect(res).toEqual(true)

pages/index/basicTest.uvue

@@ -23,6 +23,8 @@
 import { runTests, Result } from '../../uni_modules/uts-tests'
 // #ifdef APP-IOS
 import { testTypeFromAppJs, Options } from '@/uni_modules/uts-ios-tests';
+// #endif
+// #ifdef APP
 import { onTest1, testKeepAlive, testKeepAliveOption, TestKeepAliveClass } from '@/uni_modules/uts-tests'
 // #endif
 export default {
@@ -58,56 +60,110 @@ export default {
       } as Options)
     },
     // #endif
-    // #ifdef APP-IOS
+    // #ifdef APP
     jest_testCallbackKeepAlive() {
       
+        let ret = true
+        let count = 0;
+        
         onTest1((res) => {
-        console.log(res)
+          count++;
+          console.log("onTest1 callback =====> ", res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         testKeepAlive((res) => {
+          count++;
           console.log(res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         testKeepAliveOption({
           a: "testKeepAliveOption",
           success: (res) => {
-          console.log(res)
+            count++;
+            console.log("testKeepAliveOption callback =====> ", res)
           }
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         TestKeepAliveClass.onTestStatic((res) => {
-        console.log(res)
+          count++;
+          console.log("onTestStatic callback =====> ", res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         TestKeepAliveClass.testKeepAliveStatic((res) => {
-        console.log(res)
+          count++;
+          console.log("testKeepAliveStatic callback =====> ", res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         TestKeepAliveClass.testKeepAliveOptionStatic({
           a: "testKeepAliveOption",
           success: (res) => {
-          console.log(res)
+            count++;
+            console.log("testKeepAliveOptionStatic callback =====> ", res)
           }
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         const obj = new TestKeepAliveClass()
         obj.onTest((res) => {
-        console.log(res)
+          count++;
+          console.log("TestKeepAliveClass.onTest callback =====> ", res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         obj.testKeepAlive((res) => {
-        console.log(res)
+          count++;
+          console.log("TestKeepAliveClass.testKeepAlive callback =====> ", res)
         })
         
+        if (count < 2) {
+          ret = false
+        }
+        count = 0;
+        
         obj.testKeepAliveOption({
           a: "testKeepAliveOption",
           success: (res) => {
-          console.log(res)
+            count++;
+            console.log("TestKeepAliveClass.testKeepAliveOption callback =====> ", res)
           }
         })
-      
-      return true
+        if (count < 2) {
+          ret = false
+        }
+        return ret
     }
     // #endif
   },

pages/index/basicTest.vue

@@ -20,6 +20,7 @@
     import {
         runTests
     } from '../../uni_modules/uts-tests'
+    import { onTest1, testKeepAlive, testKeepAliveOption, TestKeepAliveClass } from '@/uni_modules/uts-tests'
     export default {
         data() {
             return {
@@ -34,6 +35,110 @@
             test() {
                 this.result = runTests()
                 console.log(this.result)
+            },
+               
+            jest_testCallbackKeepAlive() {
+              let ret = true
+              let count = 0;
+              
+              onTest1((res) => {
+                count++;
+                console.log("onTest1 callback =====> ", res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              testKeepAlive((res) => {
+                count++;
+                console.log(res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              testKeepAliveOption({
+                a: "testKeepAliveOption",
+                success: (res) => {
+                  count++;
+                  console.log("testKeepAliveOption callback =====> ", res)
+                }
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              TestKeepAliveClass.onTestStatic((res) => {
+                count++;
+                console.log("onTestStatic callback =====> ", res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              TestKeepAliveClass.testKeepAliveStatic((res) => {
+                count++;
+                console.log("testKeepAliveStatic callback =====> ", res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              TestKeepAliveClass.testKeepAliveOptionStatic({
+                a: "testKeepAliveOption",
+                success: (res) => {
+                  count++;
+                  console.log("testKeepAliveOptionStatic callback =====> ", res)
+                }
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              const obj = new TestKeepAliveClass()
+              obj.onTest((res) => {
+                count++;
+                console.log("TestKeepAliveClass.onTest callback =====> ", res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              obj.testKeepAlive((res) => {
+                count++;
+                console.log("TestKeepAliveClass.testKeepAlive callback =====> ", res)
+              })
+              
+              if (count < 2) {
+                ret = false
+              }
+              count = 0;
+              
+              obj.testKeepAliveOption({
+                a: "testKeepAliveOption",
+                success: (res) => {
+                  count++;
+                  console.log("TestKeepAliveClass.testKeepAliveOption callback =====> ", res)
+                }
+              })
+              if (count < 2) {
+                ret = false
+              }
+              return ret
             }
         }
     }

uni_modules/uts-tests/utssdk/index.uts

@@ -72,26 +72,20 @@ export function runTests() : UTSJSONObject {
   }
 }
 
-// #ifdef APP-IOS
+// #ifdef APP
 import { expect } from './tests.uts'
 
 export type TestKeepAliveCallback = (res: string) => void
 
 export function onTest1(callback: TestKeepAliveCallback) {
   callback("1")
-  setTimeout(()=> {
   callback("2")
-    expect(callback != null).toEqual(true)
-  }, 20)
 }
 
 @UTSJS.keepAlive
 export function testKeepAlive(callback: TestKeepAliveCallback) {
-  callback("3")
-  setTimeout(()=> {
-    callback("4")
-    expect(callback != null).toEqual(true)
-  }, 22)
+  callback("1")
+  callback("2")
 }
 
 export type TestKeepAliveOption = {
@@ -102,11 +96,8 @@ export type TestKeepAliveOption = {
 @UTSJS.keepAlive
 export function testKeepAliveOption(option: TestKeepAliveOption) {
   console.log(option.a);
-  option.success?.("11")
-  setTimeout(() => {
-    option.success?.("22")
-    expect(option.success != null).toEqual(true)
-  }, 30)
+  option.success?.("1")
+  option.success?.("2")
 }
 
 export class TestKeepAliveClass {
@@ -116,56 +107,38 @@ export class TestKeepAliveClass {
   }
   onTest(callback: TestKeepAliveCallback) {
     callback("1")
-    setTimeout(()=> {
     callback("2")
-      expect(callback != null).toEqual(true)
-    }, 40)
   }
   
   @UTSJS.keepAlive
   testKeepAlive(callback: TestKeepAliveCallback) {
-    callback("3")
-    setTimeout(()=> {
-      callback("4")
-      expect(callback != null).toEqual(true)
-    }, 42)
+    callback("1")
+    callback("2")
   }
   
   @UTSJS.keepAlive
   testKeepAliveOption(option: TestKeepAliveOption) {
     console.log(option.a);
-    option.success?.("11")
-    setTimeout(() => {
-      option.success?.("22")
-      expect(option.success != null).toEqual(true)
-    }, 45)
+    option.success?.("1")
+    option.success?.("2")
   }
   
   static onTestStatic(callback: TestKeepAliveCallback) {
     callback("1")
-    setTimeout(()=> {
     callback("2")
-      expect(callback != null).toEqual(true)
-    }, 40)
   }
   
   @UTSJS.keepAlive
   static testKeepAliveStatic(callback: TestKeepAliveCallback) {
-    callback("3")
-    setTimeout(()=> {
-      callback("4")
-      expect(callback != null).toEqual(true)
-    }, 50)
+    callback("1")
+    callback("2")
   }
   
   @UTSJS.keepAlive
-  testKeepAliveOptionStatic(option: TestKeepAliveOption) {
+  static testKeepAliveOptionStatic(option: TestKeepAliveOption) {
     console.log(option.a);
-    option.success?.("11")
-    setTimeout(() => {
-      option.success?.("22")
-      expect(option.success != null).toEqual(true)
-    }, 52)
+    option.success?.("1")
+    option.success?.("2")
   }
 }
 // #endif