This is an automated email from the git hooks/post-receive script. New commit to branch feature/14_add_rss_feed in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit dc0581ec60c325f7c26a6a1342d71da1fdd447f2 Author: Kevin Morin <morin@codelutin.com> Date: Fri Jun 2 10:09:31 2017 +0200 refs #14 fix tests --- .../org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java | 3 ++- .../src/test/java/org/chorem/pollen/rest/api/PollApiTest.java | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java index 74037f7c..1f8b29b7 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java @@ -70,7 +70,8 @@ public class AbstractPollenRestApiTest extends WebMotionTest { TopiaIdFactory topiaIdFactory = application.getTopiaApplicationContext().getTopiaIdFactory(); - jsonHelper = new JsonHelper(topiaIdFactory, true); + // do not pretty print otherwise adding a pretty print json in header fails (last '}' missing) + jsonHelper = new JsonHelper(topiaIdFactory, false); } return jsonHelper; 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 269d1d6e..da278766 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 @@ -32,7 +32,6 @@ import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenFixtures; -import org.chorem.pollen.services.PollenUIContext; import org.chorem.pollen.services.bean.ChoiceBean; import org.junit.Before; import org.junit.Ignore; @@ -55,7 +54,6 @@ public class PollApiTest extends AbstractPollenRestApiTest { @Before public void setUp() throws Exception { - loadFixtures("fixtures"); } @@ -147,8 +145,8 @@ public class PollApiTest extends AbstractPollenRestApiTest { .addParameter("choices", choiceStr) .addParameter("voterLists", "[]") .addParameter("voterListMembers", "[]") - .addParameter("pollenUIContext", getJsonHelper().toJson(new PollenUIContext())) - .Post(); + .Post().setHeader(PollenRestApiRequestFilter.REQUEST_HEADER_UI_CONTEXT, + getJsonHelper().toJson(fixture("pollenUIContext_chorem"))); String content = request.execute().returnContent().asString(); showTestResult(content); @@ -177,8 +175,8 @@ public class PollApiTest extends AbstractPollenRestApiTest { .addParameter("choices", choiceStr) .addParameter("voterLists", "[]") .addParameter("voterListMembers", "[]") - .addParameter("pollenUIContext", getJsonHelper().toJson(new PollenUIContext())) - .Post(); + .Post().setHeader(PollenRestApiRequestFilter.REQUEST_HEADER_UI_CONTEXT, + getJsonHelper().toJson(fixture("pollenUIContext_chorem"))); String content = request.execute().returnContent().asString(); showTestResult(content); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.