2 Revīzijas 9543ce90dc ... 8c94253110

Autors SHA1 Ziņojums Datums
  hegl 8c94253110 update moaTest 8 gadi atpakaļ
  hegl 75fca51936 update untility add regularOperation、restApp 8 gadi atpakaļ
3 mainītis faili ar 191 papildinājumiem un 109 dzēšanām
  1. 137 90
      .idea/workspace.xml
  2. 14 18
      MyTest/moaTest.py
  3. 40 1
      common/utility.py

+ 137 - 90
.idea/workspace.xml

@@ -4,7 +4,6 @@
     <list default="true" id="82c8521e-4e92-439a-a797-bd5cecfdccd4" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MyTest/moaTest.py" afterPath="$PROJECT_DIR$/MyTest/moaTest.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common/utility.py" afterPath="$PROJECT_DIR$/common/utility.py" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -22,7 +21,7 @@
     <SUITE FILE_PATH="coverage/PythonSpace$firstpy.coverage" NAME="firstpy Coverage Results" MODIFIED="1490933877884" 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/PythonSpace$test.coverage" NAME="test Coverage Results" MODIFIED="1491470826856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
     <SUITE FILE_PATH="coverage/PythonSpace$webdriver.coverage" NAME="test Coverage Results" MODIFIED="1491384472929" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
-    <SUITE FILE_PATH="coverage/python_test$moaTest.coverage" NAME="moaTest Coverage Results" MODIFIED="1495095690897" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
+    <SUITE FILE_PATH="coverage/python_test$moaTest.coverage" NAME="moaTest Coverage Results" MODIFIED="1495869393458" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
     <SUITE FILE_PATH="coverage/python_test$test.coverage" NAME="test Coverage Results" MODIFIED="1491485244595" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
     <SUITE FILE_PATH="coverage/python_test$Unittests_in_test.coverage" NAME="Unittests in test Coverage Results" MODIFIED="1491485646792" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
     <SUITE FILE_PATH="coverage/PythonSpace$Unittests_in_test_HTMLTestRunner.coverage" NAME="Unittests in test_HTMLTestRunner Coverage Results" MODIFIED="1491376947026" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/MyTest" />
@@ -43,6 +42,34 @@
     <option name="SHOW_EMPTY_GROUPS" value="false" />
     <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
   </component>
+  <component name="DockManager">
+    <window id="2">
+      <content type="file-editors">
+        <state>
+          <leaf>
+            <file leaf-file-name="utility.py" pinned="false" current-in-tab="true">
+              <entry file="file://$PROJECT_DIR$/common/utility.py">
+                <provider selected="true" editor-type-id="text-editor">
+                  <state relative-caret-position="80">
+                    <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+                    <folding>
+                      <element signature="e#95#250#0" expanded="false" />
+                      <element signature="e#286#387#0" expanded="false" />
+                      <element signature="e#429#670#0" expanded="false" />
+                      <element signature="e#717#2086#0" expanded="false" />
+                      <element signature="e#3481#5059#0" expanded="false" />
+                      <element signature="e#5084#5197#0" expanded="false" />
+                      <marker date="1495869511946" expanded="false" signature="2137:3421" ph="..." />
+                    </folding>
+                  </state>
+                </provider>
+              </entry>
+            </file>
+          </leaf>
+        </state>
+      </content>
+    </window>
+  </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
     <favorites_list name="PythonSpace" />
@@ -52,39 +79,28 @@
       <file leaf-file-name="moaTest.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/MyTest/moaTest.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-528">
-              <caret line="45" column="29" lean-forward="false" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+            <state relative-caret-position="549">
+              <caret line="90" column="24" lean-forward="true" selection-start-line="90" selection-start-column="24" selection-end-line="90" selection-end-column="24" />
               <folding>
                 <element signature="e#24#45#0" expanded="true" />
