|
@@ -222,7 +222,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<ActivityDTO> result = controller.create(activity, 5L, "admin");
|
|
|
|
|
|
|
+ Result<ActivityDTO> result = controller.create(activity, 5L, "admin", null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals(5L, activity.getVendorId()); // vendorId set from userId
|
|
assertEquals(5L, activity.getVendorId()); // vendorId set from userId
|
|
|
assertNotNull(result.getData().getId());
|
|
assertNotNull(result.getData().getId());
|
|
@@ -240,7 +240,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<ActivityDTO> result = controller.create(activity, null, "admin");
|
|
|
|
|
|
|
+ Result<ActivityDTO> result = controller.create(activity, null, "admin", null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertNull(activity.getVendorId());
|
|
assertNull(activity.getVendorId());
|
|
|
}
|
|
}
|
|
@@ -257,7 +257,7 @@ public class ActivityControllerTest {
|
|
|
setCode(200);
|
|
setCode(200);
|
|
|
}});
|
|
}});
|
|
|
|
|
|
|
|
- Result<ActivityDTO> result = controller.update(activity, null, "admin");
|
|
|
|
|
|
|
+ Result<ActivityDTO> result = controller.update(activity, null, "admin", null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals("更新后的活动", result.getData().getTitle());
|
|
assertEquals("更新后的活动", result.getData().getTitle());
|
|
|
}
|
|
}
|
|
@@ -275,7 +275,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.publish(params, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.publish(params, "admin", null);
|
|
|
assertEquals(200, result.getCode());
|
|
assertEquals(200, result.getCode());
|
|
|
assertEquals("发布成功", result.getData());
|
|
assertEquals("发布成功", result.getData());
|
|
|
}
|
|
}
|
|
@@ -292,14 +292,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.publish(params, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.publish(params, "admin", null);
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
@Test
|
|
|
public void publish_MissingId() {
|
|
public void publish_MissingId() {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- Result<String> result = controller.publish(params, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.publish(params, "admin", null);
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
assertTrue(result.getMessage().contains("不能为空"));
|
|
assertTrue(result.getMessage().contains("不能为空"));
|
|
|
}
|
|
}
|
|
@@ -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, null, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.end(params, null, "admin", null);
|
|
|
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, null, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.end(params, null, "admin", null);
|
|
|
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, null, "admin");
|
|
|
|
|
|
|
+ Result<String> result = controller.end(params, null, "admin", null);
|
|
|
assertEquals(500, result.getCode());
|
|
assertEquals(500, result.getCode());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|