代码结构变动

engine/__init__.py

+from engine.browser_engine import BrowserEngine
+from engine.read_config import ReadConfig
+from engine.logger import Logger
+import os,time
+
+
+def get_engine(file, url):
+    def inner(f):
+
+        def wapper(*args, **kwargs):
+            try:
+                start_time = time.time()
+                log_name = os.path.split(file)[-1].split(".")[0]
+                image_path = os.path.join(os.path.dirname(os.path.dirname(file)), "images")
+                image_path = os.path.join(image_path, log_name)
+                image_path += '.png'
+
+                engine = BrowserEngine(image_path, log_name, url)
+
+                ret = f(engine, *args, **kwargs)
+
+                end_time = time.time()
+                engine.logger.info(f'执行时间：{end_time-start_time}s')
+                if engine: del engine
+                return ret
+            except Exception as e:
+                print(e)
+
+        return wapper
+
+    return inner

basepage/browser_engine.py → engine/browser_engine.py

 # -*- coding:utf-8 -*-
 from selenium import webdriver
-from basepage.read_config import ReadConfig
-import time
-import string
-from basepage.logger import Logger
+from engine.read_config import ReadConfig
+import time, os, re
 
 
 class BrowserEngine(ReadConfig):
     __log_name = "browser_engine"
 
-    def __init__(self, log_name=__log_name,url='URL'):
+    def __init__(self, image_path, log_name=__log_name, url='URL'):
         super().__init__(log_name)
         # self.__logger = super().get_logger()
+        self._log_name = log_name
         self._browser = ''
         self.url = url
         self._driver_path = r"C:\Users\80980\znfz_autotest\driver\chromedriver.exe"
+        self.image_path = image_path
 
-    # def init(self):
         self.driver = webdriver.Chrome(self._driver_path)
         self.open_browser()
         self.login_znfz()
         self.get_page()
         self.driver.xpath = self.driver.find_elements_by_xpath
 
-
     def open_browser(self):
         browser = self.get_browserType('browserName')
         url = self.get_testUrl('URL')
@@ -42,7 +40,7 @@ class BrowserEngine(ReadConfig):
         return self.driver
 
     def login_znfz(self):
-        if self.url =='LOGIN':
+        if self.url == 'LOGIN':
             return
         username = self.get_userInfo('username')
         password = self.get_userInfo('password')
@@ -58,7 +56,8 @@ class BrowserEngine(ReadConfig):
 
         self.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
 
-        tags2 = self.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span')
+        tags2 = self.driver.find_element_by_xpath(
+            '//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span')
         self.logger.info("tags2.text:%s" % tags2.text)
         # print(tags2.text)
         tags2.click()
@@ -79,6 +78,19 @@ class BrowserEngine(ReadConfig):
             self.logger.info("the testUrl : %s" % url)
             self.driver.get(url)
 
+    def load_image(self):
+        print(self.image_path)
+        image_dir, image_name = os.path.split(self.image_path)
+        image_list = os.listdir(image_dir)
+        if image_name in image_list:
+            image_name_list = list(filter(lambda x: re.findall(image_name + r'-\d{1,}\.png', x), image_list))
+            image_name_index_list = list(map(lambda x: int(x.split('-|.')[-2]) if '-' in x else 0, image_name_list))
+            next_image_name_index = max(image_name_index_list) + 1 if image_name_index_list else 1
+            next_image_name = os.path.join(image_dir, image_name.replace('.png', f'-{next_image_name_index}.png'))
+        else:
+            next_image_name = self.image_path
+        print(next_image_name)
+        self.driver.get_screenshot_as_file(next_image_name)
 
     def __del__(self):
         try:

basepage/logger.py → engine/logger.py

@@ -9,13 +9,14 @@ class Logger(object):
         super().__init__(*args, **kwargs)
         self.log_name = log_name
         self.logger = logging.getLogger(log_name)
+        self.logger.handlers = []
         self.init_logger()
 
-    def init_logger(self, ):
+    def init_logger(self):
         self.logger.setLevel(logging.DEBUG)
         rq = time.strftime('%Y%m%d', time.localtime(time.time()))
 