-                <element signature="e#2575#3052#0" expanded="false" />
-                <element signature="e#3223#3299#0" expanded="false" />
+                <element signature="e#2570#3047#0" expanded="false" />
+                <element signature="e#3218#3294#0" expanded="false" />
+                <element signature="e#3328#3390#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HTMLTestRunner.py" pinned="false" current-in-tab="false">
-        <entry file="file://D:/Program Files (x86)/Python27/Lib/HTMLTestRunner.py">
+      <file leaf-file-name="time.py" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/time.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="793">
-              <caret line="789" column="0" lean-forward="true" selection-start-line="789" selection-start-column="0" selection-end-line="789" selection-end-column="0" />
+            <state relative-caret-position="289">
+              <caret line="121" column="4" lean-forward="false" selection-start-line="121" selection-start-column="4" selection-end-line="121" selection-end-column="4" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="utility.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/common/utility.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="433">
-              <caret line="65" column="16" lean-forward="false" selection-start-line="65" selection-start-column="16" selection-end-line="65" selection-end-column="16" />
-              <folding>
-                <element signature="e#694#2063#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -114,6 +130,7 @@
       <find>.ui.activity.MainActivity</find>
       <find>print</find>
       <find># o and e should be byte string because they are collected from stdout and stderr?</find>
+      <find>send</find>
     </findStrings>
     <replaceStrings>
       <replace>PYtest</replace>
@@ -152,8 +169,8 @@
         <option value="$PROJECT_DIR$/MyTest/qqTest.py" />
         <option value="$PROJECT_DIR$/MyTest/test.py" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/common/utility.py" />
         <option value="D:/Program Files (x86)/Python27/Lib/HTMLTestRunner.py" />
+        <option value="$PROJECT_DIR$/common/utility.py" />
         <option value="$PROJECT_DIR$/MyTest/moaTest.py" />
       </list>
     </option>
@@ -186,6 +203,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -239,7 +257,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -248,7 +265,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\Program Files\nodejs\node.exe" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -731,7 +748,21 @@
       <option name="project" value="LOCAL" />
       <updated>1495090570267</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="modify utility、moaTest">
+      <created>1495095859869</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1495095859869</updated>
+    </task>
+    <task id="LOCAL-00018" summary="update untility add regularOperation、restApp">
+      <created>1495869639207</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1495869639207</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -783,20 +814,20 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23774146" sideWeight="0.21927084" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" 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.33" 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.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3343239" sideWeight="0.7807292" order="2" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" 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" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40564635" sideWeight="0.63072914" order="3" 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.31426448" sideWeight="0.63072914" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" 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="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
@@ -818,7 +849,8 @@
     <MESSAGE value="update moaTest.py add py_findByName" />
     <MESSAGE value="modify utility" />
     <MESSAGE value="modify utility、moaTest" />
-    <option name="LAST_COMMIT_MESSAGE" value="modify utility、moaTest" />
+    <MESSAGE value="update untility add regularOperation、restApp" />
+    <option name="LAST_COMMIT_MESSAGE" value="update untility add regularOperation、restApp" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -829,12 +861,11 @@
           </properties>
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="184" />
+      <option name="time" value="187" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://E:/桌面/HTMLTestRunner.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/appium/webdriver/__init__.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/appium/webdriver/webelement.py" />
     <entry file="file://$USER_HOME$/Documents/Tencent Files/121354090/FileRecv/testLogin.py" />
@@ -844,7 +875,6 @@
     <entry file="file://$PROJECT_DIR$/MyTest/2017-0331.html" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/selenium/webdriver/support/event_firing_webdriver.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/appium/webdriver/common/touch_action.py" />
-    <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/time.py" />
     <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/exceptions.py" />
     <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/__builtin__.py" />
     <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/nt.py" />
@@ -856,7 +886,6 @@
       </provider>
     </entry>
     <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/runner.py" />
-    <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/suite.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/json/encoder.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/json/__init__.py" />
     <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/selenium/webdriver/remote/utils.py" />
@@ -878,31 +907,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="44">
           <caret line="2" column="6" lean-forward="false" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/MyTest/qqTest.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="880">
-          <caret line="40" column="22" lean-forward="false" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/case.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6930">
-          <caret line="328" column="0" lean-forward="false" selection-start-line="328" selection-start-column="0" selection-end-line="328" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/appium/webdriver/webdriver.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7942">
-          <caret line="375" column="8" lean-forward="false" selection-start-line="375" selection-start-column="8" selection-end-line="375" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -910,7 +914,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="550">
           <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -921,19 +924,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/selenium/webdriver/remote/webdriver.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7722">
-          <caret line="364" column="0" lean-forward="false" selection-start-line="364" selection-start-column="0" selection-end-line="364" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/demo_1/login.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-59">
           <caret line="42" column="44" lean-forward="true" selection-start-line="42" selection-start-column="44" selection-end-line="42" selection-end-column="44" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -941,7 +935,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -949,7 +942,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="770">
           <caret line="38" column="34" lean-forward="false" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -957,7 +949,6 @@
       <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>
