This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a6c6d634991010b0785693422ffdbd0c353cdba5 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 18 10:56:16 2019 +0200 Fix purgeOldVotes cron --- .../pollen/persistence/entity/VoteTopiaDao.java | 2 +- .../pollen/services/service/VoteServiceTest.java | 30 +++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java index 6a2e928c..0d5c0630 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -70,7 +70,7 @@ public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { builder.addLowerThan(Vote.PROPERTY_TOPIA_CREATE_DATE, twoYearsAgo); builder.addNotNull(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER); - builder.addNotEquals(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER, ANONYMOUS_NAME); + builder.addNotEquals(Vote.PROPERTY_VOTER+"."+PollenPrincipal.PROPERTY_POLLEN_USER+"."+PollenUser.PROPERTY_NAME, ANONYMOUS_NAME); List<Vote> oldVotes = findAll(builder.getHql(), builder.getHqlParameters()); return oldVotes; diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java index 0166bf3e..ea8535eb 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java @@ -22,20 +22,36 @@ package org.chorem.pollen.services.service; */ import org.chorem.pollen.services.AbstractPollenServiceTest; -import org.chorem.pollen.services.service.security.SecurityService; +import org.chorem.pollen.services.test.FakePollenSecurityContext; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; -public class VoteServiceTest extends AbstractPollenServiceTest { +import java.util.Date; - protected PollService pollService; +public class VoteServiceTest extends AbstractPollenServiceTest { protected VoteService service; - protected SecurityService securityService; + @Before + public void setUp() { - @Test - public void addVote() throws Exception { + loadFixtures("fixtures"); + + service = newService(VoteService.class); - //TODO + getServiceContext().setDate(new Date(1363948427576L)); + + getServiceContext().setSecurityContext(new FakePollenSecurityContext()); + } + + @Test + public void testPurgeOldVotes() { + //TODO should also check that old votes are properly anonymized + try { + service.purgeOldVotes(); + } catch (Exception eee) { + Assert.fail("Exception should not have been thrown"); + } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.