Commit dc3f9bdf authored by gaotao's avatar gaotao

代码修整

parent 767e6982
...@@ -5,64 +5,62 @@ import time ...@@ -5,64 +5,62 @@ import time
import string import string
from basepage.logger import Logger from basepage.logger import Logger
logger = Logger(logger="browser_engine").getlog()
class BrowserEngine(object): class BrowserEngine(ReadConfig):
__log_name = "browser_engine"
def open_browser(self): def __init__(self, log_name=__log_name):
super().__init__(log_name)
# self.__logger = super().get_logger()
self._browser = ''
self._driver_path = r"C:\Users\80980\znfz_autotest\driver\chromedriver.exe"
self._driver = webdriver.Chrome(self._driver_path)
self.open_browser()
conf = ReadConfig() def open_browser(self):
browser = conf.get_browserType('browserName') browser = self.get_browserType('browserName')
url = conf.get_testUrl('URL') url = self.get_testUrl('URL')
logger.info("browserName: %s" % browser) self.logger.info("browserName: %s" % browser)
#driver = webdriver.Chrome(r"C:\Program Files (x86)\Google\Chrome\Application\chromedriver.exe") # driver = webdriver.Chrome(r"C:\Program Files (x86)\Google\Chrome\Application\chromedriver.exe")
driver = webdriver.Chrome(r"D:\mywork\autotest\znfz_autotest\driver\chromedriver.exe")
driver.get(url) self._driver.get(url)
logger.info("Open url: %s" % url) self.logger.info("Open url: %s" % url)
time.sleep(3) time.sleep(3)
driver.maximize_window() self._driver.maximize_window()
logger.info("Maximize the current window.") self.logger.info("Maximize the current window.")
driver.implicitly_wait(10) self._driver.implicitly_wait(10)
logger.info("Set implicitly wait 10 seconds.") self.logger.info("Set implicitly wait 10 seconds.")
return driver return self._driver
def login_znfz(self): def login_znfz(self):
username = self.get_userInfo('username')
conf = ReadConfig() password = self.get_userInfo('password')
username = conf.get_userInfo('username') url = self.get_testUrl('URL')
password = conf.get_userInfo('password')
url = conf.get_testUrl('URL')
print(username, password, url) print(username, password, url)
logger.info("username: %s" %username) self.logger.info("username: %s" % username)
#logger.info(string.Formatter("username: %s, password: %s, open url: %s", username, password, url)) # logger.info(string.Formatter("username: %s, password: %s, open url: %s", username, password, url))
#logger.info("password :%s" % password) # logger.info("password :%s" % password)
#logger.info("Open url: %s" % url) # logger.info("Open url: %s" % url)
tags = self._driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
self.logger.info("tags.text:%s" % tags.text)
browser = BrowserEngine() # print(tags.text)
driver = browser.open_browser()
tags = driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
logger.info("tags.text:%s" % tags.text)
#print(tags.text)
tags.click() tags.click()
time.sleep(1) time.sleep(1)
driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click() self._driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
tags2 = 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')
logger.info("tags2.text:%s" % tags2.text) self.logger.info("tags2.text:%s" % tags2.text)
#print(tags2.text) # print(tags2.text)
tags2.click() tags2.click()
time.sleep(1) time.sleep(1)
driver.find_element_by_xpath('//*[@id="username"]').send_keys(username) self._driver.find_element_by_xpath('//*[@id="username"]').send_keys(username)
driver.find_element_by_xpath('//*[@id="password"]').send_keys(password) self._driver.find_element_by_xpath('//*[@id="password"]').send_keys(password)
driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click() self._driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[4]/div/div/span/button').click()
return driver return self._driver
''' '''
...@@ -72,4 +70,4 @@ if __name__ == '__main__': ...@@ -72,4 +70,4 @@ if __name__ == '__main__':
test = cls.open_browser() test = cls.open_browser()
time.sleep(3) time.sleep(3)
test.quit() test.quit()
''' '''
\ No newline at end of file
...@@ -4,62 +4,67 @@ from basepage.browser_engine import BrowserEngine ...@@ -4,62 +4,67 @@ from basepage.browser_engine import BrowserEngine
from basepage.logger import Logger from basepage.logger import Logger
from basepage.read_config import ReadConfig from basepage.read_config import ReadConfig
logger = Logger(logger="check_gsjd").getlog()
class CheckGsjd(object): class CheckGsjd(BrowserEngine):
__log_name = 'check_gsjd'
#选择审查起诉 def __init__(self, log_name=__log_name):
def choose_gsjd(self): super().__init__(log_name)
self._driver = self.login_znfz()
browser = BrowserEngine() # 选择审查起诉
driver = browser.login_znfz() def choose_gsjd(self):
#tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/aside/div/ul/li[3]/a/span') # tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/aside/div/ul/li[3]/a/span')
tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/aside/div/ul/li[3]') tags = self._driver.find_element_by_xpath('/html/body/div[1]/div/section/aside/div/ul/li[3]')
#print(tags.text) # print(tags.text)
logger.info("tags.text:%s" % tags.text) self.logger.info("tags.text:%s" % tags.text)
tags.click() tags.click()
time.sleep(10) time.sleep(10)
return driver return self._driver
#选择审查起诉案件 # 选择审查起诉案件
def choose_gsjd_case(self, driver): def choose_gsjd_case(self):
conf = ReadConfig() caseId = self.get_caseId('caseId')
caseId = conf.get_caseId('caseId') self.logger.info("the caseId : %s" % caseId)
logger.info("the caseId : %s" % caseId)
# driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[1]/div[3]/input').send_keys(caseId) # driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[1]/div[3]/input').send_keys(caseId)
driver.find_element_by_xpath('//*[@id="ajmc"]').send_keys(caseId) self._driver.find_element_by_xpath('//*[@id="ajmc"]').send_keys(caseId)
#点击按钮 # 点击按钮
driver.find_element_by_xpath( '/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[2]/div/button[2]').click() self._driver.find_element_by_xpath(
'/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[2]/div/button[2]').click()
time.sleep(5) time.sleep(5)
#点击办理 # 点击办理
tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[7]/p/a') tags = self._driver.find_element_by_xpath(
#print(tags.text) '/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[7]/p/a')
logger.info("tags.text:%s" % tags.text) # print(tags.text)
self.logger.info("tags.text:%s" % tags.text)
tags.click() tags.click()
#driver.find_element_by_tag_name(tags.text).click() # driver.find_element_by_tag_name(tags.text).click()
def __del__(self):
self._driver.quit()
if __name__ == '__main__': # if __name__ == '__main__':
test = CheckGsjd() # test = CheckGsjd()
driver = test.choose_gsjd() # driver = test.choose_gsjd()
test.choose_gsjd_case(driver) # test.choose_gsjd_case(driver)
''' # '''
conf = ReadConfig() # conf = ReadConfig()
caseId = conf.get_caseId('caseId') # caseId = conf.get_caseId('caseId')
logger.info("the caseId : %s" % caseId) # logger.info("the caseId : %s" % caseId)
# driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[1]/div[3]/input').send_keys(caseId) # # driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[1]/div[3]/input').send_keys(caseId)
driver.find_element_by_xpath('//*[@id="ajmc"]').send_keys(caseId) # driver.find_element_by_xpath('//*[@id="ajmc"]').send_keys(caseId)
# 点击按钮 # # 点击按钮
driver.find_element_by_xpath( # driver.find_element_by_xpath(
'/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[2]/div/button[2]').click() # '/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[1]/form/div[2]/div/button[2]').click()
# 点击办理 # # 点击办理
#tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[7]/p/a') # #tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[7]/p/a')
time.sleep(5) # time.sleep(5)
tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[3]/p/span') # tags = driver.find_element_by_xpath('/html/body/div[1]/div/section/section/main/div/div[2]/div/div/div[2]/div[2]/div/div/div/div/div/div[2]/table/tbody/tr/td[3]/p/span')
print(tags.text) # print(tags.text)
tags.click() # tags.click()
#links = driver.find_element_by_tag_name("办理") # #links = driver.find_element_by_tag_name("办理")
#print(links.text) # #print(links.text)
#tags.click() # #tags.click()
#print (tags.text) # #print (tags.text)
#tags.click() # #tags.click()
''' # '''
\ No newline at end of file
...@@ -2,13 +2,17 @@ import os.path ...@@ -2,13 +2,17 @@ import os.path
import logging import logging
import time import time
class Logger(object): class Logger(object):
def __init__(self, logger): def __init__(self, log_name, *args, **kwargs):
super().__init__(*args, **kwargs)
self.log_name = log_name
self.logger = logging.getLogger(log_name)
self.init_logger()
self.logger = logging.getLogger(logger) def init_logger(self, ):
self.logger.setLevel(logging.DEBUG) self.logger.setLevel(logging.DEBUG)
rq = time.strftime('%Y%m%d%H%M', time.localtime(time.time())) rq = time.strftime('%Y%m%d%H%M', time.localtime(time.time()))
log_path = os.path.dirname(os.path.abspath('.')) + '/logs/' log_path = os.path.dirname(os.path.abspath('.')) + '/logs/'
...@@ -19,12 +23,14 @@ class Logger(object): ...@@ -19,12 +23,14 @@ class Logger(object):
ch = logging.StreamHandler() ch = logging.StreamHandler()
ch.setLevel(logging.INFO) ch.setLevel(logging.INFO)
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') formatter = logging.Formatter(f'[%(asctime)s] - [%(levelname)7s] - [%(name){max(len(self.log_name),15)}s] - [%(filename)20s] - [%(lineno)4s] - %(message)s')
fh.setFormatter(formatter) fh.setFormatter(formatter)
ch.setFormatter(formatter) ch.setFormatter(formatter)
self.logger.addHandler(fh) self.logger.addHandler(fh)
self.logger.addHandler(ch) self.logger.addHandler(ch)
def getlog(self): def get_logger(self):
return self.logger return self.logger
\ No newline at end of file # def getlog(self):
# return self.logger
...@@ -8,38 +8,47 @@ print(proDir) ...@@ -8,38 +8,47 @@ print(proDir)
configPath = os.path.join(proDir, "config.ini") configPath = os.path.join(proDir, "config.ini")
print(configPath) print(configPath)
''' '''
logger = Logger(logger='read_config').getlog()
#logger = logging.getLogger('read_config')
proDir = os.path.dirname(os.path.abspath('.'))
configPath = os.path.dirname(os.path.abspath('.')) +r'\config\config.ini'
logger.info("the configPath: %s" % configPath)
class ReadConfig: # logger = logging.getLogger('read_config')
def __init__(self):
class ReadConfig(Logger):
__log_name = 'read_config'
def __init__(self, log_name=__log_name):
super().__init__(log_name)
self._configPath = ''
self.join_config_path()
self.cf = configparser.ConfigParser() self.cf = configparser.ConfigParser()
self.cf.read(configPath,encoding="utf-8-sig") 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'
self.logger.info("the configPath: %s" % self._configPath)
def get_browserType(self, param): def get_browserType(self, param):
value = self.cf.get("browserType", param) value = self.cf.get("browserType", param)
logger.info("the browserType : %s" % value) self.logger.info("the browserType : %s" % value)
return value return value
def get_testUrl(self, param): def get_testUrl(self, param):
value = self.cf.get("testUrl", param) value = self.cf.get("testUrl", param)
logger.info("the testUrl : %s" % value) self.logger.info("the testUrl : %s" % value)
return value return value
def get_userInfo(self, param): def get_userInfo(self, param):
value = self.cf.get("userInfo", param) value = self.cf.get("userInfo", param)
logger.info("the userInfo : %s" % value) self.logger.info("the userInfo : %s" % value)
return value return value
def get_caseId(self, param): def get_caseId(self, param):
value = self.cf.get("gsjdCase", param) value = self.cf.get("gsjdCase", param)
logger.info("the gsjdCase : %s" % value) self.logger.info("the gsjdCase : %s" % value)
return value return value
''' '''
if __name__ == '__main__': if __name__ == '__main__':
test = ReadConfig() test = ReadConfig()
...@@ -47,4 +56,4 @@ if __name__ == '__main__': ...@@ -47,4 +56,4 @@ if __name__ == '__main__':
username = test.get_userInfo('username') username = test.get_userInfo('username')
password = test.get_userInfo('password') password = test.get_userInfo('password')
print(browser,username,password) print(browser,username,password)
''' '''
\ No newline at end of file
No preview for this file type
...@@ -3,7 +3,7 @@ import sys ...@@ -3,7 +3,7 @@ import sys
import time import time
sys.path.append('..') sys.path.append('..')
from basepage.browser_engine import BrowserEngine from basepage.browser_engine import BrowserEngine
from basepage.check_gsjd import CheckGsjd from basepage.check_gsjd import CheckGsjd
@pytest.mark.case3 @pytest.mark.case3
def test_gsid_case1(): def test_gsid_case1():
...@@ -11,9 +11,6 @@ def test_gsid_case1(): ...@@ -11,9 +11,6 @@ def test_gsid_case1():
# browser = BrowserEngine() # browser = BrowserEngine()
# driver = browser.login_znfz() # driver = browser.login_znfz()
test = CheckGsjd() test = CheckGsjd('check_gsjd')
driver = test.choose_gsjd() driver = test.choose_gsjd()
test.choose_gsjd_case(driver) test.choose_gsjd_case()
time.sleep(20)
driver.quit()
\ No newline at end of file
import pytest import pytest
import time import time
import sys import sys
sys.path.append('..') sys.path.append('..')
from basepage.read_config import ReadConfig from basepage.read_config import ReadConfig
from basepage.browser_engine import BrowserEngine from basepage.browser_engine import BrowserEngine
from basepage.logger import Logger from basepage.logger import Logger
project_name = "TestLogin"
logger = Logger(logger="testLogin").getlog() logger = Logger(project_name).get_logger()
''' '''
def setup_function(): def setup_function():
print('setup_function:每个用例开始前都会执行') print('setup_function:每个用例开始前都会执行')
...@@ -16,14 +17,14 @@ def teardown_function(): ...@@ -16,14 +17,14 @@ def teardown_function():
print('teardown_function:每个用例结束后都会执行') print('teardown_function:每个用例结束后都会执行')
''' '''
@pytest.mark.case1 @pytest.mark.case1
def test_login(): def test_login():
conf = ReadConfig() conf = ReadConfig()
username = conf.get_userInfo('username') username = conf.get_userInfo('username')
password = conf.get_userInfo('password') password = conf.get_userInfo('password')
url = conf.get_testUrl('URL') url = conf.get_testUrl('URL')
print(username,password,url) print(username, password, url)
logger.info("username: %s" % username) logger.info("username: %s" % username)
logger.info("password :%s" % password) logger.info("password :%s" % password)
logger.info("Open url: %s" % url) logger.info("Open url: %s" % url)
...@@ -32,7 +33,7 @@ def test_login(): ...@@ -32,7 +33,7 @@ def test_login():
driver = browser.open_browser() driver = browser.open_browser()
tags = driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span') tags = driver.find_element_by_xpath('//*[@id="root"]/div/div/div[2]/form/div[1]/div/div/span/span/span')
#print(tags.text) # print(tags.text)
logger.info("tags.text:%s" % tags.text) logger.info("tags.text:%s" % tags.text)
tags.click() tags.click()
time.sleep(1) time.sleep(1)
...@@ -40,7 +41,7 @@ def test_login(): ...@@ -40,7 +41,7 @@ def test_login():
driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click() driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/span[1]').click()
tags2 = driver.find_element_by_xpath('//*[@id="rc-tree-select-list_1"]/ul/li/ul/li[3]/ul/li[3]/span[2]/span') tags2 = 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) # print(tags2.text)
logger.info("tags2.text:%s" % tags2.text) logger.info("tags2.text:%s" % tags2.text)
tags2.click() tags2.click()
time.sleep(1) time.sleep(1)
...@@ -52,6 +53,7 @@ def test_login(): ...@@ -52,6 +53,7 @@ def test_login():
time.sleep(10) time.sleep(10)
driver.quit() driver.quit()
@pytest.mark.case2 @pytest.mark.case2
def test_login2(): def test_login2():
browser = BrowserEngine() browser = BrowserEngine()
...@@ -62,11 +64,6 @@ def test_login2(): ...@@ -62,11 +64,6 @@ def test_login2():
if __name__ == '__main__': if __name__ == '__main__':
#pytest.main("D:/mywork/autotest/znfz_test1/test_cases") # pytest.main("D:/mywork/autotest/znfz_test1/test_cases")
# pytest.main(["-m=case1","--html=report.html"]) # pytest.main(["-m=case1","--html=report.html"])
pytest.main() pytest.main()
...@@ -7,9 +7,9 @@ import pytest ...@@ -7,9 +7,9 @@ import pytest
def func(x): def func(x):
return x + 1 return x + 1
@pytest.mark.case3 # @pytest.mark.case3
def test_file2_answer1(): # def test_file2_answer1():
assert func(9) == 10 # assert func(9) == 10
#if __name__ == '__main__': #if __name__ == '__main__':
#pytest.main("D:/mywork/autotest/znfz_test1/test_cases") #pytest.main("D:/mywork/autotest/znfz_test1/test_cases")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment