From 9aa718b2368a24c2fc17d9e99f33f9d806072fce Mon Sep 17 00:00:00 2001 From: Lan Hui <1348141770@qq.com> Date: Thu, 18 Apr 2024 20:06:02 +0800 Subject: [PATCH] Simplify the test code, use the Edge WebDriver --- app/test/test_bug553_LinShan.py | 37 +++++++++++++-------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/app/test/test_bug553_LinShan.py b/app/test/test_bug553_LinShan.py index 393e82d..d463c2b 100644 --- a/app/test/test_bug553_LinShan.py +++ b/app/test/test_bug553_LinShan.py @@ -1,35 +1,26 @@ -# -*- coding: utf-8 -*- -# Run the docker image using the following command: -# docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities from selenium.webdriver.support import expected_conditions as EC from selenium import webdriver from selenium.webdriver.support.wait import WebDriverWait from selenium.webdriver.common.by import By -from webdriver_manager.chrome import ChromeDriverManager from selenium.webdriver.common.keys import Keys import logging import time import pytest -# driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -# HOME_PAGE = 'http://121.4.94.30:91/' - - -# 我使用的是Chrome浏览器，所以我又通过安装webdriver-manager插件来配置浏览器的驱动 -# 我通过 'pip install webdriver-manager==4.00' 命令安装webdriver-manager，并且设置其版本为4.00 -driver = webdriver.Chrome(ChromeDriverManager().install()) -HOME_PAGE = 'http://127.0.0.1:5000/' -driver.implicitly_wait(10) - - -@pytest.mark.parametrize("test_input",("‘test1’","'test2'","“test3”","it's","hello,I'm linshan","Happy New Year！？","My favorite book is 《Harry Potter》。")) -@pytest.mark.parametrize("expected",(["test1"],["test2"],["test3"],["it's"],["hello","i'm","linshan"],["happy","new","year"],["potter","harry","my","favorite","book","is"])) -def test_bug553_LinShan(test_input,expected): +@pytest.mark.parametrize("test_input,expected", + [("‘test1’", "test1"), + ("'test2'", "test2"), + ("“test3”", "test3"), + ("it's", "it's"), + ("hello,I'm linshan", ["hello","i'm","linshan"]), + ("Happy New Year！？", ["happy","new","year"]), + ("My favorite book is 《Harry Potter》。", ["potter","harry","my","favorite","book","is"])]) +def test_bug553_LinShan(test_input,expected, driver, URL): try: # 打开对应地址的网页 - driver.get(HOME_PAGE) + driver.get(URL) # 浏览器最大窗口化 driver.maximize_window() @@ -40,11 +31,11 @@ def test_bug553_LinShan(test_input,expected): # 将测试的数据输入到主页的textarea里 driver.find_element_by_xpath("//textarea[@name='content']").send_keys(Keys.CONTROL, "a") driver.find_element_by_xpath("//textarea[@name='content']").send_keys(test_input) - time.sleep(2) + time.sleep(1) # 点击按钮获取单词 driver.find_element_by_xpath("//input[@value='get文章中的词频']").click() - time.sleep(2) + time.sleep(1) # 获取筛选后的单词 words = driver.find_elements_by_xpath("//p/a") @@ -56,11 +47,11 @@ def test_bug553_LinShan(test_input,expected): # 返回上一页网页 driver.find_element_by_xpath("//input[@value='确定并返回']").click() - time.sleep(2) + time.sleep(0.1) except Exception as e: # 输出异常信息 logging.error(e) # 关闭浏览器 finally: - driver.quit() \ No newline at end of file + driver.quit()