Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

Use json file for test instead of embedded json

Browse Source
This commit is contained in:
René Pfeuffer
2018-06-13 12:49:29 +02:00
parent 8bfe6bacb0
commit 4a63f0a3de
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserV2ResourceTest.java
View File

@@ -2,6 +2,7 @@ package sonia.scm.api.v2.resources;
import com.github.sdorra.shiro.ShiroRule; import com.github.sdorra.shiro.ShiroRule;
import com.github.sdorra.shiro.SubjectAware; import com.github.sdorra.shiro.SubjectAware;
import com.google.common.io.Resources;
import org.apache.shiro.authc.credential.PasswordService; import org.apache.shiro.authc.credential.PasswordService;
import org.jboss.resteasy.core.Dispatcher; import org.jboss.resteasy.core.Dispatcher;
import org.jboss.resteasy.mock.MockDispatcherFactory; import org.jboss.resteasy.mock.MockDispatcherFactory;
@@ -22,6 +23,7 @@ import sonia.scm.web.VndMediaType;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections; import java.util.Collections;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@@ -100,8 +102,14 @@ public class UserV2ResourceTest {
} }
@Test @Test
public void shouldCreateNewUserWithEncryptedPassword() throws URISyntaxException { public void shouldCreateNewUserWithEncryptedPassword() throws URISyntaxException, IOException {
MockHttpRequest request = MockHttpRequest.post("/" + UserV2Resource.USERS_PATH_V2).contentType(VndMediaType.USER).content("{\"active\":true,\"admin\":false,\"displayName\":\"rpf\",\"mail\":\"x@abcde.cd\",\"name\":\"rpf\",\"password\":\"pwd123\",\"type\":\"xml\"}".getBytes()); URL url = Resources.getResource("sonia/scm/api/v2/user-test-create.json");
byte[] userJson = Resources.toByteArray(url);
MockHttpRequest request = MockHttpRequest
.post("/" + UserV2Resource.USERS_PATH_V2)
.contentType(VndMediaType.USER)
.content(userJson);
MockHttpResponse response = new MockHttpResponse(); MockHttpResponse response = new MockHttpResponse();
when(passwordService.encryptPassword("pwd123")).thenReturn("encrypted123"); when(passwordService.encryptPassword("pwd123")).thenReturn("encrypted123");

9
scm-webapp/src/test/resources/sonia/scm/api/v2/user-test-create.json Normal file
View File

@@ -0,0 +1,9 @@
{
"active": true,
"admin": false,
"displayName": "rpf",
"mail": "x@abcde.cd",
"name": "rpf",
"password": "pwd123",
"type": "xml"
}