@@ -965,7 +956,6 @@
       <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>
@@ -973,7 +963,6 @@
       <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>
@@ -981,40 +970,98 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="331">
           <caret line="160" column="18" lean-forward="false" selection-start-line="160" selection-start-column="0" selection-end-line="161" selection-end-column="0" />
-          <folding>
-            <element signature="e#24#33#0" expanded="true" />
-            <element signature="e#724#881#0" expanded="false" />
-            <element signature="e#1376#1407#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/common/utility.py">
+    <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/case.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="433">
-          <caret line="65" column="16" lean-forward="false" selection-start-line="65" selection-start-column="16" selection-end-line="65" selection-end-column="16" />
-          <folding>
-            <element signature="e#694#2063#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="-2549">
+          <caret line="130" column="6" lean-forward="false" selection-start-line="130" selection-start-column="6" selection-end-line="130" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-607">
+          <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://D:/Program Files (x86)/Python27/Lib/HTMLTestRunner.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="793">
-          <caret line="789" column="0" lean-forward="true" selection-start-line="789" selection-start-column="0" selection-end-line="789" selection-end-column="0" />
+        <state relative-caret-position="12460">
+          <caret line="628" column="0" lean-forward="false" selection-start-line="628" selection-start-column="0" selection-end-line="628" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/appium/webdriver/webdriver.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="309">
+          <caret line="549" column="8" lean-forward="true" selection-start-line="549" selection-start-column="8" selection-end-line="550" selection-end-column="11" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://D:/Program Files (x86)/Python27/Lib/site-packages/selenium/webdriver/remote/webdriver.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="713" column="8" lean-forward="false" selection-start-line="713" selection-start-column="8" selection-end-line="713" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/suite.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="569">
+          <caret line="65" column="24" lean-forward="true" selection-start-line="65" selection-start-column="24" selection-end-line="65" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/MyTest/qqTest.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="8" column="23" lean-forward="false" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.PyCharm2016.3/system/python_stubs/1751283516/time.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="121" column="4" lean-forward="false" selection-start-line="121" selection-start-column="4" selection-end-line="121" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/utility.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+          <folding>
+            <element signature="e#95#250#0" expanded="false" />
+            <element signature="e#286#387#0" expanded="false" />
+            <element signature="e#429#670#0" expanded="false" />
+            <element signature="e#717#2086#0" expanded="false" />
+            <element signature="e#3481#5059#0" expanded="false" />
+            <element signature="e#5084#5197#0" expanded="false" />
+            <marker date="1495869511946" expanded="false" signature="2137:3421" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/MyTest/moaTest.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-528">
-          <caret line="45" column="29" lean-forward="false" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
+        <state relative-caret-position="549">
+          <caret line="90" column="24" lean-forward="true" selection-start-line="90" selection-start-column="24" selection-end-line="90" selection-end-column="24" />
           <folding>
             <element signature="e#24#45#0" expanded="true" />
-            <element signature="e#2575#3052#0" expanded="false" />
-            <element signature="e#3223#3299#0" expanded="false" />
+            <element signature="e#2570#3047#0" expanded="false" />
+            <element signature="e#3218#3294#0" expanded="false" />
+            <element signature="e#3328#3390#0" expanded="false" />
           </folding>
         </state>
       </provider>

+ 14 - 18
MyTest/moaTest.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import HTMLTestRunner
-import os,unittest,copy,time
+import os,unittest,copy
 from appium import webdriver
 from time import sleep
 from common.utility import *
@@ -88,19 +88,16 @@ class PYtest(unittest.TestCase):
         self.driver.swipe(720,700,0,700)
         print ('Swip Passed')
 
+    #测试查询账号及 单聊除相册外的所有功能
     def py_findByName(self):
-        findByName(self,'ceshilqq','贺贵良')
-        self.driver.find_element_by_xpath('//android.widget.ImageButton[@resource-id=\"cn.wswin.moa:id/fab_profile\"]').click()
-        self.driver.find_element_by_id('cn.wswin.moa:id/rv_chat_list').send_keys('oh my God!')
-        self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_send_msg').click()
-        # self.driver.find_element_by_xpath('//android.widget.EditText[@resource-id=\"cn.wswin.moa:id/et_chat\"]').send_keys('oh my god!')
+        findByName(self,'ceshilqq','贺贵良')#测试查找功能
+        regularOperation(self,'')
+        restApp(self)
 
 
-    def py_newActivity(self):
-        current_Act = self.driver.current_activity
-        self.driver.wait_activity('.ui.activity.MainActivity',5)
+    def tearDown(self):
+        print ''
 
