|
@@ -48,6 +48,7 @@ public class ActivityServicePublishTest {
|
|
|
@Test
|
|
@Test
|
|
|
public void publish_draft_success() throws Exception {
|
|
public void publish_draft_success() throws Exception {
|
|
|
Activity activity = mockActivity(1L, "draft");
|
|
Activity activity = mockActivity(1L, "draft");
|
|
|
|
|
+ activity.setDimensionCode("body");
|
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
|
org.mockito.Mockito.doReturn(activity).when(spy).getById(1L);
|
|
org.mockito.Mockito.doReturn(activity).when(spy).getById(1L);
|
|
|
org.mockito.Mockito.doReturn(true).when(spy).updateById(activity);
|
|
org.mockito.Mockito.doReturn(true).when(spy).updateById(activity);
|
|
@@ -62,26 +63,26 @@ public class ActivityServicePublishTest {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
@Test
|
|
|
- public void publish_notFound_returnsError() throws Exception {
|
|
|
|
|
|
|
+ public void publish_notFound_returnsNotFound() throws Exception {
|
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
|
org.mockito.Mockito.doReturn(null).when(spy).getById(999L);
|
|
org.mockito.Mockito.doReturn(null).when(spy).getById(999L);
|
|
|
|
|
|
|
|
Result<String> result = spy.publish(999L);
|
|
Result<String> result = spy.publish(999L);
|
|
|
|
|
|
|
|
- assertEquals(500, result.getCode());
|
|
|
|
|
|
|
+ assertEquals(404, result.getCode());
|
|
|
assertEquals("活动不存在", result.getMessage());
|
|
assertEquals("活动不存在", result.getMessage());
|
|
|
org.mockito.Mockito.verify(spy, org.mockito.Mockito.never()).updateById(org.mockito.Mockito.any());
|
|
org.mockito.Mockito.verify(spy, org.mockito.Mockito.never()).updateById(org.mockito.Mockito.any());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
@Test
|
|
|
- public void publish_notDraft_returnsError() throws Exception {
|
|
|
|
|
|
|
+ public void publish_notDraft_returnsConflict() throws Exception {
|
|
|
Activity activity = mockActivity(1L, "published");
|
|
Activity activity = mockActivity(1L, "published");
|
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
|
org.mockito.Mockito.doReturn(activity).when(spy).getById(1L);
|
|
org.mockito.Mockito.doReturn(activity).when(spy).getById(1L);
|
|
|
|
|
|
|
|
Result<String> result = spy.publish(1L);
|
|
Result<String> result = spy.publish(1L);
|
|
|
|
|
|
|
|
- assertEquals(500, result.getCode());
|
|
|
|
|
|
|
+ assertEquals(409, result.getCode());
|
|
|
assertEquals("仅草稿状态可发布", result.getMessage());
|
|
assertEquals("仅草稿状态可发布", result.getMessage());
|
|
|
org.mockito.Mockito.verify(spy, org.mockito.Mockito.never()).updateById(org.mockito.Mockito.any());
|
|
org.mockito.Mockito.verify(spy, org.mockito.Mockito.never()).updateById(org.mockito.Mockito.any());
|
|
|
}
|
|
}
|
|
@@ -104,13 +105,13 @@ public class ActivityServicePublishTest {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
@Test
|
|
|
- public void end_notFound_returnsError() throws Exception {
|
|
|
|
|
|
|
+ public void end_notFound_returnsNotFound() throws Exception {
|
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
ActivityService spy = org.mockito.Mockito.spy(service);
|
|
|
org.mockito.Mockito.doReturn(null).when(spy).getById(999L);
|
|
org.mockito.Mockito.doReturn(null).when(spy).getById(999L);
|
|
|
|
|
|
|
|
Result<String> result = spy.end(999L);
|
|
Result<String> result = spy.end(999L);
|
|
|
|
|
|
|
|
- assertEquals(500, result.getCode());
|
|
|
|
|
|
|
+ assertEquals(404, result.getCode());
|
|
|
assertEquals("活动不存在", result.getMessage());
|
|
assertEquals("活动不存在", result.getMessage());
|
|
|
}
|
|
}
|
|
|
|
|
|