branch feature/1233 updated (d54b68d -> 47e387f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1233 in repository lima. See http://git.chorem.org/lima.git from d54b68d refs #1233 : test du service des transaction + correction et amélioration du code new 47e387f refs #1233 : test du service des exercices 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 47e387f493ad938392ecda3e33718500ef8b693b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 3 11:05:30 2015 +0200 refs #1233 : test du service des exercices Summary of changes: .../lima/business/api/FiscalPeriodService.java | 12 -- .../lima/business/ejb/ExportServiceImpl.java | 2 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 34 ++-- .../lima/business/ejb/ImportServiceImpl.java | 2 +- .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 --- .../FinancialTransactionServiceImplTest.java | 1 - .../lima/business/FiscalPeriodServiceImplTest.java | 220 ++++++++++++++++++--- 7 files changed, 207 insertions(+), 88 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1233 in repository lima. See http://git.chorem.org/lima.git commit 47e387f493ad938392ecda3e33718500ef8b693b Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 3 11:05:30 2015 +0200 refs #1233 : test du service des exercices --- .../lima/business/api/FiscalPeriodService.java | 12 -- .../lima/business/ejb/ExportServiceImpl.java | 2 +- .../lima/business/ejb/FiscalPeriodServiceImpl.java | 34 ++-- .../lima/business/ejb/ImportServiceImpl.java | 2 +- .../chorem/lima/entity/FiscalPeriodTopiaDao.java | 24 --- .../FinancialTransactionServiceImplTest.java | 1 - .../lima/business/FiscalPeriodServiceImplTest.java | 220 ++++++++++++++++++--- 7 files changed, 207 insertions(+), 88 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java index e32e19c..3cf5fff 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FiscalPeriodService.java @@ -61,12 +61,6 @@ public interface FiscalPeriodService { /** * - * @return all fiscal periods ordered by date - */ - List<FiscalPeriod> getAllFiscalPeriodsByDate(); - - /** - * * @return all locked fiscal periods */ List<FiscalPeriod> getAllBlockedFiscalPeriods(); @@ -79,12 +73,6 @@ public interface FiscalPeriodService { /** * - * @return all locked fiscal periods ordered by date - */ - List<FiscalPeriod> getAllUnblockedFiscalPeriodsByBeginDate(); - - /** - * * @return last fiscal period */ FiscalPeriod getLastFiscalPeriod(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java index d9ac625..066d259 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java @@ -148,7 +148,7 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ ImportExportResults results = new ImportExportResults(); ExportResult exportResult = results.createAddAndGetExportResult(FiscalPeriod.class); - List<FiscalPeriod> entities = fiscalPeriodService.getAllFiscalPeriodsByDate(); + List<FiscalPeriod> entities = fiscalPeriodService.getAllFiscalPeriods(); if (entities != null && !entities.isEmpty()) { FiscalPeriodModel model = new FiscalPeriodModel(); try { diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java index 575f972..78c2c3a 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java @@ -171,16 +171,10 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc public List<FiscalPeriod> getAllFiscalPeriods() { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - List<FiscalPeriod> result = fiscalPeriodTopiaDao.findAll(); - - return result; - } - - @Override - public List<FiscalPeriod> getAllFiscalPeriodsByDate() { - - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - List<FiscalPeriod> result = fiscalPeriodTopiaDao.getAllByDate(); + List<FiscalPeriod> result = fiscalPeriodTopiaDao + .forAll() + .setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE) + .findAll(); return result; } @@ -192,7 +186,10 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc public List<FiscalPeriod> getAllBlockedFiscalPeriods() { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - List<FiscalPeriod> result = fiscalPeriodTopiaDao.forLockedEquals(true).findAll(); + List<FiscalPeriod> result = fiscalPeriodTopiaDao + .forLockedEquals(true) + .setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE) + .findAll(); return result; } @@ -203,25 +200,20 @@ public class FiscalPeriodServiceImpl extends AbstractLimaService implements Fisc public List<FiscalPeriod> getAllUnblockedFiscalPeriods() { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - List<FiscalPeriod> result = fiscalPeriodTopiaDao.forLockedEquals(false).findAll(); + List<FiscalPeriod> result = fiscalPeriodTopiaDao + .forLockedEquals(false) + .setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE) + .findAll(); return result; } @Override - public List<FiscalPeriod> getAllUnblockedFiscalPeriodsByBeginDate() { - - FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); - List<FiscalPeriod> result = fiscalPeriodTopiaDao.forLockedEquals(false).setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE).findAll(); - return result; - } - - @Override public FiscalPeriod getLastFiscalPeriod() { FiscalPeriodTopiaDao fiscalPeriodTopiaDao = getDaoHelper().getFiscalPeriodDao(); //get the last fiscal period - FiscalPeriod result = fiscalPeriodTopiaDao.getLastFiscalPeriod(); + FiscalPeriod result = fiscalPeriodTopiaDao.forAll().setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE + " DESC").findFirstOrNull(); return result; } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index 95bf43f..b0d92fb 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -938,7 +938,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ result.addException(new NoDataToImportException()); } else { // Get all the valid fiscalPeriods Ordered by date. - List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriodsByBeginDate(); + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); try { basicEntriesFromEBPValidation(contents, fiscalPeriods); } catch (NoFiscalPeriodFoundException | NoDataToImportException e) { diff --git a/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java index f25a498..25777aa 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/FiscalPeriodTopiaDao.java @@ -22,8 +22,6 @@ package org.chorem.lima.entity; -import java.util.List; - /** * Fiscal period entity DAO. * @@ -36,19 +34,6 @@ import java.util.List; public class FiscalPeriodTopiaDao extends AbstractFiscalPeriodTopiaDao<FiscalPeriod> { /** - * Find fiscal period by financial period. - * - * @param financialPeriod financial period - * @return fiscal period containing financial period - */ - public FiscalPeriod findByFinancialPeriod(FinancialPeriod financialPeriod) { - - FiscalPeriod result = forFinancialPeriodContains(financialPeriod).findUniqueOrNull(); - - return result; - } - - /** * Get last fiscal period (higher end date). * * @return last fiscal period @@ -88,13 +73,4 @@ public class FiscalPeriodTopiaDao extends AbstractFiscalPeriodTopiaDao<FiscalPer return result; } - - public List<FiscalPeriod> getAllByDate() { - - List<FiscalPeriod> result = newQueryBuilder() - .setOrderByArguments(FiscalPeriod.PROPERTY_BEGIN_DATE) - .findAll(); - - return result; - } } diff --git a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java index 4f56111..0ce6097 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceImplTest.java @@ -66,7 +66,6 @@ public class FinancialTransactionServiceImplTest extends AbstractLimaTest { createAccounts(); createEntryBooks(); createFiscalPeriod(); - createFinancialTransaction(); } @Test diff --git a/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java b/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java index 162d74e..721f76e 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java @@ -24,9 +24,19 @@ package org.chorem.lima.business; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.AfterClass; +import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; +import org.chorem.lima.business.exceptions.MoreOneUnlockFiscalPeriodException; +import org.chorem.lima.business.exceptions.NotBeginNextDayOfLastFiscalPeriodException; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.util.DateUtil; + +import java.util.Date; +import java.util.List; /** * Tests pour la gestion des périodes @@ -47,23 +57,191 @@ public class FiscalPeriodServiceImplTest extends AbstractLimaTest { @Before public void initTest() throws Exception { + createAccounts(); + createEntryBooks(); } - /** - * On nettoie la base de données - * - * @throws Exception - */ - @AfterClass - public static void tearDownClass() throws Exception { - /*Date d = new Date(110,0,1); - PeriodDTO periodDTO = instance.searchPeriodDTOWithDate(d); - instance.removePeriod(periodDTO); - d = new Date(109,0,1); - periodDTO = instance.searchPeriodDTOWithDate(d); - instance.removePeriod(periodDTO);*/ + @Test + public void createPeriod12MonthsTest() throws Exception { + + FiscalPeriod period = new FiscalPeriodImpl(); + Date bedingDate = DateUtil.createDate(01, 01, 2012); + period.setBeginDate(bedingDate); + Date endDate = DateUtil.createDate(31, 12, 2012); + period.setEndDate(endDate); + + FiscalPeriod periodSave = fiscalPeriodService.createFiscalPeriod(period); + + Assert.assertEquals(true, periodSave.isPersisted()); + Assert.assertEquals(bedingDate, periodSave.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(endDate), periodSave.getEndDate()); + List<FiscalPeriod> allFiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + Assert.assertEquals(1, allFiscalPeriods.size()); + Assert.assertEquals(periodSave, allFiscalPeriods.get(0)); + + List<FinancialPeriod> financialPeriods = financialPeriodService.getAllFinancialPeriods(); + Assert.assertEquals(12, financialPeriods.size()); + Assert.assertEquals(DateUtil.createDate(01, 01, 2012), financialPeriods.get(0).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 01, 2012)), financialPeriods.get(0).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 02, 2012), financialPeriods.get(1).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(29, 02, 2012)), financialPeriods.get(1).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 03, 2012), financialPeriods.get(2).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 03, 2012)), financialPeriods.get(2).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 04, 2012), financialPeriods.get(3).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(30, 04, 2012)), financialPeriods.get(3).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 05, 2012), financialPeriods.get(4).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 05, 2012)), financialPeriods.get(4).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 06, 2012), financialPeriods.get(5).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(30, 06, 2012)), financialPeriods.get(5).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 07, 2012), financialPeriods.get(6).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 07, 2012)), financialPeriods.get(6).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 8, 2012), financialPeriods.get(7).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 8, 2012)), financialPeriods.get(7).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 9, 2012), financialPeriods.get(8).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(30, 9, 2012)), financialPeriods.get(8).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 10, 2012), financialPeriods.get(9).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 10, 2012)), financialPeriods.get(9).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 11, 2012), financialPeriods.get(10).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(30, 11, 2012)), financialPeriods.get(10).getEndDate()); + Assert.assertEquals(DateUtil.createDate(01, 12, 2012), financialPeriods.get(11).getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(DateUtil.createDate(31, 12, 2012)), financialPeriods.get(11).getEndDate()); + + } + + @Test + public void createPeriod6MonthsTest() throws Exception { + + FiscalPeriod period = new FiscalPeriodImpl(); + Date bedingDate = DateUtil.createDate(01, 01, 2012); + period.setBeginDate(bedingDate); + Date endDate = DateUtil.createDate(31, 06, 2012); + period.setEndDate(endDate); + + FiscalPeriod periodSave = fiscalPeriodService.createFiscalPeriod(period); + + Assert.assertEquals(true, periodSave.isPersisted()); + Assert.assertEquals(bedingDate, periodSave.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(endDate), periodSave.getEndDate()); + List<FiscalPeriod> allFiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + Assert.assertEquals(1, allFiscalPeriods.size()); + Assert.assertEquals(periodSave, allFiscalPeriods.get(0)); + } + @Test + public void createPeriod24MonthsTest() throws Exception { + + FiscalPeriod period = new FiscalPeriodImpl(); + Date bedingDate = DateUtil.createDate(01, 01, 2012); + period.setBeginDate(bedingDate); + Date endDate = DateUtil.createDate(31, 12, 2013); + period.setEndDate(endDate); + + FiscalPeriod periodSave = fiscalPeriodService.createFiscalPeriod(period); + + Assert.assertEquals(true, periodSave.isPersisted()); + Assert.assertEquals(bedingDate, periodSave.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(endDate), periodSave.getEndDate()); + List<FiscalPeriod> allFiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + Assert.assertEquals(1, allFiscalPeriods.size()); + Assert.assertEquals(periodSave, allFiscalPeriods.get(0)); + + } + + + + @Test(expected = BeginAfterEndFiscalPeriodException.class) + public void createPeriodFailBeginAfterEndFiscalPeriodTest() throws Exception { + + FiscalPeriod period = new FiscalPeriodImpl(); + Date bedingDate = DateUtil.createDate(31, 12, 2012); + period.setBeginDate(bedingDate); + Date endDate = DateUtil.createDate(01, 01, 2012); + period.setEndDate(endDate); + + fiscalPeriodService.createFiscalPeriod(period); + } + + + + @Test + public void createPeriodSecondTest() throws Exception { + + FiscalPeriod period1 = new FiscalPeriodImpl(); + Date bedingDate1 = DateUtil.createDate(01, 01, 2012); + period1.setBeginDate(bedingDate1); + Date endDate1 = DateUtil.createDate(31, 12, 2012); + period1.setEndDate(endDate1); + + FiscalPeriod periodSave1 = fiscalPeriodService.createFiscalPeriod(period1); + + FiscalPeriod period2 = new FiscalPeriodImpl(); + Date bedingDate2 = DateUtil.createDate(01, 01, 2013); + period2.setBeginDate(bedingDate2); + Date endDate2 = DateUtil.createDate(31, 12, 2013); + period2.setEndDate(endDate2); + + FiscalPeriod periodSave2 = fiscalPeriodService.createFiscalPeriod(period2); + + + Assert.assertEquals(true, periodSave2.isPersisted()); + Assert.assertEquals(bedingDate2, periodSave2.getBeginDate()); + Assert.assertEquals(DateUtil.getEndOfDay(endDate2), periodSave2.getEndDate()); + List<FiscalPeriod> allFiscalPeriods = fiscalPeriodService.getAllFiscalPeriods(); + Assert.assertEquals(2, allFiscalPeriods.size()); + Assert.assertEquals(periodSave2, allFiscalPeriods.get(1)); + + } + + @Test(expected = NotBeginNextDayOfLastFiscalPeriodException.class) + public void createPeriodSecondFailNotBeginNextDayOfLastFiscalPeriodTest() throws Exception { + + FiscalPeriod period1 = new FiscalPeriodImpl(); + Date bedingDate1 = DateUtil.createDate(01, 01, 2012); + period1.setBeginDate(bedingDate1); + Date endDate1 = DateUtil.createDate(31, 12, 2012); + period1.setEndDate(endDate1); + + fiscalPeriodService.createFiscalPeriod(period1); + + FiscalPeriod period2 = new FiscalPeriodImpl(); + Date bedingDate2 = DateUtil.createDate(01, 02, 2013); + period2.setBeginDate(bedingDate2); + Date endDate2 = DateUtil.createDate(31, 12, 2013); + period2.setEndDate(endDate2); + + fiscalPeriodService.createFiscalPeriod(period2); + + } + + @Test(expected = MoreOneUnlockFiscalPeriodException.class) + public void createPeriodSecondFailMoreOneUnlockFiscalPeriodTest() throws Exception { + + FiscalPeriod period1 = new FiscalPeriodImpl(); + Date bedingDate1 = DateUtil.createDate(01, 01, 2012); + period1.setBeginDate(bedingDate1); + Date endDate1 = DateUtil.createDate(31, 12, 2012); + period1.setEndDate(endDate1); + + fiscalPeriodService.createFiscalPeriod(period1); + + FiscalPeriod period2 = new FiscalPeriodImpl(); + Date bedingDate2 = DateUtil.createDate(01, 01, 2013); + period2.setBeginDate(bedingDate2); + Date endDate2 = DateUtil.createDate(31, 12, 2013); + period2.setEndDate(endDate2); + + fiscalPeriodService.createFiscalPeriod(period2); + + FiscalPeriod period3 = new FiscalPeriodImpl(); + Date bedingDate3 = DateUtil.createDate(01, 01, 2014); + period3.setBeginDate(bedingDate3); + Date endDate3 = DateUtil.createDate(31, 12, 2014); + period3.setEndDate(endDate3); + + fiscalPeriodService.createFiscalPeriod(period3); + + } @Test public void blockFiscalPeriodTest() throws Exception { @@ -133,20 +311,6 @@ public class FiscalPeriodServiceImplTest extends AbstractLimaTest { }*/ } - - /** Permet de tester l'ajout d'une période. */ - @Test - public void createPeriodTest() { - /*String result; - // debut 1 janvier 2009 - Date beginPeriod = new Date(109, 0, 1); - // fin 31 décembre 2009 - Date endPeriod = new Date(109, 11, 31); - // Création période avec son découpage sur 12 mois - result = instance.createPeriod(beginPeriod, endPeriod, false); - Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS, result);*/ - } - /** * Permet de tester si différentes périodes sont correctes ou non * La création d'une nouvelle période doit remplir ce contrat. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm