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 d27f6db12205c88404f22e88444eaca6d6cf6851 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Oct 27 16:52:52 2015 +0100 Add test for findArchivedEmail() --- .../services/service/EmailServiceTest.java | 50 ++++++++++++++-------- .../services/service/InitTestDataImpl.java | 19 ++++---- 2 files changed, 42 insertions(+), 27 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 8720163..3258e70 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,6 +24,21 @@ 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; @@ -34,20 +49,6 @@ 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.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; /** * Email service tests. @@ -160,7 +161,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // tests fetch + pagination - PaginationParameter page = PaginationParameter.of(0, 7, Email.PROPERTY_RECEPTION_DATE, false); + PaginationParameter page = PaginationParameter.of(0, 4, Email.PROPERTY_RECEPTION_DATE, false); MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); @@ -168,12 +169,12 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { cyril.setFolderReadable(true); PaginationResult<Email> page1 = service.getEmailForFolder(cyril, getCurrentUser(), new EmailFilter(), page); - Assert.assertEquals(10, page1.getCount()); - Assert.assertEquals(7, page1.getElements().size()); + Assert.assertEquals(5, page1.getCount()); // + 5 archived now + Assert.assertEquals(4, page1.getElements().size()); PaginationResult<Email> page2 = service.getEmailForFolder(cyril, getCurrentUser(), new EmailFilter(), page1.getNextPage()); - Assert.assertEquals(10, page2.getCount()); - Assert.assertEquals(3, page2.getElements().size()); + Assert.assertEquals(5, page2.getCount()); // + 5 archived now + Assert.assertEquals(1, page2.getElements().size()); Set<String> page1Ids = Sets.newHashSet(Iterables.transform(page1.getElements(), TopiaEntities.getTopiaIdFunction())); Set<String> page2Ids = Sets.newHashSet(Iterables.transform(page2.getElements(), TopiaEntities.getTopiaIdFunction())); @@ -214,6 +215,17 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // NPE : Assert.assertEquals(600, entry.getValue()[2].longValue()); } + /** + * Test le fonctionnement de search archives qui contennait une erreur de synthax en 1.1. + */ + @Test + public void testSearchArchives() { + // il y a une compagnie de test FXCOMP + // les range row sont préfixé par FXRR + Collection<Email> emails = service.searchArchives("FXRR", "FXCOMP"); + Assert.assertFalse(emails.isEmpty()); + } + // @Test // public void testConvertHTMLToPdf() { // 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 504a70d..82c9b9d 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 @@ -142,7 +142,8 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes // create folders MailFolderTopiaDao folderDao = getPersistenceContext().getMailFolderDao(); Map<String, MailFolder> foldersByName = new HashMap<>(); - MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex"); + MailFolder franciaflex = folderDao.create(MailFolder.PROPERTY_NAME, "Franciaflex", + MailFolder.PROPERTY_COMPANY, "FXCOMP"); // categories MailFolder chargesClientelle = folderDao.create(MailFolder.PROPERTY_NAME, "Chargés de clientèle", @@ -243,8 +244,6 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes List<Range> ranges, List<Client> clients, List<DemandType> types, List<Priority> priorities, MailFolder folder, FaxToMailUser user) throws InvalidClientException { - List<RangeRow> rangeRows = new ArrayList<>(); - Client client = clients.get(0); boolean fax = false; List<String> senders = client.getEmailAddresses(); @@ -294,13 +293,14 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes if (opened) { + List<RangeRow> rangeRows = new ArrayList<>(); getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); DemandType demandType = types.get(0); // types.get(0) à des gammes obligatoires if (FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create( RangeRow.PROPERTY_RANGE, ranges.get(j), - RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), + RangeRow.PROPERTY_COMMAND_NUMBER, "FX-" + RandomStringUtils.randomNumeric(4), RangeRow.PROPERTY_PRODUCT_QUANTITY, 50, RangeRow.PROPERTY_SAV_QUANTITY, 60); rangeRows.add(rangeRow); @@ -314,6 +314,7 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes getEmailService().saveEmail(email, user, Email.PROPERTY_DEMAND_TYPE, Email.PROPERTY_PRIORITY, Email.PROPERTY_RANGE_ROW); } + // create another test mail one month ago in archived state Calendar cal = Calendar.getInstance(); cal.add(Calendar.DAY_OF_MONTH, -1); Date yesterday = cal.getTime(); @@ -334,18 +335,20 @@ public class InitTestDataImpl extends FaxToMailServiceSupport implements InitTes + client.getName() + " / " + faxNumber + " / " + dateDecorator.toString(yesterday), Email.PROPERTY_RECEPTION_DATE, yesterday, Email.PROPERTY_MAIL_FOLDER, folder, - Email.PROPERTY_DEMAND_STATUS, opened ? DemandStatus.IN_PROGRESS : DemandStatus.UNTREATED, + Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED, Email.PROPERTY_HISTORY, Lists.newArrayList(history), Email.PROPERTY_ORIGINAL_EMAIL, originalEmail); if (opened) { - getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); + List<RangeRow> rangeRows = new ArrayList<>(); + getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, yesterday); DemandType demandType = types.get(0); // types.get(0) à des gammes obligatoires if (FaxToMailServiceUtils.contains(demandType.getRequiredFields(), MailField.RANGE_ROW)) { for (int j = 0; j < 4; j++) { RangeRow rangeRow = rangeRowDao.create(RangeRow.PROPERTY_RANGE, ranges.get(j), - RangeRow.PROPERTY_COMMAND_NUMBER, RandomStringUtils.randomNumeric(6), RangeRow.PROPERTY_PRODUCT_QUANTITY, - 50, RangeRow.PROPERTY_SAV_QUANTITY, 60); + RangeRow.PROPERTY_COMMAND_NUMBER, "FXRR-" + RandomStringUtils.randomNumeric(4), + RangeRow.PROPERTY_PRODUCT_QUANTITY, 50, + RangeRow.PROPERTY_SAV_QUANTITY, 60); rangeRows.add(rangeRow); } email.setRangeRow(rangeRows); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.