update some

.idea/workspace.xml

@@ -19,13 +19,13 @@
     <SUITE FILE_PATH="coverage/PythonSpace$android_test.coverage" NAME="android_test Coverage Results" MODIFIED="1490257103383" 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$Unittests_in_test__1_.coverage" NAME="Unittests in test (1) Coverage Results" MODIFIED="1491377198415" 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$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="1491459110213" 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$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/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" />
     <SUITE FILE_PATH="coverage/PythonSpace$Unittests_in_HTMLTestRunner.coverage" NAME="Unittests in HTMLTestRunner Coverage Results" MODIFIED="1490767215505" 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$firstpy__1_.coverage" NAME="firstpy (1) Coverage Results" MODIFIED="1490769017641" 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_qqTest.coverage" NAME="Unittests in qqTest Coverage Results" MODIFIED="1490934080753" 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$qqTest.coverage" NAME="qqTest Coverage Results" MODIFIED="1491455480989" 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$qqTest.coverage" NAME="qqTest Coverage Results" MODIFIED="1491470775108" 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$hellow_python.coverage" NAME="hellow python Coverage Results" MODIFIED="1487743932113" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="CreatePatchCommitExecutor">
@@ -48,7 +48,7 @@
       <file leaf-file-name="moaTest.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/MyTest/moaTest.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1298">
+            <state relative-caret-position="-449">
               <caret line="73" column="41" lean-forward="false" selection-start-line="73" selection-start-column="41" selection-end-line="73" selection-end-column="41" />
               <folding>
                 <element signature="e#184#203#0" expanded="false" />
@@ -72,19 +72,29 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="case.py" pinned="false" current-in-tab="false">
+        <entry file="file://D:/Program Files (x86)/Python27/Lib/unittest/case.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2301">
+              <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>
+      </file>
       <file leaf-file-name="test.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/MyTest/test.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1232">
-              <caret line="68" column="20" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="20" />
+            <state relative-caret-position="683">
+              <caret line="72" column="35" lean-forward="false" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
               <folding>
                 <element signature="e#24#33#0" expanded="true" />
                 <element signature="e#186#205#0" expanded="false" />
-                <element signature="e#4072#4868#0" expanded="false" />
-                <element signature="e#4910#5574#0" expanded="false" />
-                <element signature="e#6232#6320#0" expanded="false" />
-                <element signature="e#6365#6441#0" expanded="false" />
-                <element signature="e#6475#6537#0" expanded="false" />
+                <element signature="e#4656#5452#0" expanded="false" />
+                <element signature="e#5494#6158#0" expanded="false" />
+                <element signature="e#6854#6942#0" expanded="false" />
+                <element signature="e#6987#7063#0" expanded="false" />
+                <element signature="e#7097#7159#0" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -93,8 +103,8 @@
       <file leaf-file-name="qqTest.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/MyTest/qqTest.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="264">
-              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="28" selection-end-column="18" />
+            <state relative-caret-position="726">
+              <caret line="46" column="0" lean-forward="true" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -140,6 +150,7 @@
       <find>try</find>
       <find>scroll</find>
       <find>position</find>
+      <find>发现新的路径：</find>
     </findStrings>
     <replaceStrings>
       <replace>PYtest</replace>
@@ -677,7 +688,14 @@
       <option name="project" value="LOCAL" />
       <updated>1491384685635</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="update some">
+      <created>1491459688305</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1491459688305</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -723,19 +741,19 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-368" width="2576" height="1456" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19726562" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <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="true" show_stripe_button="true" weight="0.31575036" sideWeight="0.5378906" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3640416" sideWeight="0.34335938" 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="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.31575036" sideWeight="0.4621094" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31575036" sideWeight="0.46054688" 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.3640416" sideWeight="0.6605469" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3640416" sideWeight="0.65664065" 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" />
@@ -772,6 +790,21 @@
           <line>64</line>
           <option name="timeStamp" value="128" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/MyTest/test.py</url>
+          <line>33</line>
+          <option name="timeStamp" value="143" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/MyTest/test.py</url>
+          <line>72</line>
+          <option name="timeStamp" value="144" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/MyTest/test.py</url>
+          <line>32</line>
+          <option name="timeStamp" value="145" />
+        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="python-exception">
@@ -780,7 +813,7 @@
           </properties>
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="137" />
+      <option name="time" value="147" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1036,15 +1069,23 @@
     </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">
+        <state relative-caret-position="2301">
           <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://E:/桌面/one.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="934">
+          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/MyTest/moaTest.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1298">
+        <state relative-caret-position="-449">
           <caret line="73" column="41" lean-forward="false" selection-start-line="73" selection-start-column="41" selection-end-line="73" selection-end-column="41" />
           <folding>
             <element signature="e#184#203#0" expanded="false" />
@@ -1057,34 +1098,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/桌面/one.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="934">
-          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/MyTest/qqTest.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="28" selection-end-column="18" />
+        <state relative-caret-position="726">
+          <caret line="46" column="0" lean-forward="true" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/MyTest/test.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1232">
-          <caret line="68" column="20" lean-forward="false" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="20" />
+        <state relative-caret-position="683">
+          <caret line="72" column="35" lean-forward="false" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
           <folding>
             <element signature="e#24#33#0" expanded="true" />
             <element signature="e#186#205#0" expanded="false" />
-            <element signature="e#4072#4868#0" expanded="false" />
-            <element signature="e#4910#5574#0" expanded="false" />
-            <element signature="e#6232#6320#0" expanded="false" />
-            <element signature="e#6365#6441#0" expanded="false" />
-            <element signature="e#6475#6537#0" expanded="false" />
+            <element signature="e#4656#5452#0" expanded="false" />
+            <element signature="e#5494#6158#0" expanded="false" />
+            <element signature="e#6854#6942#0" expanded="false" />
+            <element signature="e#6987#7063#0" expanded="false" />
+            <element signature="e#7097#7159#0" expanded="false" />
           </folding>
         </state>
       </provider>

