|
@@ -92,7 +92,7 @@ public class IntelligentPushPageTest {
|
|
|
HashMap<String,Object> body=new HashMap<>();
|
|
|
body.put("_file","/apijson/page/intelligentPushPage/apiPcpIntelligentPushGetGslFocusFormal.json");
|
|
|
body.put("memberId",homePage.getUserId());
|
|
|
- body.put("sortType",0);
|
|
|
+ body.put("sortType",1);
|
|
|
Response response=intelligentPushPage.searchProjectPush(body);
|
|
|
assertEquals((int) response.path("code"),200);
|
|
|
assertEquals(response.path("message"),"操作成功");
|
|
@@ -116,15 +116,14 @@ public class IntelligentPushPageTest {
|
|
|
HashMap<String,Object> body=new HashMap<>();
|
|
|
body.put("_file","/apijson/page/intelligentPushPage/apiPcpIntelligentPushGetGslFocusFormal.json");
|
|
|
body.put("memberId",homePage.getUserId());
|
|
|
- body.put("sortType",1);
|
|
|
Response response=intelligentPushPage.searchProjectPush(body);
|
|
|
assertEquals((int) response.path("code"),200);
|
|
|
assertEquals(response.path("message"),"操作成功");
|
|
|
List<HashMap<String,Object>> result=response.path("data.result");
|
|
|
for (int i=0;i<result.size()-1;i++){
|
|
|
- String dispatchDate1=""+result.get(i).get("dispatchDate");
|
|
|
- String dispatchDate2=""+result.get(i+1).get("dispatchDate");
|
|
|
- assertTrue(Integer.parseInt(dispatchDate1.replaceAll("-",""))>=Integer.parseInt(dispatchDate2.replaceAll("-","")));
|
|
|
+ String declareDate1=""+result.get(i).get("declareDate");
|
|
|
+ String declareDate2=""+result.get(i+1).get("declareDate");
|
|
|
+ assertTrue(Integer.parseInt(declareDate1)>=Integer.parseInt(declareDate2));
|
|
|
}
|
|
|
}catch (AssertionError e){
|
|
|
Reporter.log("IntelligentPushPageTest.endDateSortPushProjectSearchSuccess:【适配项目】排序方式为截止日期,根据截止日期降序排序,断言失败!");
|
|
@@ -172,7 +171,7 @@ public class IntelligentPushPageTest {
|
|
|
List<HashMap<String,Object>> result=response.path("data.result");
|
|
|
result.forEach(map -> {
|
|
|
List<String> fuchifangshi=(List<String>) map.get("fuchifangshi");
|
|
|
- assertTrue(fuchifangshi.contains("资金") && fuchifangshi.contains("称号"));
|
|
|
+ assertTrue(fuchifangshi.contains("资金") || fuchifangshi.contains("称号"));
|
|
|
});
|
|
|
}catch (AssertionError e){
|
|
|
Reporter.log("IntelligentPushPageTest.multiSupportPushProjectSearchSuccess:【适配项目】多个扶持方式,筛选含该扶持方式的项目,断言失败!");
|