-        log_path = os.path.dirname(os.path.abspath('.')) + '/logs/'
+        log_path = os.path.dirname(os.path.abspath('..')) + '/logs/'
         log_name = log_path + rq + '.log'
         fh = logging.FileHandler(log_name)
         fh.setLevel(logging.INFO)
@@ -32,5 +33,6 @@ class Logger(object):
 
     def get_logger(self):
         return self.logger
-    # def getlog(self):
-    #     return self.logger
+
+
+

basepage/read_config.py → engine/read_config.py

 import os
 import configparser
-from basepage.logger import Logger
+from engine.logger import Logger
 
 '''
 proDir = os.path.split(os.path.realpath(__file__))[0]
@@ -24,8 +24,8 @@ class ReadConfig(Logger):
         self.cf.read(self._configPath, encoding="utf-8-sig")
 
     def join_config_path(self):
-        proDir = os.path.dirname(os.path.abspath('.'))
-        self._configPath = os.path.dirname(os.path.abspath('.')) + r'\config\config.ini'
+        # proDir = os.path.dirname(os.path.abspath('.'))
+        self._configPath = os.path.dirname(os.path.abspath('..')) + r'\config\config.ini'
         self.logger.info("the configPath: %s" % self._configPath)
 
     def get_browserType(self, param):

tests/conftest.py

+from selenium import webdriver
+import pytest
+# driver = None
+
+
+# @pytest.mark.hookwrapper
+# def pytest_runtest_makereport(item):
+#     """
+#     Extends the PyTest Plugin to take and embed screenshot in html report, whenever test fails.
+#     :param item:
+#     """
+#     pytest_html = item.config.pluginmanager.getplugin('html')
+#     outcome = yield
+#     report = outcome.get_result()
+#     extra = getattr(report, 'extra', [])
+#
+#     if report.when == 'call' or report.when == "setup":
+#         xfail = hasattr(report, 'wasxfail')
+#         if (report.skipped and xfail) or (report.failed and not xfail):
+#             file_name = report.nodeid.replace("::", "_")+".png"
+#             _capture_screenshot(file_name)
+#             if file_name:
+#                 html = '<div><img src="%s" alt="screenshot" style="width:304px;height:228px;" ' \
+#                        'οnclick="window.open(this.src)" align="right"/></div>' % file_name
+#                 extra.append(pytest_html.extras.html(html))
+#         report.extra = extra
+#
+#
+# def _capture_screenshot(name):
+#     driver.get_screenshot_as_file(name)
+#
+#
+# @pytest.fixture(scope='session', autouse=True)
+# def browser():
+#     global driver
+#     if driver is None:
+#         driver = webdriver.Firefox()
+#     return driver

tests/test_cases/assets/style.css

+body {
+	font-family: Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	/* do not increase min-width as some may use split screens */
+	min-width: 800px;
+	color: #999;
+}
+
+h1 {
+	font-size: 24px;
+	color: black;
+}
+
+h2 {
+	font-size: 16px;
+	color: black;
+}
+
+p {
+    color: black;
+}
+
+a {
+	color: #999;
+}
+
+table {
+	border-collapse: collapse;
+}
+
+/******************************
+ * SUMMARY INFORMATION
+ ******************************/
+
+#environment td {
+	padding: 5px;
+	border: 1px solid #E6E6E6;
+}
+
+#environment tr:nth-child(odd) {
+	background-color: #f6f6f6;
+}
+
+/******************************
+ * TEST RESULT COLORS
+ ******************************/
+span.passed, .passed .col-result {
+	color: green;
+}
+span.skipped, span.xfailed, span.rerun, .skipped .col-result, .xfailed .col-result, .rerun .col-result {
+	color: orange;
+}
+span.error, span.failed, span.xpassed, .error .col-result, .failed .col-result, .xpassed .col-result  {
+	color: red;
+}
+
+
+/******************************
+ * RESULTS TABLE
+ *
+ * 1. Table Layout
+ * 2. Extra
+ * 3. Sorting items
+ *
+ ******************************/
+
+/*------------------
+ * 1. Table Layout
+ *------------------*/
+
+#results-table {
+	border: 1px solid #e6e6e6;
+	color: #999;
+	font-size: 12px;
+	width: 100%
+}
+
+#results-table th, #results-table td {
+	padding: 5px;
+	border: 1px solid #E6E6E6;
+	text-align: left
+}
+#results-table th {
+	font-weight: bold
+}
+
+/*------------------
+ * 2. Extra
+ *------------------*/
+
+.log:only-child {
+	height: inherit
+}
+.log {
+	background-color: #e6e6e6;
+	border: 1px solid #e6e6e6;
+	color: black;
+	display: block;
+	font-family: "Courier New", Courier, monospace;
+	height: 230px;
+	overflow-y: scroll;
+	padding: 5px;
+	white-space: pre-wrap
+}
+div.image {
+	border: 1px solid #e6e6e6;
+	float: right;
+	height: 240px;
+	margin-left: 5px;
+	overflow: hidden;
+	width: 320px
+}
+div.image img {
+	width: 320px
+}
+div.video {
+	border: 1px solid #e6e6e6;
+	float: right;
+	height: 240px;
+	margin-left: 5px;
+	overflow: hidden;
+	width: 320px
+}
+div.video video {
+	overflow: hidden;
+	width: 320px;
+    height: 240px;
+}
+.collapsed {
+	display: none;
+}
+.expander::after {
+	content: " (show details)";
+	color: #BBB;
+	font-style: italic;
+	cursor: pointer;
+}
+.collapser::after {
+	content: " (hide details)";
+	color: #BBB;
+	font-style: italic;
+	cursor: pointer;
+}
+
+/*------------------
+ * 3. Sorting items
+ *------------------*/
+.sortable {
+	cursor: pointer;
+}
+
+.sort-icon {
+	font-size: 0px;
+	float: left;
+	margin-right: 5px;
+	margin-top: 5px;
+	/*triangle*/
+	width: 0;
+	height: 0;
+	border-left: 8px solid transparent;
+	border-right: 8px solid transparent;
+}
+
+.inactive .sort-icon {
+	/*finish triangle*/
+	border-top: 8px solid #E6E6E6;
+}
+
+.asc.active .sort-icon {
+	/*finish triangle*/
+	border-bottom: 8px solid #999;
+}
+
+.desc.active .sort-icon {
+	/*finish triangle*/
+	border-top: 8px solid #999;
+}

tests/test_cases/pytest.ini

+[pytest]
+
+;log_format = %(asctime)s %(levelname)s %(message)s
+log_date_format = %Y-%m-%d %H:%M:%S
+
+markers= login
+         select
+         addxyr
+         delxyr
+         gsjd
+         case4
+         case5
\ No newline at end of file

tests/test_cases/test_gsjd.py

+# import pytest
+# import sys
+#
+# sys.path.append('..')
+# from basepage.check_gsjd import CheckGsjd
+#
+# @pytest.mark.gsjd
+# def test_gsid_case1():
+#
+#    # browser = BrowserEngine()
+#    # driver = browser.login_znfz()
+#
+#     test = CheckGsjd('check_gsjd')
+#     driver = test.choose_gsjd()
+#     test.choose_gsjd_case()

tests/test_cases/test_jbaq.py

+'''
+基本案情-基本情况
+'''
+import pytest,time
+from engine import get_engine
+
+
+@pytest.mark.addxyr
+@get_engine(__file__,'JBAQ_URL')
+def test_addxyr(engine):
+    # engine.init()
+    basic_url = engine.get_testUrl('JBAQ_URL')
+    case_id = engine.get_caseId('caseId')
+    url = basic_url.format(bmsah=case_id)
+    engine.driver.get(url)
+    xyr_add = engine.driver.xpath("//div[@class='plus___1ckgY']")
+    if not xyr_add:
+        engine.logger.info('没有基本信息！！查看具体情况')
+        exit(-1)
+        return
+    xyr_add = xyr_add[0]
+    xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    # 添加犯罪嫌疑人
+    xyr_add.click()
+    engine.logger.info('点击添加嫌疑人')
+    time.sleep(1)
+    new_xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    xyr_name = engine.driver.xpath("//div[@title='犯罪嫌疑人姓名']/following-sibling::div[1]//input")[0].get_attribute('value')
+    assert len(new_xyr_list) - len(xyr_list) == 1 and xyr_name == '','嫌疑人数+1'
+    # 再加一个
+    xyr_add.click()
+    engine.logger.info('点击添加嫌疑人')
+    time.sleep(1)
+    new_xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    xyr_name = engine.driver.xpath("//div[@title='犯罪嫌疑人姓名']/following-sibling::div[1]//input")[0].get_attribute('value')
+    assert len(new_xyr_list) - len(xyr_list) == 2 and xyr_name == '','嫌疑人数+2'
+
+
+
+@pytest.mark.delxyr
+@get_engine(__file__,'JBAQ_URL')
+def test_addxyr(engine):
+    xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    xyr_last = xyr_list[-1]
+    # 删除犯罪嫌疑人
+    xyr_last.click()
+    engine.logger.info('点击最后一个嫌疑人')
+    xyr_del = engine.driver.xpath("//div[@class='item___2HoCU active___2SHXM']/a[contains(@class,'delete___3-b3m')]")[0]
+    xyr_del.click()
+    engine.logger.info('点击X')
+    time.sleep(0.5)
+    # 点击否
+    xyr_del_false = engine.driver.xpath("//div[@class='ant-popover-buttons']/button[@class='ant-btn ant-btn-sm']")[0]
+    xyr_del_false.click()
+    engine.logger.info('点击否')
+    time.sleep(0.5)
+    new_xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    assert len(xyr_list) == len(new_xyr_list),'嫌疑人数不变'
+    xyr_last.click()
+    xyr_del.click()
+    engine.logger.info('点击X')
+    time.sleep(0.5)
+    # 点击是
+    xyr_del_true = engine.driver.xpath("//div[@class='ant-popover-buttons']/button[@class='ant-btn ant-btn-primary ant-btn-sm']")[0]
+    xyr_del_true.click()
+    engine.logger.info('点击是')
+    time.sleep(1)
+    new_xyr_list = engine.driver.xpath("//div[contains(@class,'item___2HoCU')]")
+    assert len(xyr_list) - len(new_xyr_list) == 1,'嫌疑人数-1'
+

tests/test_cases/test_login.py

+import pytest
+import time
+import sys
+
+# sys.path.append('../..')
+from engine import get_engine
+
+project_name = "TestLogin"
+# logger = Logger(project_name).get_logger()
+'''
+def setup_function():
+    print('setup_function:每个用例开始前都会执行')
+
+def teardown_function():
+    print('teardown_function:每个用例结束后都会执行')
+'''
+
+
+@pytest.mark.login
+@get_engine(__file__, 'LOGIN')
+def test_login(engine):
+    username = engine.get_userInfo('username')
+    password = engine.get_userInfo('password')
+    url = engine.get_testUrl('URL')
+    print(username, password, url)
+    engine.logger.info("username: %s" % username)
+    engine.logger.info("password :%s" % password)
+    engine.logger.info("Open url: %s" % url)
+
+    tags = engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
+    # print(tags.text)
+    engine.logger.info("tags.text:%s" % tags.text)
+    tags.click()
+    time.sleep(1)
+
+    engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
+
+    tags2 = engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span')
+    # print(tags2.text)
+    engine.logger.info("tags2.text:%s" % tags2.text)
+    tags2.click()
+    time.sleep(1)
+
+    engine.driver.find_element_by_xpath('//*[@id="username"]').send_keys(username)
+    engine.driver.find_element_by_xpath('//*[@id="password"]').send_keys(password)
+    engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click()
+
+    time.sleep(2)
+    # engine.driver.quit()
+
+
+@pytest.mark.login
+@get_engine(__file__, 'LOGIN')
+def test_login_pwerr(engine):
+    username = engine.get_userInfo('username')
+    password = engine.get_userInfo('password')
+    url = engine.get_testUrl('URL')
+    # print(username, password, url)
+    engine.logger.info("username: %s" % username)
+    engine.logger.info("password :%s" % password)
+    engine.logger.info("Open url: %s" % url)
+
+    # driver = engine.driver
+
+    tags = engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
+    # print(tags.text)
+    engine.logger.info("tags.text:%s" % tags.text)
+    tags.click()
+    time.sleep(1)
+
+    engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
+
+    tags2 = engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span')
+    # print(tags2.text)
+    engine.logger.info("tags2.text:%s" % tags2.text)
+    tags2.click()
+    time.sleep(1)
+    # 不输入密码
+    time1 = time.time()
+    form_explain_list = engine.driver.xpath('//div[@class="ant-row ant-form-item ant-form-item-with-help"]//div[@class="ant-form-explain"]')
+    alert_message_list = engine.driver.xpath('//div[@class="main___2iu6s"]//span[@class="ant-alert-message"]')
+    assert form_explain_list ==[]
+    assert alert_message_list ==[]
+    engine.load_image()
+    engine.driver.xpath('//*[@id="username"]')[0].send_keys(username)
+    # engine.driver.find_element_by_xpath('//*[@id="password"]').send_keys('123')
+    engine.driver.xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button')[0].click()
+    form_explain = engine.driver.xpath('//div[@class="ant-form-explain"]')[0].text
+    assert form_explain.strip() == '请输入密码！'
+    engine.logger.info('test_login_password_err:' + '不输入密码，返回正确的错误信息,text:' + form_explain)
+
+    # 输入错误的密码
+    engine.driver.find_element_by_xpath('//*[@id="password"]').send_keys('test_gt_pw')
+    engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click()
+    alert_message = engine.driver.xpath('//div[@class="main___2iu6s"]//span[@class="ant-alert-message"]')[0].text
+    assert alert_message.strip() == '账户或密码错误'
+    engine.logger.info('test_login_password_err:' + '输入错误密码，返回正确的错误信息,text:' + alert_message)
+
+
+@pytest.mark.login
+@get_engine(__file__, 'LOGIN')
+def test_login_usererr(engine):
+    username = engine.get_userInfo('username')
+    password = engine.get_userInfo('password')
+    url = engine.get_testUrl('URL')
+    # print(username, password, url)
+    engine.logger.info("username: %s" % username)
+    engine.logger.info("password :%s" % password)
+    engine.logger.info("Open url: %s" % url)
+
+    # driver = engine.driver
+
+    tags = engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
+    # print(tags.text)
+    engine.logger.info("tags.text:%s" % tags.text)
+    tags.click()
+    time.sleep(1)
+
+    engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
+
+    tags2 = engine.driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span')
+    # print(tags2.text)
+    engine.logger.info("tags2.text:%s" % tags2.text)
+    tags2.click()
+    time.sleep(1)
+    # 不输入密码
+    assert engine.driver.xpath('//div[@class="ant-form-explain"]') == []
+    assert engine.driver.xpath('//div[@class="main___2iu6s"]//span[@class="ant-alert-message"]') == []
+    # engine.driver.find_element_by_xpath('//*[@id="username"]').send_keys(username)
+    engine.driver.find_element_by_xpath('//*[@id="password"]').send_keys(password)
+    engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click()
+    form_explain = engine.driver.xpath('//div[@class="ant-form-explain"]')[0].text
+    assert form_explain.strip() == '请输入账户名！'
+    engine.logger.info('test_login_password_err:' + '不输入账户，返回正确的错误信息,text:' + form_explain)
+
+    # 输入错误的密码
+    engine.driver.find_element_by_xpath('//*[@id="username"]').send_keys('test_gt_user')
+    engine.driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click()
+    alert_message = engine.driver.xpath('//div[@class="main___2iu6s"]//span[@class="ant-alert-message"]')[0].text
+    assert alert_message.strip() == '账户或密码错误'
+    engine.logger.info('test_login_password_err:' + '输入错误账户，返回正确的错误信息,text:' + alert_message)
+
+
+# if __name__ == '__main__':
+#     pytest.main(["-m=login", "--html=report.html"])