This is an automated email from the git hooks/post-receive script. New commit to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit b858f7ca73a813af53e2298a262094ef077d4e86 Author: Tony CHEMIT <dev@tchemit.fr> Date: Sun Jan 15 15:20:10 2017 +0100 Amélioration tests --- .../org/chorem/pollen/rest/api/AuthApiTest.java | 10 ++-- .../org/chorem/pollen/rest/api/PollApiTest.java | 26 ++++----- .../chorem/pollen/rest/api/PollenUserApiTest.java | 62 +++++++++++----------- .../chorem/pollen/rest/api/RestApiFixtures.java | 43 +++++++++++++++ 4 files changed, 92 insertions(+), 49 deletions(-) diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java index 30122af..c409fbd 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java @@ -45,7 +45,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { @Test public void login() throws URISyntaxException, IOException { - Request request = createRequest("/v1/login") + Request request = createRequest(RestApiFixtures.login()) .addParameter("login", "admin@pollen.org") .addParameter("password", "admin") .Post(); @@ -59,7 +59,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { @Test public void loginThenLogout() throws URISyntaxException, IOException { - Request login = createRequest("/v1/login") + Request login = createRequest(RestApiFixtures.login()) .addParameter("login", "admin@pollen.org") .addParameter("password", "admin") .Post(); @@ -73,7 +73,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { PollenEntityRef createBeanRef = getJsonHelper().fromJson(loginContent, type); - Request logout = createRequest("/v1/logout").Get(); + Request logout = createRequest(RestApiFixtures.logout()).Get(); logout.addHeader(PollenRestApiRequestFilter.REQUEST_HEADER_SESSION_TOKEN, createBeanRef.getPermission()); String logoutContent = logout.execute().returnContent().asString(); @@ -85,7 +85,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { @Test public void badLogin() throws URISyntaxException, IOException { - Request request = createRequest("/v1/login") + Request request = createRequest(RestApiFixtures.login()) .addParameter("login", "admin@pollen.org" + System.nanoTime()) .addParameter("password", "admin" + System.nanoTime()) .Post(); @@ -99,7 +99,7 @@ public class AuthApiTest extends AbstractPollenRestApiTest { @Test public void badPassword() throws URISyntaxException, IOException { - Request request = createRequest("/v1/login") + Request request = createRequest(RestApiFixtures.login()) .addParameter("login", "admin@pollen.org") .addParameter("password", "admin" + System.nanoTime()) .Post(); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java index e66ec99..480c2ee 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java @@ -60,7 +60,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { @Test public void getPollsNew() throws URISyntaxException, IOException { - Request request = createRequest("/v1/polls/new").Get(); + Request request = createRequest(RestApiFixtures.polls("new", null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -71,7 +71,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void getPolls() throws URISyntaxException, IOException { //TODO Login as admin before - Request request = createRequest("/v1/polls").Get(); + Request request = createRequest(RestApiFixtures.polls(null, null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -80,7 +80,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { @Ignore @Test public void getPollsCreated() throws URISyntaxException, IOException { - Request request = createRequest("/v1/polls/created").Get(); + Request request = createRequest(RestApiFixtures.polls("created", null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -89,7 +89,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { @Ignore @Test public void getPollsInvited() throws URISyntaxException, IOException { - Request request = createRequest("/v1/polls/invited").Get(); + Request request = createRequest(RestApiFixtures.polls("invited", null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -98,7 +98,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { @Ignore @Test public void getPollsParticipated() throws URISyntaxException, IOException { - Request request = createRequest("/v1/polls/participated").Get(); + Request request = createRequest(RestApiFixtures.polls("participated", null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -109,7 +109,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = encodeId(poll.getTopiaId()); - Request request = createRequest("/v1/polls/" + pollId).Get(); + Request request = createRequest(RestApiFixtures.polls(pollId, null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -140,7 +140,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { String choiceStr = getJsonHelper().toJson(choices); String pollStr = getJsonHelper().toJson(poll); - Request request = createRequest("/v1/polls") + Request request = createRequest(RestApiFixtures.polls(null, null)) .addParameter("poll", pollStr) .addParameter("choices", choiceStr) .Post(); @@ -167,7 +167,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { String choiceStr = getJsonHelper().toJson(choices); String pollStr = getJsonHelper().toJson(poll); - Request request = createRequest("/v1/polls") + Request request = createRequest(RestApiFixtures.polls(null, null)) .addParameter("poll", pollStr) .addParameter("choices", choiceStr) .Post(); @@ -183,7 +183,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void putPoll() throws URISyntaxException, IOException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = poll.getTopiaId(); - Request request = createRequest("/v1/polls/" + pollId).Put(); + Request request = createRequest(RestApiFixtures.polls(pollId, null)).Put(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -193,7 +193,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void deletePoll() throws URISyntaxException, IOException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = encodeId(poll.getTopiaId()); - Request request = createRequest("/v1/polls/" + pollId) + Request request = createRequest(RestApiFixtures.polls(pollId, null)) .addParameter(PollenRestApiRequestFilter.REQUEST_PERMISSION_PARAMETER, poll.getCreator().getPermission().getToken()) .Delete(); String content = request.execute().returnContent().asString(); @@ -206,7 +206,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void clonePoll() throws URISyntaxException, IOException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = encodeId(poll.getTopiaId()); - Request request = createRequest("/v1/polls/" + pollId).Post(); + Request request = createRequest(RestApiFixtures.polls(pollId, null)).Post(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -217,7 +217,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void exportPoll() throws URISyntaxException, IOException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = encodeId(poll.getTopiaId()); - Request request = createRequest("/v1/polls/" + pollId + "/export").Get(); + Request request = createRequest(RestApiFixtures.polls(pollId, "export")).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); @@ -228,7 +228,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { public void closePoll() throws URISyntaxException, IOException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); String pollId = encodeId(poll.getTopiaId()); - Request request = createRequest("/v1/polls/" + pollId + "/close").Post(); + Request request = createRequest(RestApiFixtures.polls(pollId, "close")).Post(); String content = request.execute().returnContent().asString(); showTestResult(content); assertNotNull(content); diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java index 8199e2f..7f6ff76 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserApiTest.java @@ -50,35 +50,12 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { loadFixtures("fixtures"); } - protected String login(String login, String password) throws URISyntaxException, IOException { - - Request loginRequest = createRequest("/v1/login") - .addParameter("login", login) - .addParameter("password", password) - .Post(); - - String loginContent = loginRequest.execute().returnContent().asString(); - showTestResult(loginContent); - - Type type = new TypeToken<PollenEntityRef<PollenUser>>() { - }.getType(); - - PollenEntityRef<PollenUser> createBeanRef = getJsonHelper().fromJson(loginContent, type); - Assert.assertNotNull(createBeanRef); - Assert.assertNotNull(createBeanRef.getEntityId()); - Assert.assertNotNull(createBeanRef.getReducedId()); - Assert.assertNotNull(createBeanRef.getPermission()); - - return createBeanRef.getPermission(); - - } - @Test public void getUsers() throws Exception { - String sessionToken = login("admin@pollen.org", "admin"); + String sessionToken = login(); - Request request = createRequest("/v1/users").Get(); + Request request = createRequest(RestApiFixtures.users(null, null)).Get(); request.addHeader(PollenRestApiRequestFilter.REQUEST_HEADER_SESSION_TOKEN, sessionToken); String content = request.execute().returnContent().asString(); showTestResult(content); @@ -89,11 +66,11 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { @Test public void getUser() throws Exception { - String sessionToken = login("admin@pollen.org", "admin"); + String sessionToken = login(); PollenUser pollenUser = fixture("user_jean"); String userId = encodeId(pollenUser.getTopiaId()); - Request request = createRequest("/v1/users/" + userId).Get(); + Request request = createRequest(RestApiFixtures.users(userId, null)).Get(); request.addHeader(PollenRestApiRequestFilter.REQUEST_HEADER_SESSION_TOKEN, sessionToken); String content = request.execute().returnContent().asString(); showTestResult(content); @@ -106,7 +83,7 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { @Test public void postUser() throws Exception { - Request request = createRequest("/v1/users").Post(); + Request request = createRequest(RestApiFixtures.users(null, null)).Post(); String content = request.execute().returnContent().asString(); showTestResult(content); assertTrue(content.contains("email2")); @@ -119,7 +96,7 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { PollenUser pollenUser = fixture("user_jean"); String userId = pollenUser.getTopiaId(); - Request request = createRequest("/v1/users/" + userId).Get(); + Request request = createRequest(RestApiFixtures.users(userId, null)).Get(); String content = request.execute().returnContent().asString(); showTestResult(content); assertTrue(content.contains("email3")); @@ -132,7 +109,7 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { PollenUser pollenUser = fixture("user_jean"); String userId = encodeId(pollenUser.getTopiaId()); - Request request = createRequest("/v1/users/" + userId).Delete(); + Request request = createRequest(RestApiFixtures.users(userId, null)).Delete(); String content = request.execute().returnContent().asString(); showTestResult(content); assertTrue(content.contains("OK!")); @@ -146,9 +123,32 @@ public class PollenUserApiTest extends AbstractPollenRestApiTest { PollenUser pollenUser = fixture("user_jean"); String userId = encodeId(pollenUser.getTopiaId()); String token = ""; - Request request = createRequest("/v1/users/" + userId + "?token=" + token).Put(); + Request request = createRequest(RestApiFixtures.users(userId, token)).Put(); String content = request.execute().returnContent().asString(); showTestResult(content); assertTrue(content.contains("OK!")); } + + private String login() throws URISyntaxException, IOException { + + Request loginRequest = createRequest(RestApiFixtures.login()) + .addParameter("login", "admin@pollen.org") + .addParameter("password", "admin") + .Post(); + + String loginContent = loginRequest.execute().returnContent().asString(); + showTestResult(loginContent); + + Type type = new TypeToken<PollenEntityRef<PollenUser>>() { + }.getType(); + + PollenEntityRef<PollenUser> createBeanRef = getJsonHelper().fromJson(loginContent, type); + Assert.assertNotNull(createBeanRef); + Assert.assertNotNull(createBeanRef.getEntityId()); + Assert.assertNotNull(createBeanRef.getReducedId()); + Assert.assertNotNull(createBeanRef.getPermission()); + + return createBeanRef.getPermission(); + + } } diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/RestApiFixtures.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/RestApiFixtures.java new file mode 100644 index 0000000..d394893 --- /dev/null +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/RestApiFixtures.java @@ -0,0 +1,43 @@ +package org.chorem.pollen.rest.api; + +/** + * Created on 15/01/17. + * + * @author Tony Chemit - dev@tchemit.fr + * @since X + */ +public class RestApiFixtures { + + protected static final String LOGIN_API = "/v1/login2"; + protected static final String LOGOUT_API = "/v1/logout"; + protected static final String USERS_API = "/v1/users"; + protected static final String POLLS_API = "/v1/polls"; + + public static String login() { + return LOGIN_API; + } + + public static String users(String userId, String token) { + return api(USERS_API, userId, "?token=", token); + } + + public static String polls(String pollId, String token) { + return api(POLLS_API, pollId, "/", token); + } + + + public static String logout() { + return LOGOUT_API; + } + + private static String api(String api, String idOrAction, String tokenPrefix, String token) { + String result = api; + if (idOrAction != null) { + result += "/" + idOrAction; + } + if (token != null) { + result += tokenPrefix + token; + } + return result; + } +} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.