Commit 53efdb75 authored by libin's avatar libin
Browse files

20190723

parent d3e5547e
......@@ -23,11 +23,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/common/web_client.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="485" column="39" lean-forward="true" selection-start-line="485" selection-start-column="22" selection-end-line="485" selection-end-column="44" />
<state relative-caret-position="243">
<caret line="478" column="8" selection-start-line="478" selection-start-column="8" selection-end-line="478" selection-end-column="8" />
<folding>
<element signature="e#64#78#0" expanded="true" />
</folding>
......@@ -35,6 +35,36 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/testcase_for_test/testcase036_companyadmin_delete_role.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/module/deal_db_data.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="12" column="61" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
<folding>
<element signature="e#22#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/run/run.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/testcases_admin/testcase020_companyadmin_uploading_station_map.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -71,15 +101,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/datalib/test_data.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="405" selection-start-line="405" selection-end-line="405" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/module/login_swp.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -89,15 +110,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/testcases_admin/testcase003_superadministrator_createcompany.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274">
<caret line="40" column="97" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="97" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -219,7 +231,13 @@
<item name="Smart_workspace" type="b2602c69:ProjectViewProjectNode" />
<item name="Smart_workspace" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="screenshot" type="462c0819:PsiDirectoryNode" />
<item name="run" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Smart_workspace" type="b2602c69:ProjectViewProjectNode" />
<item name="Smart_workspace" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="testcase_for_test" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -409,7 +427,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49916527" visible="true" weight="0.25131717" />
......@@ -583,15 +601,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/run/run.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="26" column="8" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
<state relative-caret-position="529">
<caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/testcase_for_test/testcase036_companyadmin_delete_role.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="43" column="33" selection-start-line="43" selection-start-column="33" selection-end-line="43" selection-end-column="33" />
<state relative-caret-position="458">
<caret line="43" column="37" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
</state>
</provider>
</entry>
......@@ -604,8 +622,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/module/deal_db_data.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
<state relative-caret-position="276">
<caret line="12" column="61" selection-start-line="12" selection-start-column="61" selection-end-line="12" selection-end-column="61" />
<folding>
<element signature="e#22#57#0" expanded="true" />
</folding>
......@@ -799,8 +817,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/common/web_client.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="485" column="39" lean-forward="true" selection-start-line="485" selection-start-column="22" selection-end-line="485" selection-end-column="44" />
<state relative-caret-position="243">
<caret line="478" column="8" selection-start-line="478" selection-start-column="8" selection-end-line="478" selection-end-column="8" />
<folding>
<element signature="e#64#78#0" expanded="true" />
</folding>
......
......@@ -10,7 +10,7 @@ def assert_select_result(select_sql,msg):
sql_obj.connectdb()
sql_obj.executeSQL(select_sql)
result = sql_obj.result[0][0]
print("expected result:" + msg + ",actual result:" + result)
print("expected result:",msg, ",actual result:",result)
sql_obj.commitSQL()
sql_obj.close_connect()
if isinstance(result, str):
......
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