修复小bug

This commit is contained in:
yanchunhuo 2019-10-16 10:36:48 +08:00
parent 2e526fe764
commit 0c41e06f31
10 changed files with 19 additions and 28 deletions

View File

@ -18,6 +18,6 @@ class APP_UI_Android_demoProject_Client(object):
self.config = Read_APP_UI_Config().app_ui_config
self.demoProjectConfig = APP_UI_Android_DemoProject_Read_Config().config
self.driver = webdriver.Remote(self.config.appium_hub,desired_capabilities=self.demoProjectConfig.get_desired_capabilities())
self.appPerator = AppOperator(self.driver)
self.appOperator = AppOperator(self.driver)
self.__inited=True

View File

@ -7,16 +7,16 @@ import time
class TestIndexPage:
def setup_class(self):
self.demoProjectClient = APP_UI_Android_demoProject_Client()
self.startPage=StartPage(self.demoProjectClient.appPerator)
self.startPage=StartPage(self.demoProjectClient.appOperator)
self.startPage.click_start()
self.indexPage=self.startPage.choice_a_city()
self.appPerator=self.demoProjectClient.appPerator
self.appOperator=self.demoProjectClient.appOperator
@pytest.fixture(autouse=True)
def record_test_case_video(self):
self.demoProjectClient.appPerator.start_recording_screen()
self.appOperator.start_recording_screen()
yield self.record_test_case_video
self.demoProjectClient.appPerator.stop_recording_screen()
self.appOperator.stop_recording_screen()
@pytest.fixture
def fixture_test_silde(self):
@ -32,4 +32,4 @@ class TestIndexPage:
self.indexPage.index_down_silde()
def teardown_class(self):
self.demoProjectClient.appPerator.reset_app()
self.appOperator.reset_app()

View File

@ -5,13 +5,13 @@ import pytest
class TestStartPage:
def setup_class(self):
self.demoProjectClient = APP_UI_Android_demoProject_Client()
self.startPage=StartPage(self.demoProjectClient.appPerator)
self.startPage=StartPage(self.demoProjectClient.appOperator)
@pytest.fixture(autouse=True)
def record_test_case_video(self):
self.demoProjectClient.appPerator.start_recording_screen()
self.demoProjectClient.appOperator.start_recording_screen()
yield self.record_test_case_video
self.demoProjectClient.appPerator.stop_recording_screen()
self.demoProjectClient.appOperator.stop_recording_screen()
@pytest.fixture
def fixture_test_click_start_btn(self):
@ -32,4 +32,4 @@ class TestStartPage:
self.startPage.choice_a_city()
def teardown_class(self):
self.demoProjectClient.appPerator.reset_app()
self.demoProjectClient.appOperator.reset_app()

View File

@ -1,5 +1,4 @@
#-*- coding:utf8 -*-
from init.java.java_maven_init import java_maven_init
from init.app_ui.android.demoProject.demoProjectInit import DemoProjectInit
def android_init():
@ -7,7 +6,5 @@ def android_init():
初始化android项目必要的数据
:return:
"""
# 初始化java依赖的libs
java_maven_init()
# demoProject项目初始化
DemoProjectInit().init()

View File

@ -1,10 +1,7 @@
#-*- coding:utf8 -*-
from init.java.java_maven_init import java_maven_init
def chrome_init():
"""
初始化ios项目必要的数据
:return:
"""
# 初始化java依赖的libs
java_maven_init()
pass

View File

@ -1,10 +1,7 @@
#-*- coding:utf8 -*-
from init.java.java_maven_init import java_maven_init
def ios_init():
"""
初始化ios项目必要的数据
:return:
"""
# 初始化java依赖的libs
java_maven_init()
pass

View File

@ -1,10 +1,7 @@
#-*- coding:utf8 -*-
from init.java.java_maven_init import java_maven_init
def windows_init():
"""
初始化Windows必要的数据
:return:
"""
# 初始化图像识别tess4j依赖的libs
java_maven_init()
pass

View File

@ -2,7 +2,7 @@
from init.java.java_maven_init import java_maven_init
from init.web_ui.demoProject.demoProjectInit import DemoProjectInit
def init():
def web_ui_init():
"""
初始化必要的数据
:return:

View File

@ -6,6 +6,7 @@ from init.app_ui.android.android_init import android_init
from init.app_ui.chrome.chrome_init import chrome_init
from init.app_ui.ios.ios_init import ios_init
from init.app_ui.winwos.windows_init import windows_init
from init.java.java_maven_init import java_maven_init
import argparse
import jpype
import json
@ -37,6 +38,8 @@ if __name__=='__main__':
jpype.startJVM(jpype.get_default_jvm_path(),"-ea","-Djava.class.path="+JavaTool.getAllJar())
print('启动jvm成功')
java_maven_init()
print('初始化android基础数据......')
android_init()
print('初始化android基础数据完成......')

View File

@ -2,7 +2,7 @@
from base.read_web_ui_config import Read_WEB_UI_Config
from common.fileTool import FileTool
from common.httpclient.doRequest import DoRequest
from init.web_ui.web_ui_init import init
from init.web_ui.web_ui_init import web_ui_init
from selenium.webdriver.remote.remote_connection import RemoteConnection
from selenium.webdriver.remote.command import Command
import argparse
@ -31,7 +31,7 @@ if __name__=='__main__':
sys.exit('selenium server状态为不可用')
print('初始化基础数据......')
init()
web_ui_init()
print('初始化基础数据完成......')
print('初始化完成......')