Просмотр исходного кода

fix(test): ActivityControllerTest 适配活动模块升级后的接口签名

list/create/update/end 调用改为合并后的新签名
(list(Map,Long) / create(Activity,Long) / update(Activity,Long,String) / end(Map,Long,String))

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
Xiaogang Liao 3 месяцев назад
Родитель
Сommit
287161342a
1 измененных файлов с 14 добавлено и 14 удалено
  1. 14 14
      cfc-backend/src/test/java/com/etotem/cfc/controller/ActivityControllerTest.java

+ 14 - 14
cfc-backend/src/test/java/com/etotem/cfc/controller/ActivityControllerTest.java

@@ -71,7 +71,7 @@ public class ActivityControllerTest {
         Page<Activity> page = new Page<>(1, 10, 2);
         Page<Activity> page = new Page<>(1, 10, 2);
         page.setRecords(records);
         page.setRecords(records);
 
 
-        when(activityService.list(isNull(), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
+        when(activityService.list(isNull(), eq(1), eq(10), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -82,7 +82,7 @@ public class ActivityControllerTest {
                 setCode(200);
                 setCode(200);
             }});
             }});
 
 
-        Result<Map<String, Object>> result = controller.list(params, null, null);
+        Result<Map<String, Object>> result = controller.list(params, null);
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
         assertNotNull(result.getData());
         assertNotNull(result.getData());
     }
     }
@@ -98,7 +98,7 @@ public class ActivityControllerTest {
             mockActivity(3L, "体质检测", "published", "body")
             mockActivity(3L, "体质检测", "published", "body")
         );
         );
 
 
-        when(activityService.list(eq("body"), isNull(), eq(false), eq(1), eq(10), isNull(), isNull()))
+        when(activityService.list(eq("body"), eq(1), eq(10), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -109,7 +109,7 @@ public class ActivityControllerTest {
                 setCode(200);
                 setCode(200);
             }});
             }});
 
 
-        Result<Map<String, Object>> result = controller.list(params, null, null);
+        Result<Map<String, Object>> result = controller.list(params, null);
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
     }
     }
 
 
@@ -120,7 +120,7 @@ public class ActivityControllerTest {
         params.put("page", 1);
         params.put("page", 1);
         params.put("size", 10);
         params.put("size", 10);
 
 
-        when(activityService.list(isNull(), eq("ended"), eq(false), eq(1), eq(10), isNull(), isNull()))
+        when(activityService.list(isNull(), eq(1), eq(10), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", Collections.emptyList());
                 data.put("records", Collections.emptyList());
@@ -131,7 +131,7 @@ public class ActivityControllerTest {
                 setCode(200);
                 setCode(200);
             }});
             }});
 
 
-        Result<Map<String, Object>> result = controller.list(params, null, null);
+        Result<Map<String, Object>> result = controller.list(params, null);
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
         assertEquals(0, ((List<?>)result.getData().get("records")).size());
         assertEquals(0, ((List<?>)result.getData().get("records")).size());
     }
     }
@@ -148,7 +148,7 @@ public class ActivityControllerTest {
             mockActivity(5L, "内部活动", "draft", "mind")
             mockActivity(5L, "内部活动", "draft", "mind")
         );
         );
 
 
-        when(activityService.list(isNull(), isNull(), eq(true), eq(1), eq(10), eq(99L), eq("activity_admin")))
+        when(activityService.list(isNull(), eq(1), eq(10), eq(99L)))
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
             .thenReturn(new com.etotem.cfc.common.Result<Map<String, Object>>() {{
                 Map<String, Object> data = new HashMap<>();
                 Map<String, Object> data = new HashMap<>();
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
                 data.put("records", records.stream().map(ActivityDTO::from).collect(Collectors.toList()));
@@ -159,7 +159,7 @@ public class ActivityControllerTest {
                 setCode(200);
                 setCode(200);
             }});
             }});
 
 
-        Result<Map<String, Object>> result = controller.list(params, 99L, "activity_admin");
+        Result<Map<String, Object>> result = controller.list(params, 99L);
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
         assertEquals(1, ((List<?>)result.getData().get("records")).size());
         assertEquals(1, ((List<?>)result.getData().get("records")).size());
     }
     }
@@ -215,7 +215,7 @@ public class ActivityControllerTest {
         Activity activity = mockActivity(null, "新年联欢", "draft", "action");
         Activity activity = mockActivity(null, "新年联欢", "draft", "action");
         activity.setVendorId(null); // will be set by controller
         activity.setVendorId(null); // will be set by controller
 
 
-        when(activityService.create(any(Activity.class)))
+        when(activityService.create(any(Activity.class), eq(5L)))
             .thenReturn(new com.etotem.cfc.common.Result<ActivityDTO>() {{
             .thenReturn(new com.etotem.cfc.common.Result<ActivityDTO>() {{
                 activity.setId(10L);
                 activity.setId(10L);
                 setData(ActivityDTO.from(activity));
                 setData(ActivityDTO.from(activity));
@@ -233,7 +233,7 @@ public class ActivityControllerTest {
         Activity activity = mockActivity(null, "公开活动", "draft", "body");
         Activity activity = mockActivity(null, "公开活动", "draft", "body");
         activity.setVendorId(null); // 游客创建时不应有 vendorId
         activity.setVendorId(null); // 游客创建时不应有 vendorId
 
 
-        when(activityService.create(any(Activity.class)))
+        when(activityService.create(any(Activity.class), isNull()))
             .thenReturn(new com.etotem.cfc.common.Result<ActivityDTO>() {{
             .thenReturn(new com.etotem.cfc.common.Result<ActivityDTO>() {{
                 activity.setId(11L);
                 activity.setId(11L);
                 setData(ActivityDTO.from(activity));
                 setData(ActivityDTO.from(activity));
@@ -257,7 +257,7 @@ public class ActivityControllerTest {
                 setCode(200);
                 setCode(200);
             }});
             }});
 
 
-        Result<ActivityDTO> result = controller.update(activity, "admin");
+        Result<ActivityDTO> result = controller.update(activity, null, "admin");
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
         assertEquals("更新后的活动", result.getData().getTitle());
         assertEquals("更新后的活动", result.getData().getTitle());
     }
     }
@@ -317,7 +317,7 @@ public class ActivityControllerTest {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("id", 1);
         params.put("id", 1);
 
 
-        Result<String> result = controller.end(params, "admin");
+        Result<String> result = controller.end(params, null, "admin");
         assertEquals(200, result.getCode());
         assertEquals(200, result.getCode());
     }
     }
 
 
@@ -333,14 +333,14 @@ public class ActivityControllerTest {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         params.put("id", 999);
         params.put("id", 999);
 
 
-        Result<String> result = controller.end(params, "admin");
+        Result<String> result = controller.end(params, null, "admin");
         assertEquals(500, result.getCode());
         assertEquals(500, result.getCode());
     }
     }
 
 
     @Test
     @Test
     public void end_MissingId() {
     public void end_MissingId() {
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
-        Result<String> result = controller.end(params, "admin");
+        Result<String> result = controller.end(params, null, "admin");
         assertEquals(500, result.getCode());
         assertEquals(500, result.getCode());
     }
     }
 }
 }