Commit 87d32a42 by zhaihuitao

update

parent 8c2677bb
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment=""> <list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/report/result.html" afterPath="$PROJECT_DIR$/report/result.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/report/result.html" afterPath="$PROJECT_DIR$/report/result.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/run_all_cases.py" afterPath="$PROJECT_DIR$/testcase/run_all_cases.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_adclick.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_adshow.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_adshow.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_appduration.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -14,7 +16,7 @@ ...@@ -14,7 +16,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/interfaceTest$run_all_cases.coverage" NAME="run_all_cases Coverage Results" MODIFIED="1604902207750" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" /> <SUITE FILE_PATH="coverage/interfaceTest$run_all_cases.coverage" NAME="run_all_cases Coverage Results" MODIFIED="1604903205503" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_click_clickTestCase_testclick.coverage" NAME="Nosetests for test_click.clickTestCase.testclick Coverage Results" MODIFIED="1603353013821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_click" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_for_test_click_clickTestCase_testclick.coverage" NAME="Nosetests for test_click.clickTestCase.testclick Coverage Results" MODIFIED="1603353013821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_click" />
<SUITE FILE_PATH="coverage/interfaceTest$params.coverage" NAME="params Coverage Results" MODIFIED="1597980084524" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config/prod" /> <SUITE FILE_PATH="coverage/interfaceTest$params.coverage" NAME="params Coverage Results" MODIFIED="1597980084524" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/config/prod" />
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_batchUpload_py.coverage" NAME="Nosetests in test_batchUpload.py Coverage Results" MODIFIED="1601196142097" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_events" /> <SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_batchUpload_py.coverage" NAME="Nosetests in test_batchUpload.py Coverage Results" MODIFIED="1601196142097" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/testcase/android_events" />
...@@ -124,8 +126,8 @@ ...@@ -124,8 +126,8 @@
<element signature="e#3667#3671#0" expanded="true" /> <element signature="e#3667#3671#0" expanded="true" />
<element signature="e#19069#19075#1" expanded="true" /> <element signature="e#19069#19075#1" expanded="true" />
<element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<marker date="1604902937247" expanded="true" signature="19245:19260" ph="..." /> <marker date="1604903225481" expanded="true" signature="19245:19260" ph="..." />
<marker date="1604902937247" expanded="true" signature="19280:19292" ph="..." /> <marker date="1604903225481" expanded="true" signature="19280:19292" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -134,25 +136,57 @@ ...@@ -134,25 +136,57 @@
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false"> <file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="run_all_cases.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
<caret line="10" column="11" lean-forward="true" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="run_all_cases.py" pinned="false" current-in-tab="true"> <file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="270">
<caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <caret line="18" column="23" lean-forward="false" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
<folding> <folding>
<element signature="e#105#120#0" expanded="true" /> <element signature="e#102#117#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test_appduration.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</file>
<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="418">
<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>
</file>
<file leaf-file-name="HTMLTestReportCN.py" pinned="false" current-in-tab="false"> <file leaf-file-name="HTMLTestReportCN.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/report/HTMLTestReportCN.py"> <entry file="file://$PROJECT_DIR$/report/HTMLTestReportCN.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -223,9 +257,6 @@ ...@@ -223,9 +257,6 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_payorder.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adshow.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_register.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_register.py" />
<option value="$PROJECT_DIR$/common/socket/socketTest.py" /> <option value="$PROJECT_DIR$/common/socket/socketTest.py" />
<option value="$PROJECT_DIR$/common/socket/TCPclient.py" /> <option value="$PROJECT_DIR$/common/socket/TCPclient.py" />
...@@ -242,6 +273,9 @@ ...@@ -242,6 +273,9 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_login.py" /> <option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<option value="$PROJECT_DIR$/report/result.html" /> <option value="$PROJECT_DIR$/report/result.html" />
<option value="$PROJECT_DIR$/testcase/run_all_cases.py" /> <option value="$PROJECT_DIR$/testcase/run_all_cases.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adshow.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -646,13 +680,6 @@ ...@@ -646,13 +680,6 @@
<updated>1596505503233</updated> <updated>1596505503233</updated>
<workItem from="1596786333197" duration="228000" /> <workItem from="1596786333197" duration="228000" />
</task> </task>
<task id="LOCAL-00020" summary="add install enevt">
<created>1597653726001</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1597653726001</updated>
</task>
<task id="LOCAL-00021" summary="add install enevt"> <task id="LOCAL-00021" summary="add install enevt">
<created>1597655841618</created> <created>1597655841618</created>
<option name="number" value="00021" /> <option name="number" value="00021" />
...@@ -989,7 +1016,14 @@ ...@@ -989,7 +1016,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1604892322000</updated> <updated>1604892322000</updated>
</task> </task>
<option name="localTasksCounter" value="69" /> <task id="LOCAL-00069" summary="update">
<created>1604903171628</created>
<option name="number" value="00069" />
<option name="presentableId" value="LOCAL-00069" />
<option name="project" value="LOCAL" />
<updated>1604903171628</updated>
</task>
<option name="localTasksCounter" value="70" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
...@@ -1196,13 +1230,6 @@ ...@@ -1196,13 +1230,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
...@@ -1306,14 +1333,6 @@ ...@@ -1306,14 +1333,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="11" lean-forward="false" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py"> <entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -1428,14 +1447,6 @@ ...@@ -1428,14 +1447,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="11" lean-forward="true" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/report/result.html"> <entry file="file://$PROJECT_DIR$/report/result.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -1448,8 +1459,8 @@ ...@@ -1448,8 +1459,8 @@
<element signature="e#3667#3671#0" expanded="true" /> <element signature="e#3667#3671#0" expanded="true" />
<element signature="e#19069#19075#1" expanded="true" /> <element signature="e#19069#19075#1" expanded="true" />
<element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<marker date="1604902937247" expanded="true" signature="19245:19260" ph="..." /> <marker date="1604903225481" expanded="true" signature="19245:19260" ph="..." />
<marker date="1604902937247" expanded="true" signature="19280:19292" ph="..." /> <marker date="1604903225481" expanded="true" signature="19280:19292" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1478,23 +1489,49 @@ ...@@ -1478,23 +1489,49 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2753"> <state relative-caret-position="418">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/run_all_cases.py"> <entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="270">
<caret line="15" column="25" lean-forward="false" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" /> <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
<folding> <folding>
<element signature="e#105#120#0" expanded="true" /> <element signature="e#103#118#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="23" lean-forward="false" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
<folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -123,8 +123,8 @@ function html_escape(s) { ...@@ -123,8 +123,8 @@ function html_escape(s) {
<div class='heading'> <div class='heading'>
<h1 style="font-family: Microsoft YaHei">&lt;TKIO接口监控报告&gt;</h1> <h1 style="font-family: Microsoft YaHei">&lt;TKIO接口监控报告&gt;</h1>
<p class='attribute'><strong>测试人员 : </strong> 翟会涛</p> <p class='attribute'><strong>测试人员 : </strong> 翟会涛</p>
<p class='attribute'><strong>开始时间 : </strong> 2020-11-09 14:22:13</p> <p class='attribute'><strong>开始时间 : </strong> 2020-11-09 14:27:03</p>
<p class='attribute'><strong>合计耗时 : </strong> 0:00:03.505581</p> <p class='attribute'><strong>合计耗时 : </strong> 0:00:02.100936</p>
<p class='attribute'><strong>测试结果 : </strong> 共 14,通过 14,通过率= 100.00%</p> <p class='attribute'><strong>测试结果 : </strong> 共 14,通过 14,通过率= 100.00%</p>
<p class='description'>TKIO接口自动化测试用例</p> <p class='description'>TKIO接口自动化测试用例</p>
...@@ -354,7 +354,7 @@ pt6_1: 自定义{"status":0} ...@@ -354,7 +354,7 @@ pt6_1: 自定义{"status":0}
<div id='div_pt7_1' class="collapse in"> <div id='div_pt7_1' class="collapse in">
<pre> <pre>
pt7_1: {"ts":1604902935788,"status":0} pt7_1: {"ts":1604903224805,"status":0}
</pre> </pre>
......
...@@ -16,7 +16,7 @@ from config.prod.params import params_adclick ...@@ -16,7 +16,7 @@ from config.prod.params import params_adclick
class adclickTestCase(unittest.TestCase): class adclickTestCase(unittest.TestCase):
def testadclick(self): def testadclick(self):
r = requests.post(url=prod_event_url+event_interface["adclick"], data=json.dumps(params_adclick), headers=headers, timeout=5) r = requests.post(url=prod_event_url+event_interface["adclick"], data=json.dumps(params_adclick), headers=headers, timeout=5)
print("广告点击:" + r.text) print("click:" + r.text)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
\ No newline at end of file
...@@ -16,7 +16,7 @@ from config.prod.params import params_adshow ...@@ -16,7 +16,7 @@ from config.prod.params import params_adshow
class adshowTestCase(unittest.TestCase): class adshowTestCase(unittest.TestCase):
def testadshow(self): def testadshow(self):
r = requests.post(url=prod_event_url+event_interface["adshow"], data=json.dumps(params_adshow), headers=headers, timeout=5) r = requests.post(url=prod_event_url+event_interface["adshow"], data=json.dumps(params_adshow), headers=headers, timeout=5)
print("\n广告展示:" + r.text) print("\nadshow:" + r.text)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
\ No newline at end of file
...@@ -16,7 +16,7 @@ from config.prod.params import params_appduration ...@@ -16,7 +16,7 @@ from config.prod.params import params_appduration
class appdurationTestCase(unittest.TestCase): class appdurationTestCase(unittest.TestCase):
def testappduration(self): def testappduration(self):
r = requests.post(url=prod_event_url+event_interface["appduration"], data=json.dumps(params_appduration), headers=headers, timeout=5) r = requests.post(url=prod_event_url+event_interface["appduration"], data=json.dumps(params_appduration), headers=headers, timeout=5)
print("App使用时长:" + r.text) print("appduration:" + r.text)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()
\ 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