Skip to content

I
interfaceTest
Commit 2ca44b4e by zhaihuitao
Options

update

parent 13fde0b6
Showing with 119 additions and 71 deletions
.idea/workspace.xml
......@@ -2,11 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/iniUtil.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/setting/__init__.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/setting/config.ini" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/envcfg.py" afterPath="$PROJECT_DIR$/config/envcfg.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/prod/params.py" afterPath="$PROJECT_DIR$/config/prod/params.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_click/test_click.py" afterPath="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -78,7 +78,7 @@
<file leaf-file-name="baseEvent.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3033">
<state relative-caret-position="7260">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
......@@ -89,7 +89,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding />
</state>
</provider>
......@@ -98,7 +98,7 @@
<file leaf-file-name="test_install.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
......@@ -115,31 +115,33 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
<state relative-caret-position="132">
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
<folding>
<element signature="e#95#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<file leaf-file-name="config.ini" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/setting/config.ini">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<state relative-caret-position="60">
<caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<file leaf-file-name="iniUtil.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/common/iniUtil.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<state relative-caret-position="285">
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding />
</state>
</provider>
......@@ -148,17 +150,17 @@
<file leaf-file-name="click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-105">
<state relative-caret-position="195">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_click.py" pinned="false" current-in-tab="true">
<file leaf-file-name="test_click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
<state relative-caret-position="225">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding />
</state>
......@@ -218,6 +220,8 @@
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/common/iniUtil.py" />
<option value="$PROJECT_DIR$/config/setting/config.ini" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
</list>
</option>
......@@ -253,8 +257,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -349,7 +351,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="prod" />
<option name="myItemId" value="setting" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
......@@ -369,6 +371,8 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="ProjectViewState">
......@@ -970,7 +974,14 @@
<option name="project" value="LOCAL" />
<updated>1599569000215</updated>
</task>
<option name="localTasksCounter" value="44" />
<task id="LOCAL-00044" summary="update">
<created>1599897658186</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1599897658186</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers />
</component>
<component name="TestHistory">
......@@ -1018,11 +1029,11 @@
<frame x="0" y="23" width="1280" height="724" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21243942" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21567044" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5072698" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32838285" sideWeight="0.4927302" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4927302" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
......@@ -1061,30 +1072,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="27" column="13" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7260">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_install.py" />
<entry file="file://$PROJECT_DIR$/common/randomUtil.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -1098,7 +1085,9 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="840">
<caret line="59" column="17" lean-forward="true" selection-start-line="59" selection-start-column="17" selection-end-line="59" selection-end-column="17" />
<folding />
<folding>
<element signature="e#95#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1168,6 +1157,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="389" column="4" lean-forward="false" selection-start-line="389" selection-start-column="4" selection-end-line="389" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
......@@ -1335,9 +1325,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="13" />
<folding>
<element signature="e#100#115#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1345,7 +1332,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1367,7 +1353,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3033">
<state relative-caret-position="7260">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
......@@ -1376,7 +1362,7 @@
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<caret line="21" column="19" lean-forward="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding />
</state>
</provider>
......@@ -1391,12 +1377,36 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-105">
<state relative-caret-position="195">
<caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/iniUtil.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
......@@ -1407,27 +1417,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<entry file="file://$PROJECT_DIR$/config/config.ini">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<entry file="file://$PROJECT_DIR$/config/setting/config.ini">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<state relative-caret-position="60">
<caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding />
<state relative-caret-position="132">
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
<folding>
<element signature="e#95#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
common/iniUtil.py 0 → 100644
# -*- coding: utf-8 -*-
"""
@author：zhaiht
@file： iniUtil.py
@time： 2020/9/17 10:30
@desc：
"""
from configparser import ConfigParser
def read_config(config_file_path: str):
"""
读取配置文件
:param config_file_path: 文件路径
:return: 配置文件对象
"""
rc = ConfigParser()
rc.read(config_file_path)
return rc
\ No newline at end of file
config/envcfg.py
......@@ -7,12 +7,13 @@
"""
from numpy import long
from common import randomUtil
from common.iniUtil import read_config
import time
# 测试环境
# 生产环境：
read_config()
prod_click_url = 'http://uri6.com/tkio/Er6BFna'
prod_event_url = 'http://log.trackingio.com'
......
config/setting/__init__.py 0 → 100644
# -*- coding: utf-8 -*-
"""
@author：zhaiht
@file： __init__.py.py
@time： 2020/9/17 10:36
@desc：
"""
\ No newline at end of file
config/setting/config.ini 0 → 100644
[env]
prod_click_url = http://uri6.com/tkio/Er6BFna
prod_event_url = http://log.trackingio.com
prod_appkey = 895c5256a7f47bd2cca88a29da9e978a
event_interface = {"events": ['/receive/tkio/install']}
\ No newline at end of file
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