This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit db4f69c34f5c8a16ffc74d072a147bfc0a78eb3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 5 20:21:26 2014 +0200 make import of favorite list works --- .../service/FavoriteListImportFromFile.java | 4 +-- .../service/FavoriteListImportFromLdap.java | 2 +- .../services/service/FavoriteListService.java | 4 +-- .../services/service/FavoriteListServiceTest.java | 40 +++++++++++++++++++++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromFile.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromFile.java index c997630..28acbeb 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromFile.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromFile.java @@ -134,7 +134,7 @@ public class FavoriteListImportFromFile extends PollenServiceSupport implements } - email = email.toLowerCase().trim(); + email = getCleanMail(email); if (!usedEmail.add(email)) { // email already exists String error = l(locale, "pollen.error.favoriteList.import.csv.already.used.email", lineNumber, email); @@ -150,7 +150,7 @@ public class FavoriteListImportFromFile extends PollenServiceSupport implements } - FavoriteListMember member = getFavoriteListMemberDao().newInstance(); + FavoriteListMember member = getFavoriteListMemberDao().create(); member.setName(memberName); member.setEmail(email); member.setFavoriteList(favoriteList); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromLdap.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromLdap.java index 2e3c964..979a002 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromLdap.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListImportFromLdap.java @@ -141,7 +141,7 @@ public class FavoriteListImportFromLdap extends PollenServiceSupport implements } - FavoriteListMember member = getFavoriteListMemberDao().newInstance(); + FavoriteListMember member = getFavoriteListMemberDao().create(); member.setName(memberName); member.setEmail(email); member.setFavoriteList(favoriteList); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 0f5b53e..046ef0e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -254,7 +254,7 @@ public class FavoriteListService extends PollenServiceSupport { checkNotNull(favoriteListId); checkNotNull(file); - FavoriteListImportFromFile importer = new FavoriteListImportFromFile(); + FavoriteListImportFromFile importer = newService(FavoriteListImportFromFile.class); importer.setFile(file); importer.doImport(favoriteListId); @@ -267,7 +267,7 @@ public class FavoriteListService extends PollenServiceSupport { checkNotNull(favoriteListId); checkNotNull(ldap); - FavoriteListImportFromLdap importer = new FavoriteListImportFromLdap(); + FavoriteListImportFromLdap importer = newService(FavoriteListImportFromLdap.class); importer.setLdap(ldap); importer.doImport(favoriteListId); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java index d637524..504118b 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java @@ -21,12 +21,16 @@ package org.chorem.pollen.services.service; * #L% */ +import com.google.common.base.Charsets; +import com.google.common.io.Files; import org.chorem.pollen.persistence.entity.FavoriteList; import org.chorem.pollen.persistence.entity.FavoriteListMember; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.AbstractPollenServiceTest; import org.chorem.pollen.services.bean.FavoriteListBean; import org.chorem.pollen.services.bean.FavoriteListMemberBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; @@ -34,6 +38,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.File; +import java.io.IOException; import java.text.ParseException; import java.util.Date; @@ -45,7 +51,6 @@ import java.util.Date; */ public class FavoriteListServiceTest extends AbstractPollenServiceTest { - protected PollenUserService userService; protected FavoriteListService service; @@ -65,6 +70,39 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { user = application.fixture("user_jean"); } + public static String IMPORT_FILE_CONTENT = "user1@pollen.org user1\n" + + "user2@pollen.org"; + + @Test + public void importFavoriteListFromFile() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, IOException, FavoriteListImportException { + + login("jean@pollen.fake", "fake"); + + FavoriteListBean favoriteListBean1 = new FavoriteListBean(); + + favoriteListBean1.setName("list1"); + PollenEntityRef<FavoriteList> savedList1 = service.createFavoriteList(favoriteListBean1); + Assert.assertNotNull(savedList1); + String favoriteListId = savedList1.getEntityId(); + Assert.assertNotNull(favoriteListId); + + // create import file + + File importFile = new File(application.getTestBasedir(), "importFavoriteListFromFile_" + System.nanoTime()); + Files.write(IMPORT_FILE_CONTENT, importFile, Charsets.UTF_8); + + PaginationResultBean<FavoriteListMemberBean> members = service.getFavoriteListMembers(favoriteListId, PaginationParameterBean.of(0, -1)); + Assert.assertEquals(0, members.getElements().size()); + + // import file + + service.importFavoriteListMembersFromCsv(favoriteListId, importFile); + + members = service.getFavoriteListMembers(favoriteListId, PaginationParameterBean.of(0, -1)); + Assert.assertEquals(2, members.getElements().size()); + + } + @Test public void createFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.