review

src/pageobject/basepage.py

@@ -139,6 +139,10 @@ class Page(object):
     def excute_script_dominance(self, loc):
         self.driver.execute_script("document.getElementsByClassName('{}')[0].style.position = 'static'".format(loc))
 
+    # 操作脚本-元素display
+    def excute_script_display(self, loc):
+        self.driver.execute_script("document.getElementsByClassName('{}')[0].style.display = 'flex'".format(loc))
+
     # 切换窗口，切换到存在loc元素的窗口
     def change_window(self, loc):
         driver = self.driver
@@ -196,6 +200,10 @@ class Page(object):
     def mouse_move(self, x, y):
         ActionChains(self.driver).move_by_offset(xoffset=x, yoffset=y).click().perform()
 
+    # 鼠标从ele元素开始移动（x,y）个像素后点击
+    def mouse_move_with_ele(self, ele, x, y):
+        ActionChains(self.driver).move_to_element_with_offset(to_element=ele, xoffset=x, yoffset=y).perform()
+
     # 鼠标悬停直至元素出现
     def mouse_stop_until_ele_show(self, *ele):
         if len(ele) == 2:

src/pageobject/livecamerapage.py

@@ -11,9 +11,9 @@ class LiveCameraPage(MainPage):
     # 摄像头ele
     camera_ele = (By.XPATH, "//div[@class='react-draggable']")
     # 画面内的摄像头关闭按钮
-    close_camera_btn = (By.XPATH, "//span[@class='iconBox']/span")
+    close_camera_btn = (By.XPATH, "//span[@class='iconBox']")
     # 画面内的摄像头镜像按钮
-    camera_image = (By.XPATH, "//span[@class='iconBox trans']/span")
+    camera_image = (By.XPATH, "//span[@class='iconBox trans']")
 
     def __init__(self, driver):
         MainPage.__init__(self, driver)
@@ -36,6 +36,7 @@ class LiveCameraPage(MainPage):
 
     # 摄像头ele
     camera_ele1 = (By.XPATH, "//div[@class='react-draggable']/div[1]")
+    camera_ele11 = (By.XPATH, "//div[@class='react-draggable react-draggable-dragged']")
     # 摄像头ele
     camera_ele2 = (By.XPATH, "//div[@class='react-draggable']/div[1]/div[1]")
     # 摄像头ele
@@ -48,9 +49,13 @@ class LiveCameraPage(MainPage):
     list = [camera_ele, camera_ele1, camera_ele2, camera_ele3, camera_ele4, camera_ele5]
 
     def test_mouse_on_camera(self):
-        for self.i in self.list:
-            self.sleep(1)
-            self.ifElementExist(self.i)
-            self.mouse_stop_until_ele_show(self.find_element(self.i), self.camera_image)
-            print(self.i)
-
+        # for self.i in self.list:
+        #     # self.sleep(1)
+        #     self.ifElementExist(self.i)
+        #     self.mouse_stop_until_ele_show(self.find_element(self.i), self.camera_image)
+        #     print(self.i)
+        # self.click(self.camera_ele)
+        # print(type(self.find_element(self.camera_ele)))
+        # self.mouse_stop_until_ele_show(self.find_element(self.camera_ele), self.camera_image)
+        # self.mouse_move_with_ele(self.find_element(self.add_courseware_ele), -500, 50)
+        self.mouse_move(300, 240)
\ No newline at end of file

src/testcase/test_LiveCameraPage.py

@@ -51,7 +51,7 @@ class TestLivePage(object):
         get_allure_screenshots(after_close_camera, "关闭摄像头后截图")
         result = compare_pictures(before_close_camera, after_close_camera)
         print(result)
-        assert 10 < result
+        assert 100 < result
 
     @pytest.mark.run(order=2)
     @allure.title("测试摄像头功能-开启摄像头")
@@ -66,41 +66,42 @@ class TestLivePage(object):
         get_allure_screenshots(after_open_camera, "开启摄像头后截图")
         result = compare_pictures(before_open_camera, after_open_camera)
         print(result)
-        assert 10 < result
+        assert 100 < result
 
     @pytest.mark.run(order=3)
-    # @pytest.mark.skip()
+    @pytest.mark.skip()
     @allure.title("测试摄像头功能-摄像头镜像")
     def testOpenCameraImage(self):
+        self.Live_Camera_Page.excute_script_display("topBox")
         before_open_camera_image = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png'
         self.Live_Camera_Page.save_screenshot(before_open_camera_image)
         get_allure_screenshots(before_open_camera_image, "开启摄像头镜像前截图")
-        # self.Live_Camera_Page.mouse_on_camera()
-        self.Live_Camera_Page.test_mouse_on_camera()
-        self.Live_Camera_Page.sleep(2)
+        self.Live_Camera_Page.sleep(1)
         self.Live_Camera_Page.click_camera_image()
+        self.Live_Camera_Page.sleep(1)
         after_open_camera_image = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png'
         self.Live_Camera_Page.save_screenshot(after_open_camera_image)
         get_allure_screenshots(after_open_camera_image, "开启摄像头镜像后截图")
         result = compare_pictures(before_open_camera_image, after_open_camera_image)
         print(result)
-        assert 10 < result
+        assert 100 < result
 
     @pytest.mark.run(order=4)
     @pytest.mark.skip()
     @allure.title("测试摄像头功能-关闭摄像头-方法2")
     def testCloseCameraByFunction2(self):
+        self.Live_Camera_Page.excute_script_display("topBox")
         before_open_camera_image = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png'
         self.Live_Camera_Page.save_screenshot(before_open_camera_image)
         get_allure_screenshots(before_open_camera_image, "关闭摄像头前截图")
-        self.Live_Camera_Page.mouse_on_camera()
+        self.Live_Camera_Page.sleep(1)
         self.Live_Camera_Page.click_close_camera_btn()
         after_open_camera_image = screenshot_path(sys._getframe().f_code.co_name) + "/" + year_to_minute() + '.png'
         self.Live_Camera_Page.save_screenshot(after_open_camera_image)
         get_allure_screenshots(after_open_camera_image, "关闭摄像头后截图")
         result = compare_pictures(before_open_camera_image, after_open_camera_image)
         print(result)
-        assert 10 < result
+        assert 100 < result
 
 
 if __name__ == '__main__':