update 0912

PageObject/Pages/Others.py

@@ -0,0 +1,118 @@
+from Base.BaseYaml import getYam
+from Base.BaseOperate import OperateElement
+from Base.BaseElements import Element as be
+from PageObject.SumResult import statistics_result
+
+
+class CollectSwipeDelPage:
+    '''
+    滑动删除收藏
+    isOperate: 操作失败，检查点就失败,kwargs: WebDriver driver, String path(yaml配置参数)
+    '''
+
+    def __init__(self, kwargs):
+        self.driver = kwargs["driver"]
+        if kwargs.get("launch_app", "0") == "0":  # 若为空，重新打开app
+            self.driver.launch_app()
+        self.path = kwargs["path"]
+        self.operateElement = OperateElement(self.driver)
+        self.isOperate = True
+        test_msg = getYam(self.path)
+        self.testInfo = test_msg["testinfo"]
+        self.testCase = test_msg["testcase"]
+        self.testcheck = test_msg["check"]
+        self.device = kwargs["device"]
+        self.logTest = kwargs["logTest"]
+        self.caseName = kwargs["caseName"]
+        self.get_value = []
+        self.msg = ""
+
+    '''
+     操作步骤
+     logTest 日记记录器
+    '''
+
+    def operate(self):
+        m_s_g = self.msg + "\n" if self.msg != "" else ""
+        for item in self.testCase:
+            result = self.operateElement.operate(item, self.testInfo, self.logTest, self.device)
+            if not result["result"]:
+                msg = "执行过程中失败，请检查元素是否存在" + item["element_info"]
+                print(msg)
+                self.testInfo[0]["msg"] = msg
+                self.msg = m_s_g + msg
+                self.isOperate = False
+                return False
+
+            if item.get("operate_type", "0") == be.SWIPE_LEFT:  # 根据元素左滑动
+                web_element = self.driver.find_elements_by_id(item["element_info"])[item["index"]]
+                start = web_element.location
+                # 获取控件开始位置的坐标轴
+                startx = start["x"]
+                starty = start["y"]
+                # 获取控件坐标轴差
+                size1 = web_element.size
+
+                width = size1["width"]
+                height = size1["height"]
+                # 计算出控件结束坐标
+                endX = width + startx
+                endY = height + starty
+                self.driver.swipe(endX-50, endY, starty+500, endY)
+            if item.get("operate_type", "0") == be.GET_VALUE:
+                self.get_value.append(result["text"])
+        return True
+
+    def checkPoint(self):
+        result = self.check()
+        if result is not True and be.RE_CONNECT:
+            self.msg = "用例失败重连过一次，失败原因:" + self.testInfo[0]["msg"]
+            self.logTest.buildStartLine(self.caseName + "_失败重连")  # 记录日志
+            # self.operateElement.switchToNative()
+            self.driver.launch_app()
+            self.isOperate = True
+            self.get_value = []
+            self.operate()
+            result = self.check()
+            self.testInfo[0]["msg"] = self.msg
+        self.operateElement.switchToNative()
+
+        statistics_result(result=result, testInfo=self.testInfo, caseName=self.caseName,
+                          driver=self.driver, logTest=self.logTest, devices=self.device,
+                          testCase=self.testCase,
+                          testCheck=self.testcheck)
+        return result
+
+    '''
+    检查点
+    caseName:测试用例函数名 用作统计
+    logTest： 日志记录
+    devices 设备名
+    '''
+
+    def check(self, kwargs={}):
+        result = True
+        m_s_g = self.msg + "\n" if self.msg != "" else ""
+
+        if self.isOperate:
+            for item in self.testcheck:
+                resp = self.operateElement.operate(item, self.testInfo, self.logTest, self.device)
+
+                if not resp["result"]:  # 表示操作出现异常情况检查点为成功
+                    print("操作失败，简单点为成功")
+                    result = True
+                    break
+
+                if resp["text"] in self.get_value:  # 删除后数据对比
+                    msg = "删除数据失败,删除前数据为：" + ".".join(self.get_value) + "当前获取的数据为：" + resp["text"]
+                    self.msg = m_s_g + msg
+                    print(msg)
+                    self.testInfo[0]["msg"] = msg
+                    break
+        else:
+            result = False
+        return result
+
+
+if __name__ == "__main__":
+    pass

PageObject/SumResult.py

