Commit 42320cc6 by zhaihuitao

update

parent fff0b935
......@@ -4,15 +4,9 @@
<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$/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_events/test_batchUpload.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_batchUpload.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_custom.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_custom.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_install.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_login.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_pageduration.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_payment.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payment.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_payorder.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/testcase/android_events/test_register.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_register.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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -40,16 +34,16 @@
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_pay_py.coverage" NAME="Nosetests in test_pay.py Coverage Results" MODIFIED="1597980100675" 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_token_py.coverage" NAME="Nosetests in test_token.py Coverage Results" MODIFIED="1598517865391" 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_custom_py.coverage" NAME="Nosetests in test_custom.py Coverage Results" MODIFIED="1600419053386" 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_adshow_py.coverage" NAME="Nosetests in test_adshow.py Coverage Results" MODIFIED="1598004274765" 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_adshow_py.coverage" NAME="Nosetests in test_adshow.py Coverage Results" MODIFIED="1600656320828" 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_for_test_install_installTestCase_testinstall.coverage" NAME="Nosetests for test_install.installTestCase.testinstall Coverage Results" MODIFIED="1600398774086" 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$click.coverage" NAME="click Coverage Results" MODIFIED="1599534306408" 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/trackingIO$Nosetests_in_test_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1596791537385" 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_in_test_click_py.coverage" NAME="Nosetests in test_click.py Coverage Results" MODIFIED="1599891588304" 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_in_test_adclick_py.coverage" NAME="Nosetests in test_adclick.py Coverage Results" MODIFIED="1598607297129" 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_adclick_py.coverage" NAME="Nosetests in test_adclick.py Coverage Results" MODIFIED="1600657787137" 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/trackingIO$randomUtil.coverage" NAME="randomUtil Coverage Results" MODIFIED="1596785449001" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/common" />
<SUITE FILE_PATH="coverage/trackingIO$Nosetests_for_test_click_clickTestCase.coverage" NAME="Nosetests for test_click.clickTestCase Coverage Results" MODIFIED="1596792693473" 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/trackingIO$Nosetests_for_test_click_clickTestCase_click.coverage" NAME="Nosetests for test_click.clickTestCase.click Coverage Results" MODIFIED="1597028770011" 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_in_test_appduration_py.coverage" NAME="Nosetests in test_appduration.py Coverage Results" MODIFIED="1598271935490" 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_appduration_py.coverage" NAME="Nosetests in test_appduration.py Coverage Results" MODIFIED="1600656111901" 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_payment_py.coverage" NAME="Nosetests in test_payment.py Coverage Results" MODIFIED="1600332917078" 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/trackingIO$Nosetests_for_test_install_installTestCase_install.coverage" NAME="Nosetests for test_install.installTestCase.install Coverage Results" MODIFIED="1597134802392" 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/trackingIO$Nosetests_in_test_login_py.coverage" NAME="Nosetests in test_login.py Coverage Results" MODIFIED="1597741887424" 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" />
......@@ -73,21 +67,21 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="params.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<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="1472">
<caret line="462" column="32" lean-forward="false" selection-start-line="462" selection-start-column="32" selection-end-line="462" selection-end-column="32" />
<state relative-caret-position="285">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_install.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<file leaf-file-name="test_payment.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<state relative-caret-position="187">
<caret line="17" column="52" lean-forward="false" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
<folding />
</state>
</provider>
......@@ -96,8 +90,8 @@
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<state relative-caret-position="189">
<caret line="31" column="125" lean-forward="false" selection-start-line="31" selection-start-column="125" selection-end-line="31" selection-end-column="125" />
<folding>
<element signature="e#95#117#0" expanded="true" />
</folding>
......@@ -105,29 +99,27 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_login.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
<file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="e#101#116#0" expanded="true" />
</folding>
<state relative-caret-position="103">
<caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_pageduration.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.py">
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
<state relative-caret-position="105">
<caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="true">
<file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
......@@ -139,13 +131,13 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_payment.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<file leaf-file-name="test_appduration.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="17" column="52" lean-forward="false" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
<state relative-caret-position="75">
<caret line="5" column="6" lean-forward="true" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
<folding>
<element signature="e#103#118#0" expanded="true" />
<element signature="e#107#122#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -163,23 +155,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_register.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<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="270">
<caret line="18" column="55" lean-forward="false" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="55" />
<folding>
<element signature="e#121#136#0" expanded="true" />
</folding>
<state relative-caret-position="285">
<caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="false">
<file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<state relative-caret-position="133">
<caret line="12" column="46" lean-forward="true" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<folding>
<element signature="e#104#119#0" expanded="true" />
</folding>
......@@ -223,12 +213,9 @@
<option value="$PROJECT_DIR$/testcase/android_events/installEvent.py" />
<option value="$PROJECT_DIR$/common/randomUtil.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_pay.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adshow.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_appduration.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_token.py" />
<option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/testcase/android_click/click.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/common/iniUtil.py" />
......@@ -240,9 +227,12 @@
<option value="$PROJECT_DIR$/testcase/android_events/test_payment.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_register.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_custom.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$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
</list>
</option>
</component>
......@@ -424,8 +414,8 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Nosetests in test_batchUpload.py">
<configuration default="false" name="Nosetests in test_pageduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<component name="RunManager" selected="Python tests.Nosetests in test_adclick.py">
<configuration default="false" name="Nosetests in test_custom.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -438,11 +428,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_pageduration.py&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_custom.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests for test_payment.payTestCase.testpayment" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<configuration default="false" name="Nosetests in test_batchUpload.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -455,11 +445,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;test_payment.payTestCase.testpayment&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_batchUpload.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_payorder.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<configuration default="false" name="Nosetests in test_appduration.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -472,11 +462,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_payorder.py&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_appduration.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_custom.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<configuration default="false" name="Nosetests in test_adshow.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -489,11 +479,11 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_custom.py&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_adshow.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_batchUpload.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<configuration default="false" name="Nosetests in test_adclick.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -506,7 +496,7 @@
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" runner="coverage.py" />
<option name="_new_regexPattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_batchUpload.py&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/testcase/android_events/test_adclick.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
......@@ -660,19 +650,19 @@
<method />
</configuration>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payment.payTestCase.testpayment" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_custom.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_custom.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
</list>
<recent_temporary>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_custom.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests for test_payment.payTestCase.testpayment" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_pageduration.py" />
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_appduration.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_batchUpload.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_custom.py" />
</list>
</recent_temporary>
</component>
......@@ -1006,7 +996,14 @@
<option name="project" value="LOCAL" />
<updated>1600310460396</updated>
</task>
<option name="localTasksCounter" value="46" />
<task id="LOCAL-00046" summary="update">
<created>1600654950267</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1600654950267</updated>
</task>
<option name="localTasksCounter" value="47" />
<servers />
</component>
<component name="TestHistory">
......@@ -1016,27 +1013,27 @@
<history-entry file="Nosetests_for_test_payment_payTestCase_testpayment - 2020.09.18 at 15h 42m 41s.xml">
<configuration name="Nosetests for test_payment.payTestCase.testpayment" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_adclick_py - 2020.09.21 at 11h 09m 49s.xml">
<configuration name="Nosetests in test_adclick.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_adshow_py - 2020.09.21 at 10h 45m 22s.xml">
<configuration name="Nosetests in test_adshow.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_appduration_py - 2020.09.21 at 10h 41m 54s.xml">
<configuration name="Nosetests in test_appduration.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_batchUpload_py - 2020.09.18 at 16h 51m 55s.xml">
<configuration name="Nosetests in test_batchUpload.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_custom_py - 2020.09.18 at 16h 50m 55s.xml">
<configuration name="Nosetests in test_custom.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_install_py - 2020.09.17 at 18h 06m 17s.xml">
<configuration name="Nosetests in test_install.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_login_py - 2020.09.18 at 15h 39m 50s.xml">
<configuration name="Nosetests in test_login.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_pageduration_py - 2020.09.17 at 15h 36m 21s.xml">
<configuration name="Nosetests in test_pageduration.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_pageduration_py - 2020.09.18 at 15h 41m 06s.xml">
<configuration name="Nosetests in test_pageduration.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_payment_py - 2020.09.17 at 16h 55m 18s.xml">
<configuration name="Nosetests in test_payment.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_payorder_py - 2020.09.18 at 15h 44m 01s.xml">
<configuration name="Nosetests in test_payorder.py" configurationId="tests" />
</history-entry>
......@@ -1061,7 +1058,7 @@
<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="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" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24959612" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838285" sideWeight="0.4951535" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39933994" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
......@@ -1280,13 +1277,6 @@
</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="165">
<caret line="15" column="45" lean-forward="false" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -1331,14 +1321,6 @@
</state>
</provider>
</entry>
<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="false" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
......@@ -1403,22 +1385,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="17" column="79" lean-forward="false" selection-start-line="17" selection-start-column="79" selection-end-line="17" selection-end-column="79" />
<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="-74">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="26" />
<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="1472">
......@@ -1432,7 +1398,7 @@
<state relative-caret-position="238">
<caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="e#101#116#0" expanded="true" />
<element signature="e#101#116#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1445,61 +1411,67 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="179">
<caret line="17" column="52" lean-forward="false" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
<state relative-caret-position="270">
<caret line="18" column="55" lean-forward="false" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="55" />
<folding>
<element signature="e#103#118#0" expanded="true" />
<element signature="e#121#136#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="55" lean-forward="false" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="55" />
<state relative-caret-position="268">
<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>
<element signature="e#121#136#0" expanded="true" />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_appduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<state relative-caret-position="75">
<caret line="5" column="6" lean-forward="true" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
<folding>
<element signature="e#104#119#0" expanded="true" />
<element signature="e#107#122#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<state relative-caret-position="103">
<caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<state relative-caret-position="189">
<caret line="31" column="125" lean-forward="false" selection-start-line="31" selection-start-column="125" selection-end-line="31" selection-end-column="125" />
<folding>
<element signature="e#95#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<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>
<element signature="e#102#117#0" expanded="true" />
</folding>
<state relative-caret-position="285">
<caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
......@@ -1513,5 +1485,31 @@
</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="285">
<caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="17" column="52" lean-forward="false" selection-start-line="17" selection-start-column="52" selection-end-line="17" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="12" column="46" lean-forward="true" selection-start-line="12" selection-start-column="46" selection-end-line="12" selection-end-column="46" />
<folding>
<element signature="e#104#119#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -28,7 +28,8 @@ prod_appkey = "895c5256a7f47bd2cca88a29da9e978a"
event_interface = dict(install='/receive/tkio/install', loggedin='/receive/tkio/loggedin',
pageduration='/receive/tkio/pageduration', payment='/receive/tkio/payment',
order='/receive/tkio/order', register='/receive/tkio/register',
startup='/receive/tkio/startup', event='/receive/tkio/event')
startup='/receive/tkio/startup', event='/receive/tkio/event',
appduration='/receive/tkio/appduration', adshow='/receive/tkio/adshow', adclick='/receive/tkio/adclick')
prod = {
......
......@@ -9,13 +9,13 @@
import unittest
import json
import requests
from config.envcfg import prod, headers
from config.envcfg import prod_event_url, headers, event_interface
from config.prod.params import params_adclick
class adclickTestCase(unittest.TestCase):
def testadclick(self):
r = requests.post(url=prod['events']['url'] + prod['events']['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)
if __name__ == "__main__":
......
......@@ -9,13 +9,13 @@
import unittest
import json
import requests
from config.envcfg import prod, headers
from config.envcfg import prod_event_url, headers, event_interface
from config.prod.params import params_adshow
class adshowTestCase(unittest.TestCase):
def testadshow(self):
r = requests.post(url=prod['events']['url'] + '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)
if __name__ == "__main__":
......
......@@ -9,13 +9,13 @@
import unittest
import json
import requests
from config.envcfg import prod, headers
from config.envcfg import prod_event_url, headers, event_interface
from config.prod.params import params_appduration
class appdurationTestCase(unittest.TestCase):
def testappduration(self):
r = requests.post(url=prod['events']['url'] + '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)
if __name__ == "__main__":
......
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