增加断言

src/main/java/com/xiaomai/cases/polar/schedule/group/TestEditGroupSchedule.java

@@ -30,6 +30,7 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
     public static Date now = new Date();
     Set<String> scheduleIdsN;
 
+
     @BeforeClass
     public void beforeTest() {
         setTestInfo(ApiModule.Polar_Schedule, "API_editGroupSchedule", LoginAccount.ADU_PROD, Terminal.B, "adu");
@@ -52,7 +53,7 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                 body.put("scheduleId", scheduleId);
                 //获取下周四某个时间点的开始时间戳
                 Date getWeekStartDayData = CommUtil.getStartOfDateWeek(now);//获取本周的第一天
-                Date getNextWeekXDayData=CommUtil.addNDays(getWeekStartDayData,10);
+                Date getNextWeekXDayData = CommUtil.addNDays(getWeekStartDayData, 10);
                 String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
                 String startStamp = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + "13:30");
                 body.put("startTime", startStamp);
@@ -75,13 +76,12 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                 //编辑成功后check对应课次详情修改内容是否同步成功
                 groupScheduleTools.getScheduleItemDetail(scheduleId);
                 String detailResult = dataApi.getApi_response();
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.chiefCoachId"),chiefCoachIdS);
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.minMemberNum"),"1");
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.maxMemberNum"),"10");
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.startTime"),startStamp);
-                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult,"$.result.assistCoachIds").size()==0,"助教修改后（置空）没生效");
-                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult,"$.result.venueAreaIds").size()==0,"场地修改后（置空）没生效");
-
+                Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.chiefCoachId"), chiefCoachIdS);
+                Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.minMemberNum"), "1");
+                Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.maxMemberNum"), "10");
+                Assert.assertEquals(XMJSONPath.readPath(detailResult, "$.result.startTime"), startStamp);
+                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.assistCoachIds").size() == 0, "助教修改后（置空）没生效");
+                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult, "$.result.venueAreaIds").size() == 0, "场地修改后（置空）没生效");
 
 
             });
@@ -104,10 +104,10 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                 body.put("scheduleId", scheduleId);
                 //获取下周二某个时间点的开始时间戳
                 Date getWeekStartDayData = CommUtil.getStartOfDateWeek(now);
-                Date getNextWeekXDayData=CommUtil.addNDays(getWeekStartDayData,8);
+                Date getNextWeekXDayData = CommUtil.addNDays(getWeekStartDayData, 8);
                 String getNextWeekXDayDataS = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData.getTime());
-                String startStamp = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + "13:00"); //和创建时间一致，不修改时间
-                body.put("startTime", startStamp);
+                String startStamp1 = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS + " " + "13:00"); //和创建时间一致，不修改时间
+                body.put("startTime", startStamp1);
 
                 body.put("chiefCoachId", chiefCoachIdS);
                 body.put("minMemberNum", 6);//修改开课人数
@@ -125,21 +125,17 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
                     throw new RuntimeException(e);
                 }
                 //编辑成功后check对应课次详情修改内容是否同步成功
-                groupScheduleTools.getScheduleItemDetail(scheduleId);
-                String detailResult = dataApi.getApi_response();
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.chiefCoachId"),chiefCoachIdS);
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.minMemberNum"),"6");
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.maxMemberNum"),"999");
-                Assert.assertEquals(XMJSONPath.readPath(detailResult,"$.result.startTime"),startStamp);
-                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult,"$.result.assistCoachIds").size()==0,"助教修改后（置空）没生效");
-                Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult,"$.result.venueAreaIds").containsAll(venueAreaIds),"场地无修改，但是却变动了");
+                checkData(scheduleId,startStamp1);
 
                 //查看下周三课次是否同步被修改
                 Set<String> scheduleIdX = groupScheduleTools.getTableDate(9);
+                Date getNextWeekXDayData2 = CommUtil.addNDays(getWeekStartDayData, 9);
+                String getNextWeekXDayDataS2 = new SimpleDateFormat("yyyy-MM-dd").format(getNextWeekXDayData2.getTime());
+                String startStamp2 = CommUtil.getStringTimestampByStrTime(getNextWeekXDayDataS2 + " " + "13:00"); //和创建时间一致，不修改时间
                 if (!scheduleIdX.isEmpty()) {
                     scheduleIdX.stream().forEach(scheduleId1 -> {
-                        //删除case1中编辑独立出去的课次
-                        groupScheduleTools.delGroupScheduleItem(scheduleId1);
+                        //编辑成功后check同规则中下周三课次详情修改内容是否同步成功
+                        checkData(scheduleId1,startStamp2);
                     });
                 }
 
@@ -147,9 +143,24 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
             });
         }
 
+    }
 
+    /**
+     * 编辑后通过查看课次详情check数据是否同步被修改
+     * @param scheduleId
+     */
+    public void checkData(String scheduleId,String tiemStamp){
+            groupScheduleTools.getScheduleItemDetail(scheduleId);
+            String detailResult1 = dataApi.getApi_response();
+            Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.chiefCoachId"), chiefCoachIdS);
+            Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.minMemberNum"), "6");
+            Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.maxMemberNum"), "999");
+            Assert.assertEquals(XMJSONPath.readPath(detailResult1, "$.result.startTime"), tiemStamp);
+            Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.assistCoachIds").size() == 0, "助教修改后（置空）没生效");
+            Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(detailResult1, "$.result.venueAreaIds").containsAll(venueAreaIds), "场地无修改，但是却变动了");
+
+        }
 
-    }
 
 
     @AfterClass(description = "删除此case创建的日程")
@@ -185,4 +196,5 @@ public class TestEditGroupSchedule extends UniversalDataScheduling {
 
 }
 
+
     
\ No newline at end of file