17:24

src/main/java/page/PolicyLibraryPage.java

@@ -44,7 +44,7 @@ public class PolicyLibraryPage extends Method {
     //筛选条件-扶持方式：资金扶持
     public static By filterSupportCapital=By.partialLinkText("资金扶持");
     //筛选条件-扶持方式：不限
-    public static By filterSupportAny=xpathOrId("//div[@class='selectList_box']/div[5]/div/div[2]/div[1]/div[1]/a");
+    public static By filterSupportAny=xpathOrId("//div[@class='selectList_box']/div[2]/div/div[2]/div[1]/div[1]/a");
     //筛选条件-扶持方式：所有
     public static By filterSupportAll=xpathOrId("//div[@class='selectList_box']/div[5]/div/div[2]/div/div/a");
     //排序方式：发文日期
@@ -178,7 +178,7 @@ public class PolicyLibraryPage extends Method {
         find(pageTitle).click();
         find(searchBtn).click();
         waitUrl("keyWord=&");
-        find(filterLocationAll).click();
+//        find(filterLocationAll).click();
         return assertTextList;
     }
 
@@ -192,7 +192,7 @@ public class PolicyLibraryPage extends Method {
         find(pageTitle).click();
         find(searchBtn).click();
         waitUrl("keyWord=&");
-        find(filterLocationAll).click();
+//        find(filterLocationAll).click();
         try {
             Thread.sleep(2000);
         }catch (Exception e){
@@ -224,7 +224,7 @@ public class PolicyLibraryPage extends Method {
         policyFileAll=find(policyFile).getText();
         noticeAll=find(notice).getText();
         polictyAll=find(fileType).getText();
-        find(filterLocationAll).click();
+//        find(filterLocationAll).click();
         return tis;
     }
 
@@ -237,7 +237,7 @@ public class PolicyLibraryPage extends Method {
 
     //【申报通知】筛选：搜索申报状态="已截止"
     public HashMap<Integer,ArrayList<String>> searchFinsh(){
-        find(filterLocationAll).click();
+//        find(filterLocationAll).click();
         HashMap<Integer,ArrayList<String>> map=getProjectMap(filterApplyFinsh,"]/div[2]/div/a/div[1]");
         find(filterApplyAll).click();
         return map;
@@ -252,7 +252,7 @@ public class PolicyLibraryPage extends Method {
     }
 
     private HashMap<Integer, ArrayList<String>> getProjectValueMap(By by,String xpath) {
-        moreFilterAndDepartment();
+//        moreFilterAndDepartment();
         find(by).click();
         assertText = find(by).getText();
         waitNoText(fileType,polictyAll);
@@ -382,11 +382,11 @@ public class PolicyLibraryPage extends Method {
 
     //【申报通知】筛选：扶持方式,资金扶持方式
     public HashMap<Integer,ArrayList<String>> searchOneSupport(){
-        moreFilterAndDepartment();
+//        moreFilterAndDepartment();
         HashMap<Integer,ArrayList<String>> map=getProjectMap(filterSupportCapital,"]/div[2]/div/a/div[2]/div[2]/div");
-        if(find(moreFilter).getAttribute("class").contains("next more_down")){
-            find(moreFilter).click();
-        }
+//        if(find(moreFilter).getAttribute("class").contains("next more_down")){
+//            find(moreFilter).click();
+//        }
         find(filterSupportAny).click();
         return map;
     }

src/test/java/page/PolicyLibraryTest.java

@@ -44,95 +44,95 @@ public class PolicyLibraryTest {
         Driver.getThreadLocal().remove();
     }
 
-    @Test(retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：进入政策文库，默认搜索系统当前城市的申报通知")
-    @Story("政策文库")
-    public void defaultSearchSuccess(){
-        ArrayList<String> departmentList=policyLibrary.defaultSearch();
-        for(String str:departmentList){
-            assertTrue(policyLibrary.departmentList.contains(str));
-        }
-    }
+//    @Test(retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：进入政策文库，默认搜索系统当前城市的申报通知")
+//    @Story("政策文库")
+//    public void defaultSearchSuccess(){
+//        ArrayList<String> departmentList=policyLibrary.defaultSearch();
+//        for(String str:departmentList){
+//            assertTrue(policyLibrary.departmentList.contains(str));
+//        }
+//    }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：国家级")
-    @Story("政策文库")
-    public void countrySearch(){
-        ArrayList<String> assertTextList=policyLibrary.searchCountry();
-        for(String str:assertTextList){
-            assertTrue(policyLibrary.departmentList.contains(str));
-        }
-    }
+//    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：国家级")
+//    @Story("政策文库")
+//    public void countrySearch(){
+//        ArrayList<String> assertTextList=policyLibrary.searchCountry();
+//        for(String str:assertTextList){
+//            assertTrue(policyLibrary.departmentList.contains(str));
+//        }
+//    }
 
-    @Test(priority = 5,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：国家级，主管部门为第一个部门")
-    @Story("政策文库")
-    public void countryDepartmentSearch(){
-        ArrayList<String> assertTextList=policyLibrary.searchCountryDepartment();
-        for(String str:assertTextList){
-            assertTrue(str.equals(policyLibrary.assertText));
-        }
-    }
+//    @Test(priority = 5,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：国家级，主管部门为第一个部门")
+//    @Story("政策文库")
+//    public void countryDepartmentSearch(){
+//        ArrayList<String> assertTextList=policyLibrary.searchCountryDepartment();
+//        for(String str:assertTextList){
+//            assertTrue(str.equals(policyLibrary.assertText));
+//        }
+//    }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：省级")
-    @Story("政策文库")
-    public void provinceSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchProvince();
-        for(String str:departmentList){
-            assertTrue(policyLibrary.departmentList.contains(str));
-        }
-    }
+//    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：省级")
+//    @Story("政策文库")
+//    public void provinceSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchProvince();
+//        for(String str:departmentList){
+//            assertTrue(policyLibrary.departmentList.contains(str));
+//        }
+//    }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：省级，主管部门为第一个部门")
-    @Story("政策文库")
-    public void provinceDepartmentSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchProvinceDepartment();
-        for(String str:departmentList){
-            assertTrue(str.equals(policyLibrary.assertText));
-        }
-    }
+//    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：省级，主管部门为第一个部门")
+//    @Story("政策文库")
+//    public void provinceDepartmentSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchProvinceDepartment();
+//        for(String str:departmentList){
+//            assertTrue(str.equals(policyLibrary.assertText));
+//        }
+//    }
 
-    @Test(priority = 1)
-    @Description("正常测试用例：搜索选择区域：区级，第一个区")
-    @Story("政策文库")
-    public void districtSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchDistrict();
-        for(String str:departmentList){
-            assertTrue(policyLibrary.departmentList.contains(str));
-        }
-    }
+//    @Test(priority = 1)
+//    @Description("正常测试用例：搜索选择区域：区级，第一个区")
+//    @Story("政策文库")
+//    public void districtSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchDistrict();
+//        for(String str:departmentList){
+//            assertTrue(policyLibrary.departmentList.contains(str));
+//        }
+//    }
 
-    @Test(priority = 0,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：区级，第一个区，主管部门为第一个部门")
-    @Story("政策文库")
-    public void districtDepartmentSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchDistrictDepartment();
-        for(String str:departmentList){
-            assertTrue(str.equals(policyLibrary.assertText));
-        }
-    }
+//    @Test(priority = 0,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：区级，第一个区，主管部门为第一个部门")
+//    @Story("政策文库")
+//    public void districtDepartmentSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchDistrictDepartment();
+//        for(String str:departmentList){
+//            assertTrue(str.equals(policyLibrary.assertText));
+//        }
+//    }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：镇街级，第一个镇街")
-    @Story("政策文库")
-    public void StreetSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchStreet();
-        for(String str:departmentList){
-            assertTrue(policyLibrary.departmentList.contains(str));
-        }
-    }
+//    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：镇街级，第一个镇街")
+//    @Story("政策文库")
+//    public void StreetSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchStreet();
+//        for(String str:departmentList){
+//            assertTrue(policyLibrary.departmentList.contains(str));
+//        }
+//    }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
-    @Description("正常测试用例：搜索选择区域：镇街级，第一个镇街，主管部门为第一个部门")
-    @Story("政策文库")
-    public void StreetDepartmentSearch(){
-        ArrayList<String> departmentList=policyLibrary.searchStreetDepartment();
-        for(String str:departmentList){
-            assertTrue(str.equals(policyLibrary.assertText));
-        }
-    }
+//    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+//    @Description("正常测试用例：搜索选择区域：镇街级，第一个镇街，主管部门为第一个部门")
+//    @Story("政策文库")
+//    public void StreetDepartmentSearch(){
+//        ArrayList<String> departmentList=policyLibrary.searchStreetDepartment();
+//        for(String str:departmentList){
+//            assertTrue(str.equals(policyLibrary.assertText));
+//        }
+//    }
 
     @Test(priority = 1,retryAnalyzer = RetryUtils.class)
     @Description("正常测试用例：搜索存在的政策原文标题")
@@ -204,7 +204,7 @@ public class PolicyLibraryTest {
         assertTrue(start);
     }
 
-    @Test(priority = 1,retryAnalyzer = RetryUtils.class)
+    @Test(priority = 1)
     @Description("正常测试用例：搜索扶持扶持方式：资金扶持")
     @Story("政策文库")
     public void searchSupportOne(){