MyTest/qqTest.py

@@ -19,6 +19,15 @@ def listIsDif(newListName,oldListName):
         print i
     return difListName
 
+
+def listQD(onelist):
+    newlist = []
+    for i in onelist:
+        if not i in newlist:
+            newlist.append(i)
+    for i in  newlist:
+        print i
+
 def listD(newList,oldList):
     for iold in oldList:
         for inew in newList:
@@ -29,12 +38,25 @@ def listD(newList,oldList):
     return newList
 
 
-list1 =['特别关注','我的客服','我的单位','浙江万赛软件集团（筹）']
+list1 =['特别关注','我的客服','我的单位','浙江万赛软件集团（筹）','特别关注']
 list2 =['浙江万赛软件集团（筹）','总裁办', '综合办', '财务中心', '运营中心','研发中心','质管中心','丽水万赛','云南万赛', '宁夏万赛', '测试账号']
 
-if len(list1) > 0 and len(list2):
-    # list3 = listIsDif(list2, list1)
-    list3 = listD(list2,list1)
+
+for i in list2:
+    list1.append(i)
+
+for i in list1:
+    if len(list1) >0:
+     print  i
+
+
+# if len(list1) > 0 and len(list2):
+#     # list3 = listIsDif(list2, list1)
+#     list3 = listD(list2,list1)
+
+
+
+
 
 #
 # class apptestlogin(unittest.TestCase):

MyTest/test.py

@@ -28,6 +28,16 @@ def elementIsExit(self,element):
             return False
         return True
 
+#去掉list中的重复元素，并保持元素位置不变
+def listQD(onelist):
+    newlist = []
+    for i in onelist:
+        if not i in newlist:
+            newlist.append(i)
+    for i in  newlist:
+        print i
+    return  newlist
+
 def changeListTree(listTree):
     listTreeName = []
     if len(listTree) > 0 :
@@ -35,15 +45,15 @@ def changeListTree(listTree):
             listTreeName.append(i.text)
     return listTreeName
 
+# newListName中有而oldListName中没有的
+# def listIsDif(newListName,oldListName):
+#     # newListName = changeListTree(newList)
+#     # oldListName = changeListTree(oldList)
+#     difListName = list(set(newListName).difference(set(oldListName)))
+#     # print difListName
+#     print '不同路径的长度',len(difListName)
+#     return difListName
 
-def listIsDif(newListName,oldListName):
-    # newListName = changeListTree(newList)
-    # oldListName = changeListTree(oldList)
-    # newListName中有而oldListName中没有的
-    difListName = list(set(newListName).difference(set(oldListName)))
-    # print difListName
-    print '不同路径的长度',len(difListName)
-    return difListName
 def listDif(newList,oldList):
     for iold in oldList:
         for inew in newList:
@@ -53,12 +63,16 @@ def listDif(newList,oldList):
     #     print i
     return newList
 #找人
-def findOne(self, lookfor, topTree, lastTree):
+def findOne(self, lookfor, topTree, lastTree,clickTree):
     findflag = False
     # copyTreeName = topTree
     # lastTreeName = changeListTree(lastTree)
-    if len(lastTree) > 0 and len(topTree) > 0:
-        topTree = listDif(lastTree,topTree)
+    if len(lastTree) > 0 and len(topTree) > 0 and len(clickTree) >0:
+        for i in topTree:
+            lastTree.append(i)
+        tempTree = listQD(lastTree)
+        if len(tempTree) > 0:
+            topTree = listDif(tempTree,clickTree)
         # print '目前路径如下：', topTree
     toptreeCount = len(topTree)
     for onetree in topTree:
@@ -66,6 +80,8 @@ def findOne(self, lookfor, topTree, lastTree):
         currenttreeName = topTree[num]
         if elementIsExit(self, currenttreeName):
             self.driver.find_element_by_name(currenttreeName).click()
+            clickTree.append(currenttreeName)
+            print clickTree
             sleep(1)
             print '程序点击了该路径：', currenttreeName
         while True:
@@ -77,8 +93,10 @@ def findOne(self, lookfor, topTree, lastTree):
                 break
             elif len(listDif(changeListTree(otherTree), topTree)) > 0:
                 for i in otherTree:
-                    print '发现新的路径：', i
-                findOne(self, lookfor, topTree, changeListTree(otherTree))
+                    print '发现新的路径：', i.text
+                for i in  clickTree:
+                    print  clickTree
+                findOne(self, lookfor, topTree, changeListTree(otherTree),clickTree)
             elif num < (toptreeCount - 1):
                 nexttreeName = topTree[num + 1]
                 print '要查看的下一个路径名称：', nexttreeName
@@ -90,6 +108,8 @@ def findOne(self, lookfor, topTree, lastTree):
             else:
                 self.driver.swipe(710, 1000, 710, 200)  # 往下滑动当前页
                 print '找不到任何规定的内容'
+        if findflag == True:
+            break
     print '出结果了要'
     return findflag
 
@@ -160,7 +180,8 @@ class PYtest(unittest.TestCase):
             topTree = opentree.driver.find_elements_by_id('cn.wswin.moa:id/tv_item_tree_parent')  # 后期用target替换
             otherTreeName = []
             topTreeNmae =  changeListTree(topTree)
-            if findOne(opentree, '陈明干', topTreeNmae, otherTreeName):
+            clickTree = []
+            if findOne(opentree, '成向阳', topTreeNmae, otherTreeName, clickTree):
                 print '找到人了'
 
     def finishDriver(self):