Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Automated merge

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-06-27 14:30:43 +02:00
parent cba5bf7ba4 9def0697fe
commit 2b2834b2a9
2 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceManagerAdapter.java
View File

@@ -14,6 +14,8 @@ import java.util.Collection;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
/** /**
* Adapter from resource http endpoints to managers. * Adapter from resource http endpoints to managers.
* *
@@ -55,6 +57,9 @@ class ResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
return Response.status(Response.Status.NOT_FOUND).build(); return Response.status(Response.Status.NOT_FOUND).build();
} }
MODEL_OBJECT changedModelObject = applyChanges.apply(existingModelObject); MODEL_OBJECT changedModelObject = applyChanges.apply(existingModelObject);
if (!id.equals(changedModelObject.getId())) {
return Response.status(BAD_REQUEST).entity("illegal change of id").build();
}
return update(id, changedModelObject); return update(id, changedModelObject);
} }
@@ -73,7 +78,7 @@ class ResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
*/ */
public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) throws IOException, EXCEPTION { public Response create(DTO dto, Supplier<MODEL_OBJECT> modelObjectSupplier, Function<MODEL_OBJECT, String> uriCreator) throws IOException, EXCEPTION {
if (dto == null) { if (dto == null) {
return Response.status(400).build(); return Response.status(BAD_REQUEST).build();
} }
MODEL_OBJECT modelObject = modelObjectSupplier.get(); MODEL_OBJECT modelObject = modelObjectSupplier.get();
manager.create(modelObject); manager.create(modelObject);

43
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
View File

@@ -34,6 +34,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
@@ -69,7 +70,7 @@ public class UserRootResourceTest {
@Before @Before
public void prepareEnvironment() throws IOException, UserException { public void prepareEnvironment() throws IOException, UserException {
initMocks(this); initMocks(this);
User dummyUser = createDummyUser(); User dummyUser = createDummyUser("Neo");
when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(new PageResult<>(singletonList(dummyUser), 1)); when(userManager.getPage(any(), eq(0), eq(10))).thenReturn(new PageResult<>(singletonList(dummyUser), 1));
when(userManager.get("Neo")).thenReturn(dummyUser); when(userManager.get("Neo")).thenReturn(dummyUser);
doNothing().when(userManager).create(userCaptor.capture()); doNothing().when(userManager).create(userCaptor.capture());
@@ -192,9 +193,45 @@ public class UserRootResourceTest {
assertEquals(HttpServletResponse.SC_NO_CONTENT, response.getStatus()); assertEquals(HttpServletResponse.SC_NO_CONTENT, response.getStatus());
} }
private User createDummyUser() { @Test
public void shouldFailUpdateForDifferentIds() throws IOException, URISyntaxException, UserException {
URL url = Resources.getResource("sonia/scm/api/v2/user-test-update.json");
byte[] userJson = Resources.toByteArray(url);
when(userManager.get("Other")).thenReturn(createDummyUser("Other"));
MockHttpRequest request = MockHttpRequest
.put("/" + UserRootResource.USERS_PATH_V2 + "Other")
.contentType(VndMediaType.USER)
.content(userJson);
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
assertEquals(HttpServletResponse.SC_BAD_REQUEST, response.getStatus());
verify(userManager, never()).modify(any(User.class));
}
@Test
public void shouldFailUpdateForUnknownEntity() throws IOException, URISyntaxException, UserException {
URL url = Resources.getResource("sonia/scm/api/v2/user-test-update.json");
byte[] userJson = Resources.toByteArray(url);
when(userManager.get("Neo")).thenReturn(null);
MockHttpRequest request = MockHttpRequest
.put("/" + UserRootResource.USERS_PATH_V2 + "Neo")
.contentType(VndMediaType.USER)
.content(userJson);
MockHttpResponse response = new MockHttpResponse();
dispatcher.invoke(request, response);
assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatus());
verify(userManager, never()).modify(any(User.class));
}
private User createDummyUser(String name) {
User user = new User(); User user = new User();
user.setName("Neo"); user.setName(name);
user.setPassword("redpill"); user.setPassword("redpill");
user.setCreationDate(System.currentTimeMillis()); user.setCreationDate(System.currentTimeMillis());
return user; return user;