branch develop-1.1.x updated (5e36803 -> 6a5438f)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 5e36803 enregistrement de tous les droits de lecture sur les dossiers (même ceux des parents) pour plus de rapidité dans les recherches (fixes #7683) new 6a5438f fix tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6a5438f633aeedc986664589c7eb1a11042a5178 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 30 16:22:54 2015 +0100 fix tests Summary of changes: .../services/service/EmailServiceTest.java | 30 ++++++++-------- .../services/service/InitTestDataImpl.java | 41 +++++++++++++++------- 2 files changed, 43 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 6a5438f633aeedc986664589c7eb1a11042a5178 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 30 16:22:54 2015 +0100 fix tests --- .../services/service/EmailServiceTest.java | 30 ++++++++-------- .../services/service/InitTestDataImpl.java | 41 +++++++++++++++------- 2 files changed, 43 insertions(+), 28 deletions(-) diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 3258e70..e1e5f3f 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -24,21 +24,6 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.topia.persistence.TopiaEntities; -import org.nuiton.util.pagination.PaginationParameter; -import org.nuiton.util.pagination.PaginationResult; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -49,6 +34,21 @@ import com.franciaflex.faxtomail.persistence.entities.Range; import com.franciaflex.faxtomail.persistence.entities.SearchFilter; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.util.pagination.PaginationParameter; +import org.nuiton.util.pagination.PaginationResult; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; /** * Email service tests. diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java index 82c9b9d..10eb700 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java @@ -143,19 +143,24 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes MailFolderTopiaDao folderDao = getPersistenceContext().getMailFolderDao(); Map<String, MailFolder> foldersByName = new HashMap<>(); MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex", - MailFolder.PROPERTY_COMPANY, "FXCOMP"); + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); // categories MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", MailFolder.PROPERTY_PARENT, franciaflex, - MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply@franciaflex.com")); + MailFolder.PROPERTY_REPLY_ADDRESSES, Lists.newArrayList("no-reply@franciaflex.com"), + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); franciaflex.addChildren(chargesClientelle); foldersByName.put(chargesClientelle.getName(), chargesClientelle); MailFolder sav = folderDao.create(MailFolder.PROPERTY_NAME, "SAV", MailFolder.PROPERTY_PARENT, franciaflex, MailFolder.PROPERTY_WAITING_STATES, waitingStates.subList(0, 1), - MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23); + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23, + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); franciaflex.addChildren(sav); foldersByName.put(sav.getName(), sav); @@ -163,40 +168,50 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes MailFolder cyrilFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Cyril", MailFolder.PROPERTY_PARENT, chargesClientelle, MailFolder.PROPERTY_WAITING_STATES, waitingStates.subList(1, 2), - MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(cyril)); + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(cyril, marc)); chargesClientelle.addChildren(cyrilFolder); foldersByName.put(cyrilFolder.getName(), cyrilFolder); MailFolder claireFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Claire", - MailFolder.PROPERTY_PARENT, chargesClientelle); + MailFolder.PROPERTY_PARENT, chargesClientelle, + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); chargesClientelle.addChildren(claireFolder); foldersByName.put(claireFolder.getName(), claireFolder); MailFolder agatheFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Agathe", MailFolder.PROPERTY_PARENT, chargesClientelle, - MailFolder.PROPERTY_WAITING_STATES, waitingStates.subList(2, 3)); + MailFolder.PROPERTY_WAITING_STATES, waitingStates.subList(2, 3), + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); chargesClientelle.addChildren(agatheFolder); foldersByName.put(agatheFolder.getName(), agatheFolder); MailFolder marcFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Marc", - MailFolder.PROPERTY_PARENT, sav); + MailFolder.PROPERTY_PARENT, sav, + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23, + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); sav.addChildren(marcFolder); foldersByName.put(marcFolder.getName(), marcFolder); MailFolder fredericFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Frédéric", - MailFolder.PROPERTY_PARENT, sav); + MailFolder.PROPERTY_PARENT, sav, + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23, + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); sav.addChildren(fredericFolder); foldersByName.put(fredericFolder.getName(), fredericFolder); MailFolder jeanneFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Jeanne", - MailFolder.PROPERTY_PARENT, sav); + MailFolder.PROPERTY_PARENT, sav, + MailFolder.PROPERTY_COMPANY, "FXCOMP", + MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23, + MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc)); sav.addChildren(jeanneFolder); foldersByName.put(jeanneFolder.getName(), jeanneFolder); - // droits global à marc pour tout - franciaflex.addReadRightUsers(marc); - franciaflex = folderDao.update(franciaflex); - // import test csv List<Range> ranges = null; try (InputStream is = InitTestDataImpl.class.getResourceAsStream("/csv/ranges.csv")) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm