Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/setting/courseCategory/CourseCategoryTools.java

@@ -105,10 +105,11 @@ public class CourseCategoryTools extends XMBaseTest {
 
 
         JSONObject body = new JSONObject();
         JSONObject body = new JSONObject();
         body.put("brandId",dataApi.getLoginInfo().getBrandId());
         body.put("brandId",dataApi.getLoginInfo().getBrandId());
+        body.put("studioId",dataApi.getLoginInfo().getStudioId());
         body.put("categoryName",categoryName);
         body.put("categoryName",categoryName);
         body.put("operatorId",dataApi.getLoginInfo().getAdminId());
         body.put("operatorId",dataApi.getLoginInfo().getAdminId());
 
 
-        dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs);
+        dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
         return dataApi.getBodyInJSON().getJSONObject("result").getString("id");
         return dataApi.getBodyInJSON().getJSONObject("result").getString("id");
 
 
     }
     }

src/main/java/com/xiaomai/cases/polar/setting/courseCategory/TestDeleteCourseCategory.java

@@ -51,6 +51,7 @@ public class TestDeleteCourseCategory extends BaseTestImpl {
         JSONObject body = new JSONObject();
         JSONObject body = new JSONObject();
         body.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         body.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         body.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
         body.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+        body.put("brandId",xmAppApi.getLoginInfo().getBrandId());
 
 
         if (flag){
         if (flag){
             // 删除课程
             // 删除课程
@@ -60,11 +61,12 @@ public class TestDeleteCourseCategory extends BaseTestImpl {
             categoryId = courseCategoryTools.createCourseCategory("课程分类"+ TimeUtils.getCurrentTime());
             categoryId = courseCategoryTools.createCourseCategory("课程分类"+ TimeUtils.getCurrentTime());
             Thread.sleep(1000);
             Thread.sleep(1000);
             // 创建团课程
             // 创建团课程
-            courseId = courseTools.createGroupCourse("自动化测试课程",categoryId,"STUDIO");
+            courseId = courseTools.createGroupCourse("自动化测试课程AA",categoryId,"STUDIO");
             Thread.sleep(2500);
             Thread.sleep(2500);
         }
         }
         body.put("categoryId",categoryId);
         body.put("categoryId",categoryId);
 
 
+
         xmAppApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(flag,msg);
         xmAppApi.doRequest(RequestType.JSON,params,body.toString(),headers).assetsSuccess(flag,msg);
 
 
     }
     }