-        sleep(100)
 
 if __name__ == '__main__':
     suite = unittest.TestSuite()
@@ -108,13 +105,12 @@ if __name__ == '__main__':
     # suite.addTest(PYtest('py_Swiap'))
     suite.addTest(PYtest('py_login'))#APP登录
     suite.addTest(PYtest('py_findByName'))
-    # suite.addTest(PYtest('py_newActivity'))#打开新页面
     suite.addTest(PYtest('py_quitApp'))#APP登出
     suite.addTest(PYtest('finishDriver'))#结束测试
-    # unittest.TextTestRunner(verbosity=1).run(suite)#执行测试用例
-    timestr = time.strftime('%Y%m%d%H%M%S', time.localtime(time.time()))
-    filename = "D:\\AutoTest\\report\\report_" + timestr + ".html"
-    fp = file(filename, "wb")
-    runner =HTMLTestRunner.HTMLTestRunner(stream=fp, title=u'测试报告', description=u'测试用例详情')
-    runner.run(suite)
-    fp.close()
+    unittest.TextTestRunner(verbosity=1).run(suite)#执行测试用例
+    # timestr = time.strftime('%Y%m%d%H%M%S', time.localtime(time.time()))
+    # filename = "D:\\AutoTest\\report\\report_" + timestr + ".html"
+    # fp = file(filename, "wb")
+    # runner =HTMLTestRunner.HTMLTestRunner(stream=fp, title=u'测试报告', description=u'测试用例详情')
+    # runner.run(suite)
+    # fp.close()

+ 40 - 1
common/utility.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from time import sleep
 
 #捕获异常
 def elementIsExit(self,element):
@@ -86,4 +87,42 @@ def findByName(self,loginName,displayName):
         if current_Act == '.ui.activity.UserProfileActivity':
             print 'py_findByName Passed'
         else:
-            print 'py_findByName Failed'
+            print 'py_findByName Failed'
+
+#在聊天界面下的常规功能操作
+def regularOperation(self,deviceName):
+    print '文本、表情、拍照、语音、定位、文件消息测试'
+    self.driver.find_element_by_xpath(
+        '//android.widget.ImageButton[@resource-id=\"cn.wswin.moa:id/fab_profile\"]').click()
+    # self.driver.find_element_by_name('贺贵良').click()
+
+    btn_sendmsg = self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_send_msg')  # 获取发送按钮
+    self.driver.find_element_by_id('cn.wswin.moa:id/et_chat').send_keys('oh my God!')  # 发送文字信息
+    btn_sendmsg.click()
+    self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_face').click()  # 点击表情
+    self.driver.find_element_by_xpath(
+        '//android.support.v7.widget.RecyclerView[@resource-id=\"cn.wswin.moa:id/rv_chat_function\"]/android.widget.LinearLayout[1]/android.widget.ImageView[1]').click()
+    btn_sendmsg.click()
+    self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_photo').click()  # 点击相机
+    sleep(2)
+    self.driver.tap([(1187, 380)], 20)  # 三星专用位置
+    self.driver.find_element_by_name('存储').click()
+    self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_voice').click()  # 点击语音
+    self.driver.tap([(364, 1050)], 5000)  # 发送4s的语音
+    self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_location').click()  # 点击定位
+    sleep(2)
+    self.driver.tap([(634, 998)], 500)
+    sleep(2)
+    self.driver.find_element_by_id('cn.wswin.moa:id/menu_location_send').click()
+    self.driver.find_element_by_id('cn.wswin.moa:id/iv_chat_file').click()  # 点击文件
+    self.driver.find_element_by_name('视频').click()
+    sleep(2)
+    self.driver.tap([(45, 400)], 0)
+    sleep(1)
+    self.driver.tap([(638, 1197)], 0)
+    print '通过测试,检查相关文本信息是否到达'
+
+def restApp(self):
+    print '初始化APP'
+    self.driver.start_activity('cn.wswin.moa', '.ui.activity.SplashActivity')
+    print '初始化APP完毕'