|
@@ -470,6 +470,9 @@ public class PolicyPageTest {
|
|
|
}catch (AssertionError e){
|
|
|
Reporter.log("PolicyPageTest.policyRemainDayAscSearchSuccess:【申报通知】筛选:截止日期升序,断言失败!");
|
|
|
throw e;
|
|
|
+ }catch (Exception e){
|
|
|
+ Reporter.log("PolicyPageTest.policyRemainDayAscSearchSuccess:【申报通知】筛选:截止日期升序,元素定位失败!");
|
|
|
+ throw e;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -703,6 +706,12 @@ public class PolicyPageTest {
|
|
|
assertEquals((int)response.path("code"),200);
|
|
|
assertEquals(response.path("message"),"操作成功");
|
|
|
ArrayList<HashMap<String,Object>> projectsList2=response.path("data");
|
|
|
+ Collections.sort(projectsList2, new Comparator<HashMap<String, Object>>() {
|
|
|
+ @Override
|
|
|
+ public int compare(HashMap<String, Object> o1, HashMap<String, Object> o2) {
|
|
|
+ return Integer.compare(Integer.parseInt(""+o1.get("declareDate")),Integer.parseInt(""+o2.get("declareDate")));
|
|
|
+ }
|
|
|
+ });
|
|
|
for(int i=0;i<projectsList1.size();i++){
|
|
|
if((Integer) projectsList1.get(i).get("remainDay")<=0){
|
|
|
assertEquals(projectsList2.get(i).get("declareDate"),"0");
|