Commit 2b859933 by zhaihuitao

update

parent bb218573
......@@ -2,12 +2,15 @@
<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$/testcase/android_events/test_adshow.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_custom.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_payorder.py" />
<change type="MOVED" beforePath="$PROJECT_DIR$/testcase/android_events/test_pay.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_payment.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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_adshow.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_adshow.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_login.py" afterPath="$PROJECT_DIR$/testcase/android_events/test_login.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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -21,9 +24,11 @@
<SUITE FILE_PATH="coverage/interfaceTest$Nosetests_in_test_custom_py.coverage" NAME="Nosetests in test_custom.py Coverage Results" MODIFIED="1597999802477" 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$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_for_test_install_installTestCase_testinstall.coverage" NAME="Nosetests for test_install.installTestCase.testinstall Coverage Results" MODIFIED="1598258331962" 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_register_py.coverage" NAME="Nosetests in test_register.py Coverage Results" MODIFIED="1597913123658" 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_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/trackingIO$Nosetests_for_test_install_installTestCase.coverage" NAME="Nosetests for test_install.installTestCase Coverage Results" MODIFIED="1597283305272" 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="1598258215871" 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" />
......@@ -52,70 +57,68 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="randomUtil.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/common/randomUtil.py">
<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="268">
<caret line="25" column="16" lean-forward="false" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
<state relative-caret-position="352">
<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="envcfg.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/envcfg.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="24">
<caret line="12" column="6" lean-forward="false" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="6" />
<folding>
<element signature="e#98#120#0" expanded="true" />
</folding>
<state relative-caret-position="238">
<caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_startup.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.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="255">
<caret line="21" column="26" lean-forward="true" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
<folding />
<state relative-caret-position="315">
<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#103#118#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_payorder.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.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="118">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="46" />
<state relative-caret-position="315">
<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#104#119#0" expanded="true" />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="params.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="260" column="15" lean-forward="false" selection-start-line="260" selection-start-column="14" selection-end-line="260" selection-end-column="15" />
<state relative-caret-position="313">
<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#97#108#0" expanded="true" />
<element signature="e#102#117#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<file leaf-file-name="test_login.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
<provider selected="true" editor-type-id="text-editor">
<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#102#117#0" expanded="true" />
</folding>
<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>
......@@ -123,8 +126,8 @@
<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="133">
<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 relative-caret-position="322">
<caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
......@@ -132,35 +135,35 @@
</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="test_startup.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
<state relative-caret-position="253">
<caret line="21" column="26" lean-forward="true" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
<folding />
</state>
</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_payorder.py" pinned="false" current-in-tab="false">
<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="13" column="45" lean-forward="true" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
<folding />
<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#104#119#0" expanded="true" />
</folding>
</state>
</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_register.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="43" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="43" />
<state relative-caret-position="313">
<caret line="23" column="19" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<folding>
<element signature="e#101#116#0" expanded="true" />
<element signature="e#121#136#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -201,18 +204,20 @@
<option value="$PROJECT_DIR$/testcase/android_click/installEvent.py" />
<option value="$PROJECT_DIR$/testcase/android_events/installEvent.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<option value="$PROJECT_DIR$/testcase/android_click/click.py" />
<option value="$PROJECT_DIR$/testcase/android_click/test_click.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_startup.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_register.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_payorder.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_custom.py" />
<option value="$PROJECT_DIR$/config/prod/params.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_custom.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_login.py" />
<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" />
</list>
</option>
</component>
......@@ -394,27 +399,25 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Nosetests in test_adshow.py">
<configuration default="false" name="params" type="PythonConfigurationType" factoryName="Python" temporary="true">
<component name="RunManager" selected="Python tests.Nosetests for test_install.installTestCase.testinstall">
<configuration default="false" name="Nosetests in test_payorder.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<envs />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/config/prod" />
<option name="IS_MODULE_SDK" value="true" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/testcase/android_events" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<module name="trackingIO" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/config/prod/params.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<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_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_payment.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<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 />
......@@ -427,11 +430,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_payment.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 in test_payorder.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 />
......@@ -444,11 +447,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_adshow.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_adclick.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -461,11 +464,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_adclick.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method />
</configuration>
<configuration default="false" name="Nosetests in test_adshow.py" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<configuration default="false" name="Nosetests for test_install.installTestCase.testinstall" type="tests" factoryName="Nosetests" temporary="true" nameIsGenerated="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs />
......@@ -478,8 +481,8 @@
<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_adshow.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<option name="_new_target" value="&quot;test_install.installTestCase.testinstall&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method />
</configuration>
<configuration default="true" type="DjangoTestsConfigurationType" factoryName="Django tests">
......@@ -632,19 +635,19 @@
<method />
</configuration>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python.params" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payment.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 in test_custom.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.py" />
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_payorder.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_adshow.py" />
<item index="3" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="4" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
</list>
<recent_temporary>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.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 in test_payment.py" />
<item index="4" class="java.lang.String" itemvalue="Python.params" />
<item index="0" class="java.lang.String" itemvalue="Python tests.Nosetests for test_install.installTestCase.testinstall" />
<item index="1" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adclick.py" />
<item index="2" class="java.lang.String" itemvalue="Python tests.Nosetests in test_adshow.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_payorder.py" />
</list>
</recent_temporary>
</component>
......@@ -901,12 +904,25 @@
<option name="project" value="LOCAL" />
<updated>1597980128482</updated>
</task>
<option name="localTasksCounter" value="35" />
<task id="LOCAL-00035" summary="add adshow enevt">
<created>1598066542919</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1598066542919</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="TestHistory">
<history-entry file="Nosetests_for_test_pay_payTestCase - 2020.08.21 at 10h 59m 40s.xml">
<configuration name="Nosetests for test_pay.payTestCase" configurationId="tests" />
<history-entry file="Nosetests_for_test_install_installTestCase_testinstall - 2020.08.24 at 16h 38m 53s.xml">
<configuration name="Nosetests for test_install.installTestCase.testinstall" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_adclick_py - 2020.08.24 at 16h 02m 01s.xml">
<configuration name="Nosetests in test_adclick.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_adclick_py - 2020.08.24 at 16h 36m 57s.xml">
<configuration name="Nosetests in test_adclick.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_adshow_py - 2020.08.21 at 18h 02m 43s.xml">
<configuration name="Nosetests in test_adshow.py" configurationId="tests" />
......@@ -926,12 +942,6 @@
<history-entry file="Nosetests_in_test_custom_py - 2020.08.21 at 16h 50m 03s.xml">
<configuration name="Nosetests in test_custom.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_pay_py - 2020.08.21 at 10h 55m 23s.xml">
<configuration name="Nosetests in test_pay.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_pay_py - 2020.08.21 at 11h 21m 42s.xml">
<configuration name="Nosetests in test_pay.py" configurationId="tests" />
</history-entry>
<history-entry file="Nosetests_in_test_payorder_py - 2020.08.21 at 14h 29m 46s.xml">
<configuration name="Nosetests in test_payorder.py" configurationId="tests" />
</history-entry>
......@@ -983,21 +993,14 @@
<MESSAGE value="add install enevt" />
<MESSAGE value="add formate enevt" />
<MESSAGE value="add payment enevt" />
<option name="LAST_COMMIT_MESSAGE" value="add payment enevt" />
<MESSAGE value="add adshow enevt" />
<option name="LAST_COMMIT_MESSAGE" value="add adshow enevt" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<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>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
......@@ -1237,16 +1240,6 @@
</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="565">
<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>
<element signature="e#99#114#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/yamlUtil.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
......@@ -1313,16 +1306,6 @@
</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="253">
<caret line="22" column="19" lean-forward="true" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="19" />
<folding>
<element signature="e#102#117#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
......@@ -1341,10 +1324,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-227">
<caret line="284" column="41" lean-forward="true" selection-start-line="284" selection-start-column="41" selection-end-line="284" selection-end-column="41" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</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="352">
<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_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<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#103#118#0" expanded="true" />
</folding>
</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="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" />
<state relative-caret-position="315">
<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>
......@@ -1353,28 +1364,34 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<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="313">
<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>
</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="238">
<caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_login.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="43" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="43" />
<folding>
<element signature="e#101#116#0" expanded="true" />
</folding>
<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_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<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 relative-caret-position="322">
<caret line="24" column="19" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
<folding>
<element signature="e#103#118#0" expanded="true" />
</folding>
......@@ -1383,8 +1400,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payorder.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="46" />
<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#104#119#0" expanded="true" />
</folding>
......@@ -1393,29 +1410,21 @@
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_register.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="13" column="45" lean-forward="true" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
<folding />
<state relative-caret-position="313">
<caret line="23" column="19" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<folding>
<element signature="e#121#136#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<state relative-caret-position="253">
<caret line="21" column="26" lean-forward="true" selection-start-line="21" selection-start-column="26" selection-end-line="21" 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="153">
<caret line="260" column="15" lean-forward="false" selection-start-line="260" selection-start-column="14" selection-end-line="260" selection-end-column="15" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -287,3 +287,31 @@ params_adshow = {
'who': 'lxx_test'
}
params_adclick = {
"appid": prod['events']['appkey'],
"context": {
'_adPlatform': "mintegral",
'_adId': "adid",
"_campaignid": 'default',
"_deviceid": randomUtil.r.randimei(),
"_imei": randomUtil.r.randimei(),
# "_idfa": '75463565745634546',
"_androidid": "424653325643",
# "_imei2":"324323AAAA",
# "_meid": "CCC324323",
"_ip": randomUtil.r.randip(),
# "_ipv6": i,
'_manufacturer': "vivo",
'_ryos': "android",
'_rydevicetype': "vivox9",
'_network': "wifi",
'_resolution': "1344*750",
'_op': "中国移动",
'_timestamp': int(round(time.time() * 1000)),
'_oaid': '999b6e3e-a274-ed22-cebf-2b6dddfc29b7'
# '_mac':"565354131606"
},
# 'when': time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(time.time())),
# 'ds': ds,
'who': 'lxx_test'
}
# -*- coding: utf-8 -*-
"""
@author:zhaiht
@file: test_adclick.py
@time: 2020/8/24 15:54
@desc:
"""
import unittest
import json
import requests
from config.envcfg import prod, headers
from config.prod.params import params_adclick
class adclickTestCase(unittest.TestCase):
def testadclick(self):
r = requests.post(url=prod['events']['url'] + 'adclick', data=json.dumps(params_adclick), headers=headers, timeout=5)
print("广告点击:" + r.text)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -17,3 +17,6 @@ class adshowTestCase(unittest.TestCase):
def testadshow(self):
r = requests.post(url=prod['events']['url'] + 'adshow', data=json.dumps(params_adshow), headers=headers, timeout=5)
print("\n广告展示:" + r.text)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -17,3 +17,6 @@ class customTestCase(unittest.TestCase):
def testcustom(self):
p = requests.post(url=prod['events']['url'] + 'event', data=json.dumps(params_custom), headers=headers, timeout=5)
print("自定义" + p.text)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -17,3 +17,6 @@ class loninTestCase(unittest.TestCase):
def testlogin(self):
r = requests.post(url=prod['events']['url']+ 'loggedin', data=json.dumps(params_login), headers=headers, timeout=10)
print("登录" + r.text)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -20,3 +20,6 @@ class payTestCase(unittest.TestCase):
print(prod['events']['url'] + 'payment')
print(json.dumps(params_pay))
print(r)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -17,3 +17,6 @@ class payorderTestCase(unittest.TestCase):
def testpayorder(self):
p = requests.post(url=prod['events']['url'] + 'order', data=json.dumps(params_payorder), headers=headers, timeout=5)
print("订单" + p.text)
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
......@@ -19,3 +19,6 @@ class registerTestCase(unittest.TestCase):
p = requests.post(url=prod['events']['url'] + 'register', data=json.dumps(params_register), headers=headers, timeout=10)
# print("注册时间戳"+current_time_13)
print("注册" + p.text)
if __name__ == "__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