Author: echatellier Date: 2014-08-22 16:07:53 +0200 (Fri, 22 Aug 2014) New Revision: 587 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/587 Log: refs #5649: Ajout d'un test unitaire Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-08-22 14:07:53 UTC (rev 587) @@ -27,6 +27,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -427,12 +428,13 @@ "INNER JOIN email." + Email.PROPERTY_RANGE_ROW + " AS rangeRow " + "INNER JOIN rangeRow." + RangeRow.PROPERTY_RANGE + " AS range " + "WHERE email." + Email.PROPERTY_MAIL_FOLDER + " IN :folders " + - "GROUP BY range"; + "GROUP BY range " + + "ORDER BY range.label"; Map<String, Object> args = new HashMap<>(); args.put("folders", folders); - Map<Range, Long[]> result = new HashMap<>(); + Map<Range, Long[]> result = new LinkedHashMap<>(); List<Object[]> queryResuts = findAll(query, args); for (Object[] queryResut : queryResuts) { Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-22 14:07:53 UTC (rev 587) @@ -594,8 +594,10 @@ List<MailFolder> folders = new ArrayList<>(); folders.add(folder); Collection<MailFolder> children = folder.getChildren(); - for (MailFolder child : children) { - folders.addAll(getChildrenRecursively(child)); + if (children != null) { + for (MailFolder child : children) { + folders.addAll(getChildrenRecursively(child)); + } } return folders; } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-22 14:07:53 UTC (rev 587) @@ -28,6 +28,8 @@ 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; import org.junit.Assert; @@ -43,6 +45,7 @@ import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.Range; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; @@ -173,4 +176,24 @@ service.importArchive(is, attachmentBase); } } + + /** + * Test le la fonction de calcul des quantités par gammes qui fesait une erreur de groupBy en + * 1.0.0-rc-3. + */ + @Test + public void testComputeQuantititesByRange() { + MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); + MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); + + Map<Range, Long[]> quantitiesByRange = service.computeQuantitiesByRange(cyril); + Assert.assertEquals(4, quantitiesByRange.size()); + + // recupere la premiere lignes + Entry<Range, Long[]> entry = quantitiesByRange.entrySet().iterator().next(); + Assert.assertEquals("Bas de gamme", entry.getKey().getLabel()); + Assert.assertEquals(500, entry.getValue()[0].longValue()); + Assert.assertEquals(600, entry.getValue()[1].longValue()); + // NPE : Assert.assertEquals(600, entry.getValue()[2].longValue()); + } } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-08-22 13:33:51 UTC (rev 586) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/InitTestDataImpl.java 2014-08-22 14:07:53 UTC (rev 587) @@ -32,6 +32,7 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -212,6 +213,9 @@ List<DemandType> types = null; try (InputStream is = InitTestDataImpl.class.getResourceAsStream("/csv/demandtypes.csv")) { types = referentielService.importDemandTypes(is); + + // ajoute le champ GAMME en champ obligatoire pour tester les quantités par gammes + types.get(0).setRequiredFields(EnumSet.of(MailField.CLIENT, MailField.RANGE_ROW)); } try (InputStream is = InitTestDataImpl.class.getResourceAsStream("/csv/email_filters.csv")) { referentielService.importEmailFilters(is, foldersByName); @@ -271,7 +275,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); - DemandType demandType = types.get(0); + 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), @@ -309,7 +313,7 @@ if (opened) { getEmailService().addToHistory(email.getTopiaId(), HistoryType.OPENING, user, now); - DemandType demandType = types.get(0); + 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),