@@ -20,7 +20,7 @@ def statistics_result(**kwargs):
     elif kwargs["platformName"] == 'iOS':
         print('Device:', kwargs["devices"])
         get_phone = get_ios_PhoneInfo(kwargs["devices"])
-        phone_name = get_phone["device"] + "_" + get_phone["release"] + "_" + "iOS" + "_" + get_phone["udid"]
+        phone_name = get_phone["device"] + "_" + get_phone["release"] + "_" + "iOS" + "_" + get_phone["duid"]
 
         countInfo(result=kwargs["result"], testInfo=kwargs["testInfo"], caseName=kwargs["caseName"],
                   phoneName=phone_name,

TestCase/aheadTest.py

@@ -1,7 +1,7 @@
 from Base.BaseRunner import ParametrizedTestCase
 import os
 import sys
-from PageObject.Home.PageOperate import PageOperate
+from PageObject.Operate.PageOperate import PageOperate
 from Base.BaseReplace import ReplaceYaml
 
 
@@ -13,7 +13,7 @@ tc_temp = PATH("../yamls/temp.yaml")
 el_android = PATH("../yamls/el_android.yaml")
 el_iOS = PATH("../yamls/el_iOS.yaml")
 
-class PrivacySetTest(ParametrizedTestCase):
+class PrivacySet(ParametrizedTestCase):
 
     def repalce(self, tc, tc_temp):
         if self.platformName == 'android':
@@ -33,8 +33,8 @@ class PrivacySetTest(ParametrizedTestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(PrivacySetTest, cls).setUpClass()
+        super(PrivacySet, cls).setUpClass()
 
     @classmethod
     def tearDownClass(cls):
-        super(PrivacySetTest, cls).tearDownClass()
+        super(PrivacySet, cls).tearDownClass()

TestCase/galleryTest.py

@@ -0,0 +1,73 @@
+
+from Base.BaseRunner import ParametrizedTestCase
+import os
+import sys
+from PageObject.Operate.PageOperate import PageOperate
+from Base.BaseReplace import ReplaceYaml
+
+
+PATH = lambda p: os.path.abspath(
+    os.path.join(os.path.dirname(__file__), p)
+)
+
+tc_temp = PATH("../yamls/temp.yaml")
+el_android = PATH("../yamls/el_android.yaml")
+el_iOS = PATH("../yamls/el_iOS.yaml")
+
+class GalleryTest(ParametrizedTestCase):
+
+    def repalce(self, tc, tc_temp):
+        if self.platformName == 'android':
+            ReplaceYaml(tc, tc_temp, el_android)
+        elif self.platformName == 'iOS':
+            ReplaceYaml(tc, tc_temp, el_iOS)
+
+    def test_gallery_img(self):
+        tc = PATH("../yamls/test_home/test_gallery_img.yaml")
+        self.repalce(tc, tc_temp)
+
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    def test_gallery_video(self):
+        tc = PATH("../yamls/test_home/test_gallery_video.yaml")
+        self.repalce(tc, tc_temp)
+
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    def test_gallery_storyboard(self):
+        tc = PATH("../yamls/test_gallery/test_gallery_storyboard.yaml")
+        self.repalce(tc, tc_temp)
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    def test_gallery_giveup(self):
+        tc = PATH("../yamls/test_gallery/test_gallery_giveup.yaml")
+        self.repalce(tc, tc_temp)
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    @classmethod
+    def setUpClass(cls):
+        super(GalleryTest, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(GalleryTest, cls).tearDownClass()

TestCase/settingsTest.py

@@ -0,0 +1,60 @@
+from Base.BaseRunner import ParametrizedTestCase
+import os
+import sys
+from PageObject.Operate.PageOperate import PageOperate
+from Base.BaseReplace import ReplaceYaml
+
+
+PATH = lambda p: os.path.abspath(
+    os.path.join(os.path.dirname(__file__), p)
+)
+
+tc_temp = PATH("../yamls/temp.yaml")
+el_android = PATH("../yamls/el_android.yaml")
+el_iOS = PATH("../yamls/el_iOS.yaml")
+
+class SetttingsTest(ParametrizedTestCase):
+
+    def repalce(self, tc, tc_temp):
+        if self.platformName == 'android':
+            ReplaceYaml(tc, tc_temp, el_android)
+        elif self.platformName == 'iOS':
+            ReplaceYaml(tc, tc_temp, el_iOS)
+
+    def test_settings_comm(self):
+        tc = PATH("../yamls/test_settings/test_settings_comm.yaml")
+        self.repalce(tc, tc_temp)
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    def test_settings_privacy(self):
+        tc = PATH("../yamls/test_settings/test_settings_privacy.yaml")
+        self.repalce(tc, tc_temp)
+        app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+               "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+
+        page = PageOperate(app)
+        page.operate()
+        page.checkPoint()
+
+    # def test_settings_feedback(self):
+    #     tc = PATH("../yamls/test_settings/test_settings_feedback.yaml")
+    #     self.repalce(tc, tc_temp)
+    #     app = {"logTest": self.logTest, "driver": self.driver, "path": tc_temp,
+    #            "device": self.udid, "platformName": self.platformName, "caseName": sys._getframe().f_code.co_name}
+    #
+    #     page = PageOperate(app)
+    #     page.operate()
+    #     page.checkPoint()
+
+    @classmethod
+    def setUpClass(cls):
+        super(SetttingsTest, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(SetttingsTest, cls).tearDownClass()

yamls/el_android.yaml

@@ -1,14 +1,69 @@
-$el_alert: com.quvideo.xiaoying:id/xiaoying_alert_dialog_positive
-$el_allow: com.android.packageinstaller:id/permission_allow_button
-$el_skip: com.quvideo.xiaoying:id/wel_skip
-$el_creation: com.quvideo.xiaoying:id/layout_fragment_creation
-$el_edit: com.quvideo.xiaoying:id/icon1
-$el_jump: text("跳过")
-$el_check1: text("其他相册")
-$el_jump1: text("跳过")
-$camera: com.quvideo.xiaoying:id/icon2
-$allow2: text("允许")
-$allow3: text("总是允许")
-$nor_cam: text("高清相机")
 $id: id
-$ids: ids
+$ids: ids
+$class_name: class_name
+$class_names: class_names
+$text: text
+$texts: texts
+$index: index
+$xpaths: xpaths
+$xpath: xpath
+$el_alert: com.quvideo.xiaoying:id/xiaoying_alert_dialog_positive
+$el_allow: text("总是允许")
+$el_skip: com.quvideo.xiaoying:id/wel_skip
+$el_center: com.quvideo.xiaoying:id/layout_fragment_creation
+$el_personal: com.quvideo.xiaoying:id/img_studio
+$el_plant: com.quvideo.xiaoying:id/img_find
+$el_home_edit: com.quvideo.xiaoying:id/icon1
+$el_jump: text("跳过")
+$gal_o_album: text("其他相册")
+$el_home_cam: com.quvideo.xiaoying:id/icon2
+$el_allow1: text("允许")
+$nor_cam: text("高清相机")
+$gal_back_icon: com.quvideo.xiaoying:id/xiaoying_com_btn_left
+$gal_video_tab: text("视频")
+$gal_img_tab: text("图片")
+$gal_cover_cho: com.quvideo.xiaoying:id/img_icon
+$gal_img_full: com.quvideo.xiaoying:id/xiaoying_gallery_preview_layout
+$gal_ratate: com.quvideo.xiaoying:id/imgbtn_ratate
+$gal_trim: com.quvideo.xiaoying:id/btn_start_trim
+$gal_zoom: com.quvideo.xiaoying:id/imgbtn_crop
+$gal_img_add: com.quvideo.xiaoying:id/btn_confirm
+$gal_video_add: com.quvideo.xiaoying:id/imgbtn_import
+$gal_expand: com.quvideo.xiaoying:id/btn_expand
+$gal_del: com.quvideo.xiaoying:id/icon
+$gal_save: text("保存")
+$gal_cancel: text("丢弃")
+$gal_next: text("下一步")
+$save_draft: text("存草稿")
+$text_studio: text("工作室")
+$text_more_draft: text("更多草稿")
+$setting_btn: com.quvideo.xiaoying:id/btn_setting
+$net_disable: com.quvideo.xiaoying:id/setting_network_wifi_checkbox
+$rec_notice: text("接收通知推送")
+$rec_checkbox: android:id/checkbox
+$rec_back: com.quvideo.xiaoying:id/img_back
+$rec_lang: text("已选择语言")
+$lang_back: com.quvideo.xiaoying:id/choose_language_back
+$privac_set: text("私信权限")
+$focus_me: text("我关注的人")
+$block_list: text("黑名单")
+$block_remove: text("移除")
+$privacy_disable: com.quvideo.xiaoying:id/setting_privacy_checkbox
+$watermark_enable: com.quvideo.xiaoying:id/setting_watermark_show_checkbox
+$fb_btn: com.quvideo.xiaoying:id/setting_feedback_rl
+$fb_edit: com.quvideo.xiaoying:id/feedback_msg_edit
+$fb_send: com.quvideo.xiaoying:id/feedback_msg_send
+$fb_read: text("阅读全部")
+$fb_back: com.quvideo.xiaoying:id/feedback_left_icon
+$fb_kefu: com.quvideo.xiaoying:id/feedback_left_icon
+$kefu_cancel: text("不用了")
+
+
+
+
+
+
+
+
+
+

yamls/el_iOS.yaml

@@ -1,15 +1,20 @@
-$el_alert: 允许
-$el_allow: 允许
-$el_skip: 跳过
-$el_creation: camerta_n
-$el_edit: //XCUIElementTypeStaticText[@name="剪辑"]
-$el_jump: 跳过
-$el_check1: //XCUIElementTypeButton[@name="下一步"]
-$camera: //XCUIElementTypeStaticText[@name="普通拍摄10s"]
-$allow2: 好
-$allow3: 好
-$nor_cam: 高清相机
-$ids: ios_ids
 $id: ios_id
+$ids: ios_ids
+$class_name: predicate
+$class_names: predicates
+$text: name
+$texts: names
+$index: index
+$xpaths: xpaths
 $xpath: xpath
-$name: name
+$el_alert: com.quvideo.xiaoying:id/xiaoying_alert_dialog_positive
+$el_allow: text("总是允许")
+$el_skip: com.quvideo.xiaoying:id/wel_skip
+$el_center: com.quvideo.xiaoying:id/layout_fragment_creation
+$el_home_edit: com.quvideo.xiaoying:id/icon1
+$el_jump: text("跳过")
+$el_o_album: text("其他相册")
+$el_home_cam: com.quvideo.xiaoying:id/icon2
+$el_allow2: text("允许")
+$nor_cam: text("高清相机")
+$gal_back_icon: com.quvideo.xiaoying:id/xiaoying_com_btn_left

yamls/test_ahead/test_privacy.yaml

@@ -1,5 +1,5 @@
 testinfo:
-    - id: test_gallery_img
+    - id: test_settings_comm.yaml
       title: 相册及camera授权
       info: 存储/录制授权
 testcase:
@@ -9,12 +9,12 @@ testcase:
       info: 授权存储
 
     - element_info: $el_allow
-      find_type: $id
+      find_type: $text
       operate_type: click
       info: 授权相册
 
     - element_info: $el_allow
-      find_type: $id
+      find_type: $text
       operate_type: click
       info: 授权其他
 
@@ -53,28 +53,28 @@ testcase:
       operate_type: click
       info: 点击'拍摄'
 
-    - element_info: $el_allow2
-      find_type: text
+    - element_info: $el_allow1
+      find_type: $text
       operate_type: click
       info: 授权麦克风
 
     - element_info: $el_allow
-      find_type: text
+      find_type: $text
       operate_type: click
       info: 授权录制
 
     - element_info: $el_allow
-      find_type: text
+      find_type: $text
       operate_type: click
       info: 授权录制
 
 check:
-    - element_info: $el_o_album
-      find_type: text
+    - element_info: $gal_o_album
+      find_type: $text
       check: default_check
       info: 进入'test_gallery'页面成功
 
     - element_info: $nor_cam
-      find_type: text
+      find_type: $text
       check: default_check
       info: 进入'Camera'页面成功

yamls/test_gallery/test_gallery_giveup.yaml

@@ -0,0 +1,50 @@
+testinfo:
+    - id: test_gallery_giveup
+      title: 相册-放弃操作
+      info: 相册-放弃操作测试
+testcase:
+    - element_info: $el_center
+      find_type: $id
+      operate_type: click
+      info: 点击创作中心主按钮
+
+    - element_info: $el_home_edit
+      find_type: $id
+      operate_type: click
+      info: 点击'剪辑'
+
+    - element_info: $gal_video_tab
+      find_type: $text
+      operate_type: click
+      info: 点击'视频'
+
+    - element_info: $gal_img_tab
+      find_type: $text
+      operate_type: click
+      info: 点击'图片'
+
+    - element_info: $gal_cover_cho
+      find_type: $id
+      operate_type: repeat
+      info: 选择几张'图片'
+
+    - element_info: $gal_back_icon
+      find_type: $id
+      operate_type: click
+      info: 左上角返回按钮
+
+    - element_info: $gal_back_icon
+      find_type: $id
+      operate_type: click
+      info: 左上角返回按钮
+
+    - element_info: $gal_cancel
+      find_type: $text
+      operate_type: click
+      info: 放弃'保存'草稿
+
+check:
+    - element_info: $text_more_draft
+      find_type: $text
+      check: default_check
+      info: 相册-放弃操作测试验证OK

yamls/test_gallery/test_gallery_img.yaml

@@ -3,26 +3,6 @@ testinfo:
       title: 相册-图片操作
       info: 图片相关操作测试
 testcase:
-    - element_info: $el_alert
-      find_type: $id
-      operate_type: click
-      info: 授权存储
-
-    - element_info: $el_allow
-      find_type: $id
-      operate_type: click
-      info: 授权相册
-
-    - element_info: $el_allow
-      find_type: $id
-      operate_type: click
-      info: 授权其他
-
-    - element_info: $el_skip
-      find_type: $id
-      operate_type: click
-      info: 跳过闪屏视频
-
     - element_info: $el_center
       find_type: $id
       operate_type: click
@@ -33,48 +13,48 @@ testcase:
       operate_type: click
       info: 点击'剪辑'
 
-    - element_info: $el_jump
-      find_type: text
+    - element_info: $gal_video_tab
+      find_type: $text
       operate_type: click
-      info: 点击'跳过'
+      info: 点击'视频'
 
-    - element_info: $el_home_edit
+    - element_info: $gal_img_tab
+      find_type: $text
+      operate_type: click
+      info: 点击'图片'
+
+    - element_info: $gal_cover_cho
       find_type: $id
       operate_type: click
-      info: 再次点击'剪辑'
+      info: 选择一张'图片'
 
-    - element_info: $gal_back_icon
+    - element_info: $gal_img_full
       find_type: $id
       operate_type: click
-      info: 退出Gallery
+      info: 选择一张'图片'全屏
 
-    - element_info: $el_home_cam
+    - element_info: $gal_ratate
       find_type: $id
       operate_type: click
-      info: 点击'拍摄'
+      info: 旋转'图片'
 
-    - element_info: $el_allow2
-      find_type: text
+    - element_info: $gal_img_add
+      find_type: $id
       operate_type: click
-      info: 授权麦克风
+      info: 添加'图片'
 
-    - element_info: $el_allow
-      find_type: text
+    - element_info: $gal_next
+      find_type: $text
       operate_type: click
-      info: 授权录制
+      info: 下一步
 
-    - element_info: $el_allow
-      find_type: text
+    - element_info: $save_draft
+      find_type: $text
       operate_type: click
-      info: 授权录制
+      info: 存草稿
 
 check:
-    - element_info: $el_o_album
-      find_type: text
+    - element_info: $text_studio
+      find_type: $text
       check: default_check
-      info: 进入'test_gallery'页面成功
-
-    - element_info: $nor_cam
-      find_type: text
-      check: default_check
-      info: 进入'Camera'页面成功
+      info: 图片相关操作测试验证OK

yamls/test_gallery/test_gallery_storyboard.yaml

@@ -0,0 +1,65 @@
+testinfo:
+    - id: test_gallery_storyboard
+      title: 相册-storyboard
+      info: 相册-storyboard相关操作测试
+testcase:
+    - element_info: $el_center
+      find_type: $id
+      operate_type: click
+      info: 点击创作中心主按钮
+
+    - element_info: $el_home_edit
+      find_type: $id
+      operate_type: click
+      info: 点击'剪辑'
+
+    - element_info: $gal_cover_cho
+      find_type: $id
+      operate_type: click
+      info: 选择一个'视频'
+
+    - element_info: $gal_video_add
+      find_type: $id
+      operate_type: click
+      info: 添加
+
+    - element_info: $gal_video_tab
+      find_type: $text
+      operate_type: click
+      info: 点击'视频'
+
+    - element_info: $gal_img_tab
+      find_type: $text
+      operate_type: click
+      info: 点击'图片'
+
+    - element_info: $gal_cover_cho
+      find_type: $id
+      operate_type: repeat
+      info: 选择几张'图片'
+
+    - element_info: $gal_expand
+      find_type: $id
+      operate_type: click
+      info: 显示已添加的全部'镜头'
+
+    - element_info: $gal_del
+      find_type: $id
+      operate_type: click
+      info: 删除任意一个'镜头'
+
+    - element_info: $gal_next
+      find_type: $text
+      operate_type: click
+      info: 下一步
+
+    - element_info: $save_draft
+      find_type: $text
+      operate_type: click
+      info: 存草稿
+
+check:
+    - element_info: $text_studio
+      find_type: $text
+      check: default_check
+      info: 相册-storyboard相关操作测试验证OK

yamls/test_gallery/test_gallery_video.yaml

@@ -0,0 +1,55 @@
+testinfo:
+    - id: test_gallery_video
+      title: 相册-视频操作
+      info: 视频相关操作测试
+testcase:
+    - element_info: $el_center
+      find_type: $id
+      operate_type: click
+      info: 点击创作中心主按钮
+
+    - element_info: $el_home_edit
+      find_type: $id
+      operate_type: click
+      info: 点击'剪辑'
+
+    - element_info: $gal_cover_cho
+      find_type: $id
+      operate_type: click
+      info: 选择一个'视频'
+
+    - element_info: $gal_ratate
+      find_type: $id
+      operate_type: click
+      info: 旋转'视频'
+
+    - element_info: $gal_zoom
+      find_type: $id
+      operate_type: ignore
+      info: 缩放非'1:1' 视频
+
+    - element_info: $gal_trim
+      find_type: $id
+      operate_type: click
+      info: 裁剪'视频'
+
+    - element_info: $gal_video_add
+      find_type: $id
+      operate_type: click
+      info: 添加
+
+    - element_info: $gal_next
+      find_type: $text
+      operate_type: click
+      info: 下一步
+
+    - element_info: $save_draft
+      find_type: $text
+      operate_type: click
+      info: 存草稿
+
+check:
+    - element_info: $text_studio
+      find_type: $text
+      check: default_check
+      info:  视频相关操作测试验证OK

yamls/test_settings/test_settings_comm.yaml

@@ -1,60 +1,50 @@
 testinfo:
-    - id: test_gallery_img
-      title: 相册-图片操作
-      info: 图片相关操作测试
+    - id: test_settings_comm
+      title: 设置-基本设置相关
+      info: 设置-基本设置相关测试
 testcase:
-    - element_info: $el_center
+    - element_info: $el_personal
       find_type: $id
       operate_type: click
-      info: 点击创作中心主按钮
+      info: 点击'我'按钮
 
-    - element_info: $el_home_edit
+    - element_info: $setting_btn
       find_type: $id
       operate_type: click
-      info: 点击'剪辑'
+      info: 点击'设置'按钮
 
-    - element_info: $gal_video_tab
+    - element_info: $net_disable
+      find_type: $id
+      operate_type: click
+      info: 关闭'只在Wi-Fi上传/下载'
+
+    - element_info: $rec_notice
       find_type: $text
       operate_type: click
-      info: 点击'视频'
+      info: 点击'接收通知推送'
 
-    - element_info: $gal_img_tab
+    - element_info: $rec_checkbox
+      find_type: $id
+      operate_type: click
+      info: 任意关闭一个通知推送设置
+
+    - element_info: $rec_back
+      find_type: $id
+      operate_type: click
+      info: 返回设置页
+
+    - element_info: $rec_lang
       find_type: $text
       operate_type: click
-      info: 点击'图片'
+      info: 点击'已选择语言'
 
-    - element_info: $gal_cover_cho
+    - element_info: $lang_back
       find_type: $id
       operate_type: click
-      info: 选择一张'图片'
-
-    - element_info: $gal_img_full
-      find_type: $id
-      operate_type: click
-      info: 选择一张'图片'全屏
-
-    - element_info: $gal_ratate
-      find_type: $id
-      operate_type: click
-      info: 旋转'图片'
-
-    - element_info: $gal_img_add
-      find_type: $id
-      operate_type: click
-      info: 添加'图片'
-
-    - element_info: $gal_next
-      find_type: $text
-      operate_type: click
-      info: 下一步
-
-    - element_info: $save_draft
-      find_type: $text
-      operate_type: click
-      info: 存草稿
+      info: 返回设置页
 
 check:
-    - element_info: $text_studio
+    - element_info: $privac_set
       find_type: $text
       check: default_check
-      info: 图片相关操作测试验证OK
+      info: 设置-基本设置相关测试验证OK

yamls/test_settings/test_settings_feedback.yaml

@@ -0,0 +1,125 @@
+testinfo:
+    - id: test_settings_feedback
+      title: 设置-意见反馈相关
+      info: 设置-意见反馈相关测试
+testcase:
+    - element_info: $el_personal
+      find_type: $id
+      operate_type: click
+      info: 点击'我'按钮
+
+    - element_info: $setting_btn
+      find_type: $id
+      operate_type: click
+      info: 点击'设置'按钮
+
+    - element_info:
+      find_type:
+      operate_type: swipeToUp
+      info: 向上滑动
+
+    - element_info:
+      find_type:
+      operate_type: swipeToUp
+      info: 向上滑动
+
+    - element_info: $fb_btn
+      find_type: $id
+      operate_type: click
+      info: 点击'意见反馈'
+
+    - element_info: $fb_edit
+      find_type: $id
+      operate_type: set_value
+      msg: 退款
+      info: 点击问题编辑输入框
+
+    - element_info: $fb_send
+      find_type: $id
+      operate_type: ckick
+      info: 发送问题
+
+    - element_info: $fb_read
+      find_type: $text
+      operate_type: ckick
+      info: 阅读全部
+
+    - element_info: $fb_back
+      find_type: $id
+      operate_type: ckick
+      info: 返回反馈页面
+
+    - element_info: $fb_kefu
+      find_type: $id
+      operate_type: ckick
+      info: 人工客服
+
+    - element_info: $kefu_cancel
+      find_type: $text
+      operate_type: ckick
+      info: 不用了
+
+    - element_info: $fb_kefu
+      find_type: $id
+      operate_type: ckick
+      info: 人工客服
+
+    - element_info: $kefu_cancel
+      find_type: $text
+      operate_type: ckick
+      info: 好的
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    - element_info: $rec_back
+      find_type: $id
+      operate_type: click
+      info: 返回设置页
+
+    - element_info: $block_list
+      find_type: $text
+      operate_type: click
+      info: 点击'黑名单'
+
+    - element_info: $block_list
+      find_type: $text
+      operate_type: click
+      info: 点击'黑名单'
+
+    - element_info: $block_remove
+      find_type: $text
+      operate_type: ignore
+      info: 移除一个用户
+
+    - element_info: $rec_back
+      find_type: $id
+      operate_type: click
+      info: 返回设置页
+
+    - element_info: $privacy_disable
+      find_type: $id
+      operate_type: click
+      info: 关闭隐私账号设置
+
+    - element_info: $watermark_enable
+      find_type: $id
+      operate_type: click
+      info: 水印显示昵称
+check:
+    - element_info: $watermark_enable
+      find_type: $id
+      check: default_check
+      info: 设置-意见反馈相关测试验证OK

yamls/test_settings/test_settings_privacy.yaml

@@ -0,0 +1,64 @@
+testinfo:
+    - id: test_settings_privacy
+      title: 设置-隐私设置相关
+      info: 设置-隐私设置相关测试
+testcase:
+    - element_info: $el_personal
+      find_type: $id
+      operate_type: click
+      info: 点击'我'按钮
+
+    - element_info: $setting_btn
+      find_type: $id
+      operate_type: click
+      info: 点击'设置'按钮
+
+    - element_info: $privac_set
+      find_type: $text
+      operate_type: click
+      info: 打开'私信权限'设置
+
+    - element_info: $focus_me
+      find_type: $text
+      operate_type: click
+      info: 点击'我关注的人'
+
+    - element_info: $rec_back
+      find_type: $id
+      operate_type: click
+      info: 返回设置页
+
+    - element_info: $block_list
+      find_type: $text
+      operate_type: click
+      info: 点击'黑名单'
+
+    - element_info: $block_list
+      find_type: $text
+      operate_type: click
+      info: 点击'黑名单'
+
+    - element_info: $block_remove
+      find_type: $text
+      operate_type: ignore
+      info: 移除一个用户
+
+    - element_info: $rec_back
+      find_type: $id
+      operate_type: click
+      info: 返回设置页
+
+    - element_info: $privacy_disable
+      find_type: $id
+      operate_type: click
+      info: 关闭隐私账号设置
+
+    - element_info: $watermark_enable
+      find_type: $id
+      operate_type: click
+      info: 水印显示昵称
+check:
+    - element_info: $watermark_enable
+      find_type: $id
+      check: default_check
+      info: 设置-隐私设置相关测试验证OK