[Faxtomail-commits] 02/02: fix tests

10 Nov 2015

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 d65839e081c27d0bba4d4c02561c72d5081630a3
Author: Kevin Morin <morin@codelutin.com>
Date:   Tue Nov 10 12:28:43 2015 +0100

    fix tests
---
 .../services/service/InitTestDataImpl.java         | 35 ++++++++--------------
 1 file changed, 13 insertions(+), 22 deletions(-)

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 10eb700..7e03e55 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,24 +143,20 @@ 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_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                MailFolder.PROPERTY_COMPANY, "FXCOMP");
 
         // 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_COMPANY, "FXCOMP",
-                                                        MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                        MailFolder.PROPERTY_COMPANY, "FXCOMP");
         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_COMPANY, "FXCOMP",
-                                          MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23,
-                                          MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                          MailFolder.PROPERTY_COMPANY, "FXCOMP");
         franciaflex.addChildren(sav);
         foldersByName.put(sav.getName(), sav);
 
@@ -168,50 +164,45 @@ 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_COMPANY, "FXCOMP",
-                                                  MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(cyril, marc));
+                                                  MailFolder.PROPERTY_COMPANY, "FXCOMP");
         chargesClientelle.addChildren(cyrilFolder);
         foldersByName.put(cyrilFolder.getName(), cyrilFolder);
 
         MailFolder claireFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Claire",
                                                    MailFolder.PROPERTY_PARENT, chargesClientelle,
-                                                   MailFolder.PROPERTY_COMPANY, "FXCOMP",
-                                                   MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                   MailFolder.PROPERTY_COMPANY, "FXCOMP");
         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_COMPANY, "FXCOMP",
-                                                   MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                   MailFolder.PROPERTY_COMPANY, "FXCOMP");
         chargesClientelle.addChildren(agatheFolder);
         foldersByName.put(agatheFolder.getName(), agatheFolder);
 
         MailFolder marcFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Marc",
                                                  MailFolder.PROPERTY_PARENT, sav,
-                                                 MailFolder.PROPERTY_COMPANY, "FXCOMP",
-                                                 MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23,
-                                                 MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                 MailFolder.PROPERTY_COMPANY, "FXCOMP");
         sav.addChildren(marcFolder);
         foldersByName.put(marcFolder.getName(), marcFolder);
 
         MailFolder fredericFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Frédéric",
                                                      MailFolder.PROPERTY_PARENT, sav,
-                                                     MailFolder.PROPERTY_COMPANY, "FXCOMP",
-                                                     MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23,
-                                                     MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                     MailFolder.PROPERTY_COMPANY, "FXCOMP");
         sav.addChildren(fredericFolder);
         foldersByName.put(fredericFolder.getName(), fredericFolder);
 
         MailFolder jeanneFolder = folderDao.create(MailFolder.PROPERTY_NAME, "Jeanne",
                                                    MailFolder.PROPERTY_PARENT, sav,
-                                                   MailFolder.PROPERTY_COMPANY, "FXCOMP",
-                                                   MailFolder.PROPERTY_READ_RIGHT_GROUPS, groups23,
-                                                   MailFolder.PROPERTY_READ_RIGHT_USERS, Lists.newArrayList(marc));
+                                                   MailFolder.PROPERTY_COMPANY, "FXCOMP");
         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>.

    

[Faxtomail-commits] 02/02: fix tests

codelutin.com scm