1、baidu，frontPage，search操作断言修改

2、wechat，send_dynamic，video操作断言修改
3、youtube，断言修改

3 files changed, 28 insertions, 18 deletions

diff --git a/App_automation/air_test_auto/app/baidu/baidu.py b/App_automation/air_test_auto/app/baidu/baidu.py
index 0782754..ba91eae 100644
--- a/App_automation/air_test_auto/app/baidu/baidu.py
+++ b/App_automation/air_test_auto/app/baidu/baidu.py
@@ -146,7 +146,7 @@ def login():
 
 def search():
     try:
-        sleep(120)
+        sleep(60)
         stop_app("com.baidu.searchbox")  # 关闭app
         start_app("com.baidu.searchbox")  # 打开app
         sleep(20)
@@ -155,7 +155,10 @@ def search():
         sleep(20)
         try:
             snapshot(msg="baidu_search")
-            assert_equal(poco(text="全部").exists(), True, "baidu_search succeeded")
+            if poco(text="全部").exists():
+                assert_equal(poco(text="全部").exists(), True, "baidu_search succeeded")
+            else:
+                assert_equal(poco(text="综合").exists(), True, "baidu_search succeeded")
             print('baidu_search succeeded')
             print('The test case succeeded', flush=True)
             stop_app("com.baidu.searchbox")
@@ -172,7 +175,7 @@ def search():
 
 def video():
     try:
-        sleep(120)
+        sleep(60)
         stop_app("com.baidu.searchbox")  # 关闭app
         start_app("com.baidu.searchbox")  # 打开app
         sleep(60)
@@ -198,7 +201,10 @@ def video():
         sleep(20)
         try:
             snapshot(msg="baidu_video")
-            assert_equal(poco(text="全部").exists(), True, "baidu_video succeeded")
+            if poco(text="全部").exists():
+                assert_equal(poco(text="全部").exists(), True, "baidu_video succeeded")
+            else:
+                assert_equal(poco(text="综合").exists(), True, "baidu_video succeeded")
             print("baidu_video succeeded")
             print("The test case succeeded", flush=True)
             stop_app("com.baidu.searchbox")
@@ -236,7 +242,10 @@ def frontPage():
             sleep(120)
         try:
             snapshot(msg="baidu_frontPage")
-            assert_equal(poco(text="全部").exists(), True, "baidu_frontPage succeeded")
+            if poco(text="全部").exists():
+                assert_equal(poco(text="全部").exists(), True, "baidu_frontPage succeeded")
+            else:
+                assert_equal(poco(text="综合").exists(), True, "baidu_frontPage succeeded")
             print('baidu_frontPage succeeded')
             print('The test case succeeded', flush=True)
             stop_app("com.baidu.searchbox")
diff --git a/App_automation/air_test_auto/app/wechat/wechat.py b/App_automation/air_test_auto/app/wechat/wechat.py
index b91325f..5966d58 100644
--- a/App_automation/air_test_auto/app/wechat/wechat.py
+++ b/App_automation/air_test_auto/app/wechat/wechat.py
@@ -461,8 +461,8 @@ def send_dynamic():
         set_current(deviceid1)
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")  # 打开app
-        sleep(30)
-        closegoogle()
+        sleep(20)
+        #closegoogle()
         if exists(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676)))
             sleep(2)
@@ -474,10 +474,12 @@ def send_dynamic():
         sleep(10)
         if poco(text="我知道了").exists():
             poco(text="我知道了").click()
-        poco(text="这一刻的想法...").wait(timeout=10).set_text("hello")
+        poco(text="这一刻的想法...").click()
+        message = 'test' + str(time.strftime("%Y%m%d%H%M", time.localtime()))
+        text(message)
         poco(text="发表").click()
         sleep(10)
-        poco(name="android.widget.ImageView").click()
+        poco(name="com.tencent.mm:id/nh").click()
         sleep(2)
         poco(text="评论").click()
         sleep(2)
@@ -577,13 +579,13 @@ def video():
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")  # 打开app
         sleep(20)
-        closegoogle()
         if exists(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676)))
             sleep(2)
         if poco(text="发现").exists():
             poco(text="发现").click()
             sleep(2)
+        sleep(5)
         poco(text="视频号").click()
         sleep(15)
         if poco(text="允许").exists():
@@ -611,7 +613,7 @@ def video():
         sleep(120)
         try:
             snapshot(msg="wechat_video")
-            assert_not_equal(poco(text="轻触重试").exists(), True, "wechat_video succeeded")
+            assert_equal(poco(desc="表情").exists(), True, "wechat_video succeeded")
             print('wechat_video succeeded')
             print("The test case succeeded", flush=True)
             stop_app("com.tencent.mm")
@@ -673,8 +675,8 @@ def search():
         set_current(deviceid1)
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")  # 打开app
-        sleep(30)
-        closegoogle()
+        sleep(20)
+        # closegoogle()
         if exists(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676)))
             sleep(2)
@@ -748,7 +750,7 @@ def talk_look():
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")  # 打开app
         sleep(20)
-        closegoogle()
+        #closegoogle()
         if exists(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417745106.png", record_pos=(0.125, 1.015), resolution=(1236, 2676)))
             sleep(2)
@@ -846,14 +848,13 @@ def Voice_calls():
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")
         sleep(120)
-        closegoogle()
         if exists(Template(r"tpl1664417643518.png", record_pos=(-0.121, 1.01), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417643518.png", record_pos=(-0.121, 1.01), resolution=(1236, 2676)))
             sleep(2)
         if poco(text="通讯录").exists():
             poco(text="通讯录").click()
             sleep(2)
-        sleep(2)
+        sleep(5)
         poco(desc="搜索").click()
         sleep(5)
         text("test",True)
@@ -955,7 +956,7 @@ def video_call():
         stop_app("com.tencent.mm")
         start_app("com.tencent.mm")
         sleep(120)
-        closegoogle()
+        #closegoogle()
         if exists(Template(r"tpl1664417643518.png", record_pos=(-0.121, 1.01), resolution=(1236, 2676))):
             touch(Template(r"tpl1664417643518.png", record_pos=(-0.121, 1.01), resolution=(1236, 2676)))
             sleep(2)
diff --git a/App_automation/air_test_auto/app/youtube/youtube.py b/App_automation/air_test_auto/app/youtube/youtube.py
index 245388b..97fdef4 100644
--- a/App_automation/air_test_auto/app/youtube/youtube.py
+++ b/App_automation/air_test_auto/app/youtube/youtube.py
@@ -99,7 +99,7 @@ def shorts():
         sleep(20)
         try:
             snapshot(msg="youtube_shorts")
-            assert_equal(poco(text="订阅").exists(), True, "youtube_shorts succeeded")
+            assert_equal(poco(text="分享").exists(), True, "youtube_shorts succeeded")
             print('youtube_shorts succeeded')
             print('The test case succeeded', flush=True)
             stop_app("com.google.android.youtube")