Commit c02d1fc9 by zhangying

review

parent 73289859
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (xm-uitest-sow)" project-jdk-type="Python SDK" />
</project> </project>
\ No newline at end of file
...@@ -2,14 +2,25 @@ ...@@ -2,14 +2,25 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f091fe1a-072c-4ac2-a8ca-080be739597a" name="Default Changelist" comment=""> <list default="true" id="f091fe1a-072c-4ac2-a8ca-080be739597a" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/case/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/case/test_enter.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/commom/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/liveRoom/__init__.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/liveRoom/coursewareTab.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/liveRoom/roomName.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/liveRoom/startPrompt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/__init__.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/xm-uitest-live.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/xm-uitest-live.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/classStatus.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/classStatus.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/alertAccept.py" beforeDir="false" afterPath="$PROJECT_DIR$/commom/alertAccept.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/enterClass.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/enterClass.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/appDriver.py" beforeDir="false" afterPath="$PROJECT_DIR$/commom/appDriver.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/startClass.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/startClass.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/liveCourseTable/classStatus.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/classStatus.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/today.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/today.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/liveCourseTable/enterClass.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/enterClass.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/weekDay.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/weekDay.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/liveCourseTable/startClass.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/startClass.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourse/weekName.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/weekName.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/liveCourseTable/today.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/today.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourseTable/weekDay.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/weekDay.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/liveCourseTable/weekName.py" beforeDir="false" afterPath="$PROJECT_DIR$/liveCourseTable/weekName.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/login.py" beforeDir="false" afterPath="$PROJECT_DIR$/commom/login.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -20,61 +31,66 @@ ...@@ -20,61 +31,66 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/alertAccept.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40"> <state relative-caret-position="220">
<caret line="2" column="34" lean-forward="true" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" /> <caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/appDriver.py"> <entry file="file://$PROJECT_DIR$/commom/appDriver.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<folding> <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
<element signature="e#0#9#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/login.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20"> <state relative-caret-position="240">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="12" column="60" selection-start-line="12" selection-start-column="60" selection-end-line="12" selection-end-column="60" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py"> <entry file="file://$PROJECT_DIR$/case/test_enter.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="120">
<caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" /> <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py"> <entry file="file://$PROJECT_DIR$/commom/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/commom/login.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="140">
<folding> <caret line="7" column="56" selection-start-line="7" selection-start-column="56" selection-end-line="7" selection-end-column="56" />
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py"> <entry file="file://$PROJECT_DIR$/liveRoom/roomName.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<caret selection-end-line="20" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
...@@ -83,9 +99,10 @@ ...@@ -83,9 +99,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/today.py"> <entry file="file://$PROJECT_DIR$/liveRoom/coursewareTab.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="400">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
...@@ -94,9 +111,10 @@ ...@@ -94,9 +111,10 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekDay.py"> <entry file="file://$PROJECT_DIR$/liveRoom/startPrompt.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="140">
<caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
...@@ -104,8 +122,8 @@ ...@@ -104,8 +122,8 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekName.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<folding> <folding>
...@@ -115,11 +133,6 @@ ...@@ -115,11 +133,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/liveCourseTable/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -137,15 +150,26 @@ ...@@ -137,15 +150,26 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/wyfTest.py" /> <option value="$PROJECT_DIR$/wyfTest.py" />
<option value="$PROJECT_DIR$/appDriver.py" />
<option value="$PROJECT_DIR$/login.py" /> <option value="$PROJECT_DIR$/login.py" />
<option value="$PROJECT_DIR$/liveCourseTable/today.py" />
<option value="$PROJECT_DIR$/liveCourseTable/weekDay.py" />
<option value="$PROJECT_DIR$/liveCourseTable/classStatus.py" />
<option value="$PROJECT_DIR$/liveRoom/startPrompt.py" />
<option value="$PROJECT_DIR$/liveRoom/roomName.py" />
<option value="$PROJECT_DIR$/liveRoom/CoursewareTab.py" />
<option value="$PROJECT_DIR$/liveRoom/coursewareTab.py" />
<option value="$PROJECT_DIR$/case/test_one.py" />
<option value="$PROJECT_DIR$/common.py" />
<option value="$PROJECT_DIR$/case/test_enter.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="431" /> <option name="x" value="416" />
<option name="y" value="228" /> <option name="y" value="116" />
<option name="width" value="1795" /> <option name="width" value="1874" />
<option name="height" value="1073" /> <option name="height" value="1189" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
...@@ -153,7 +177,6 @@ ...@@ -153,7 +177,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -164,18 +187,19 @@ ...@@ -164,18 +187,19 @@
<path> <path>
<item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" /> <item name="xm-uitest-sow" type="b2602c69:ProjectViewProjectNode" />
<item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" /> <item name="xm-uitest-sow" type="462c0819:PsiDirectoryNode" />
<item name="liveCourseTable" type="462c0819:PsiDirectoryNode" /> <item name="case" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$USER_HOME$/Downloads/comSpider" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" /> <property name="node.js.path.for.package.eslint" value="project" />
...@@ -184,9 +208,11 @@ ...@@ -184,9 +208,11 @@
<property name="node.js.selected.package.tslint" value="(autodetect)" /> <property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\pycharm projects\xm-uitest-sow\commom" />
<recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" /> <recent name="C:\Users\Administrator\PycharmProjects\xm-uitest-live" />
</key> </key>
</component> </component>
...@@ -202,8 +228,52 @@ ...@@ -202,8 +228,52 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager"> <component name="RunManager" selected="Python tests.pytest for test_enter.test_answer">
<configuration name="wyfTest" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="classStatus" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/liveCourseTable" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/liveCourseTable/classStatus.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="enterClass" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/liveCourseTable" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/liveCourseTable/enterClass.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="login" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="xm-uitest-live" /> <module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
...@@ -216,7 +286,29 @@ ...@@ -216,7 +286,29 @@
<option name="ADD_CONTENT_ROOTS" value="true" /> <option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" /> <option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/wyfTest.py" /> <option name="SCRIPT_NAME" value="D:\pycharm projects\xm-uitest-sow\commom\login.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="roomName" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/liveRoom" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/liveRoom/roomName.py" />
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" /> <option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" /> <option name="EMULATE_TERMINAL" value="false" />
...@@ -225,9 +317,29 @@ ...@@ -225,9 +317,29 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="pytest for test_enter.test_answer" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
<module name="xm-uitest-live" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/case" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="_new_keywords" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;test_enter.test_answer&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" />
</configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.wyfTest" /> <item itemvalue="Python tests.pytest for test_enter.test_answer" />
<item itemvalue="Python.enterClass" />
<item itemvalue="Python.roomName" />
<item itemvalue="Python.classStatus" />
<item itemvalue="Python.login" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -243,7 +355,11 @@ ...@@ -243,7 +355,11 @@
<updated>1620807921250</updated> <updated>1620807921250</updated>
<workItem from="1620807922438" duration="3526000" /> <workItem from="1620807922438" duration="3526000" />
<workItem from="1620873798861" duration="1909000" /> <workItem from="1620873798861" duration="1909000" />
<workItem from="1620882771688" duration="804000" /> <workItem from="1620882771688" duration="3252000" />
<workItem from="1621251366435" duration="656000" />
<workItem from="1621391993522" duration="14000" />
<workItem from="1621392022360" duration="821000" />
<workItem from="1621566277426" duration="4889000" />
</task> </task>
<task id="LOCAL-00001" summary="test test"> <task id="LOCAL-00001" summary="test test">
<created>1620811442738</created> <created>1620811442738</created>
...@@ -273,30 +389,42 @@ ...@@ -273,30 +389,42 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1620882887920</updated> <updated>1620882887920</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="rename">
<created>1620884042477</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1620884042477</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TestHistory">
<history-entry file="pytest_for_test_enter_test_answer - 2021.05.21 at 16h 37m 40s.xml">
<configuration name="pytest for test_enter.test_answer" configurationId="tests" />
</history-entry>
</component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6239000" /> <option name="totallyTimeSpent" value="15067000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="431" y="228" width="1795" height="1073" extended-state="0" /> <frame x="416" y="116" width="1874" height="1189" extended-state="0" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.33832854" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22657111" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49945474" visible="true" weight="0.46991038" /> <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49945474" weight="0.40295565" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" visible="true" weight="0.2736954" /> <window_info anchor="bottom" id="Version Control" order="8" weight="0.2736954" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50054526" side_tool="true" weight="0.39504844" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50054526" side_tool="true" weight="0.39504844" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.3290653" /> <window_info anchor="bottom" id="Terminal" order="11" visible="true" weight="0.28530806" />
<window_info anchor="bottom" id="Python Console" order="12" weight="0.3290653" /> <window_info anchor="bottom" id="Python Console" order="12" weight="0.3290653" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...@@ -311,19 +439,42 @@ ...@@ -311,19 +439,42 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="test test" /> <MESSAGE value="test test" />
<MESSAGE value="just just test" /> <MESSAGE value="just just test" />
<option name="LAST_COMMIT_MESSAGE" value="just just test" /> <MESSAGE value="rename" />
<option name="LAST_COMMIT_MESSAGE" value="rename" />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/xm_uitest_sow$enterClass.coverage" NAME="enterClass Coverage Results" MODIFIED="1621568267725" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveCourseTable" />
<SUITE FILE_PATH="coverage/xm_uitest_live$wyfTest.coverage" NAME="wyfTest Coverage Results" MODIFIED="1620809942975" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/xm_uitest_live$wyfTest.coverage" NAME="wyfTest Coverage Results" MODIFIED="1620809942975" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$classStatus.coverage" NAME="classStatus Coverage Results" MODIFIED="1620974730032" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveCourseTable" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$roomName.coverage" NAME="roomName Coverage Results" MODIFIED="1621567390821" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/liveRoom" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$login.coverage" NAME="login Coverage Results" MODIFIED="1620884769813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/xm_uitest_sow$pytest_for_test_enter_test_answer.coverage" NAME="pytest for test_enter.test_answer Coverage Results" MODIFIED="1621586260062" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/case" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/server.log" /> <entry file="file://$PROJECT_DIR$/server.log" />
<entry file="file://$PROJECT_DIR$/wyfTest.py" /> <entry file="file://$PROJECT_DIR$/wyfTest.py" />
<entry file="file://$PROJECT_DIR$/appDriver.py"> <entry file="file://$PROJECT_DIR$/commom/alertAccept.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/today.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="320">
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekName.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<folding> <folding>
<element signature="e#0#9#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -331,66 +482,93 @@ ...@@ -331,66 +482,93 @@
<entry file="file://$PROJECT_DIR$/liveCourseTable/__init__.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/__init__.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/login.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/weekDay.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20"> <state relative-caret-position="360">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/alertAccept.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40"> <state relative-caret-position="220">
<caret line="2" column="34" lean-forward="true" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" /> <caret line="11" column="54" selection-start-line="11" selection-start-column="54" selection-end-line="11" selection-end-column="54" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/today.py"> <entry file="file://$PROJECT_DIR$/liveRoom/startPrompt.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="140">
<caret line="7" column="21" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekDay.py"> <entry file="file://$PROJECT_DIR$/liveRoom/roomName.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<caret selection-end-line="20" selection-end-column="20" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/weekName.py"> <entry file="file://$PROJECT_DIR$/liveRoom/coursewareTab.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="400">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/classStatus.py"> <entry file="file://$PROJECT_DIR$/commom/login.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="140">
<caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" /> <caret line="7" column="56" selection-start-line="7" selection-start-column="56" selection-end-line="7" selection-end-column="56" />
<folding>
<element signature="e#0#36#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py"> <entry file="file://$PROJECT_DIR$/commom/appDriver.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
<caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/enterClass.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="12" column="60" selection-start-line="12" selection-start-column="60" selection-end-line="12" selection-end-column="60" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/commom/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/case/test_enter.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py"> <entry file="file://$PROJECT_DIR$/liveCourseTable/startClass.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
...@@ -401,4 +579,19 @@ ...@@ -401,4 +579,19 @@
</provider> </provider>
</entry> </entry>
</component> </component>
<component name="masterDetails">
<states>
<state key="ScopeChooserConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project> </project>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="Python 3.8 (xm-uitest-sow)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TestRunnerService"> <component name="TestRunnerService">
......
import pytest
# content of test_sample.py
def func(x):
return x + 1
def test_answer():
assert func(3) == 5
\ No newline at end of file
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from startClass import start_class from startClass import start_class
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
......
...@@ -31,5 +31,6 @@ def get_app_driver(PATH_TO_BINARY_APP): ...@@ -31,5 +31,6 @@ def get_app_driver(PATH_TO_BINARY_APP):
if __name__ == '__main__': if __name__ == '__main__':
driver = get_app_driver(PATH_TO_BINARY_APP) get_app_driver()
# driver = get_app_driver(PATH_TO_BINARY_APP)
# driver.find_element_by_id("rc-tabs-0-tab-2").click() # driver.find_element_by_id("rc-tabs-0-tab-2").click()
from appDriver import get_app_driver, driver from commom.appDriver import get_app_driver
# driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
# 手机号登录 # 手机号登录
def app_login(driver): def app_login(driver):
......
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
...@@ -10,13 +9,13 @@ app_login(driver) ...@@ -10,13 +9,13 @@ app_login(driver)
def classStatus(driver): def classStatus(driver):
driver.implicitly_wait(10) driver.implicitly_wait(10)
element = driver.find_element_by_class_name("classStatus") classStatusElement = driver.find_element_by_class_name("classStatus")
print(element) print(classStatusElement)
print(element.size) print(classStatusElement)
print(element.text) print(classStatusElement)
return element return classStatusElement
if __name__ == '__main__': if __name__ == '__main__':
classStatus(driver) classStatus(driver)
\ No newline at end of file
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
......
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time from time import sleep
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
......
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
...@@ -10,13 +9,13 @@ app_login(driver) ...@@ -10,13 +9,13 @@ app_login(driver)
def today(driver): def today(driver):
driver.implicitly_wait(10) driver.implicitly_wait(10)
element = driver.find_element_by_class_name("today") todyElement = driver.find_element_by_class_name("today")
print(element) print(todyElement)
print(element.size) print(todyElement.size)
print(element.text) print(todyElement.text)
return element return todyElement
if __name__ == '__main__': if __name__ == '__main__':
today(driver) today(driver)
\ No newline at end of file
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
...@@ -10,13 +9,13 @@ app_login(driver) ...@@ -10,13 +9,13 @@ app_login(driver)
def weekDay(driver): def weekDay(driver):
driver.implicitly_wait(10) driver.implicitly_wait(10)
element = driver.find_element_by_class_name("weekday") weekDayElement = driver.find_element_by_class_name("weekday")
print(element) print(weekDayElement)
print(element.size) print(weekDayElement.size)
print(element.text) print(weekDayElement.text)
return element return weekDayElement
if __name__ == '__main__': if __name__ == '__main__':
weekDay(driver) weekDay(driver)
\ No newline at end of file
from appDriver import get_app_driver from commom.appDriver import get_app_driver
from login import app_login from commom.login import app_login
from time import sleep, time
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe') driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
......
from commom.appDriver import get_app_driver
from commom.login import app_login
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
app_login(driver)
# 添加课件
def coursewareTab(driver):
driver.implicitly_wait(10)
coursewareTabElement = driver.find_element_by_class_name("CoursewareTab")
print(coursewareTabElement)
print(coursewareTabElement)
print(coursewareTabElement)
return coursewareTabElement
if __name__ == '__main__':
coursewareTab(driver)
\ No newline at end of file
from commom.appDriver import get_app_driver
from commom.login import app_login
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
app_login(driver)
# 直播间header-课程名称
def roomName(driver):
driver.implicitly_wait(10)
roomNameElement = driver.find_element_by_class_name("roomName")
print(roomNameElement)
print(roomNameElement)
print(roomNameElement)
return roomNameElement
if __name__ == '__main__':
roomName(driver)
\ No newline at end of file
from commom.appDriver import get_app_driver
from commom.login import app_login
driver = get_app_driver(r'C:\Users\Administrator\AppData\Local\Programs\xmqxy\小麦企学院.exe')
app_login(driver)
# 直播时间已到,提示是否开始上课-是/否
def startPromt(driver):
driver.implicitly_wait(10)
startPromtElement = driver.find_element_by_class_name("ant-btn")
print(startPromtElement)
print(startPromtElement)
print(startPromtElement)
return startPromtElement
if __name__ == '__main__':
startPromt(driver)
\ 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