Author: vsalaun Date: 2011-08-08 11:12:40 +0200 (Mon, 08 Aug 2011) New Revision: 3251 Url: http://chorem.org/repositories/revision/lima/3251 Log: #424 starts adding some tests Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2011-08-05 12:09:49 UTC (rev 3250) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2011-08-08 09:12:40 UTC (rev 3251) @@ -52,7 +52,7 @@ @Test public void createAccountTest() throws LimaException { Account myAccount = new AccountImpl(); - myAccount.setAccountNumber("2"); + myAccount.setAccountNumber("4"); instance.createAccount(null, myAccount); } @@ -85,23 +85,38 @@ * enfants. */ @Test - public void createAccountDTOTest() { + public void createAccountDAOTest() { /*String result; // Création des comptes DTO - AccountDTO accountDTO = new AccountDTO("","5","COMPTES FINANCIERS","0",null,"actif"); - AccountDTO accountChildDTO = new AccountDTO("","50","Valeurs mobilières de placement","5",null,"actif"); - accountDTO.addAccountChild(accountChildDTO); - accountChildDTO = new AccountDTO("","51","Banques établissements financiers et assimilés","5",null,"actif"); - accountDTO.addAccountChild(accountChildDTO); - AccountDTO accountChilChilddDTO = new AccountDTO("","511","Valeurs à l'encaissement","51",null,"actif"); - accountChildDTO.addAccountChild(accountChilChilddDTO); - accountChilChilddDTO = new AccountDTO("","512","Banques","51",null,"actif"); - accountChildDTO.addAccountChild(accountChilChilddDTO); - // Pour afficher les comptes enfants - //accountDTO.toStringAccountChild(); - - // Création dans la base de données. Les comptes 5, 50, 51, 511 et 512 sont créés. - result = instance.createAccount(accountDTO); + Account account = new AccountImpl(); + account.setAccountNumber("5"); + account.setLabel("COMPTES FINANCIERS"); + result = instance.createAccount(null, account); + + Account accountChild1 = new AccountImpl(); + accountChild1.setAccountNumber("50"); + accountChild1.setLabel("Valeurs mobilières de placement"); + //accountChild1.setMasterAccount(account); + result = instance.createAccount(account, accountChild1); + + Account accountChild2 = new AccountImpl(); + accountChild2.setAccountNumber("51"); + accountChild2.setLabel("Banques établissements financiers et assimilés"); + //accountChild2.setMasterAccount(account); + result = instance.createAccount(account, accountChild2); + + Account accountChildChild1 = new AccountImpl(); + accountChildChild1.setAccountNumber("511"); + accountChildChild1.setLabel("Valeurs à l'encaissement"); + //accountChildChild1.setMasterAccount(accountChild2); + result = instance.createAccount(accountChild2, accountChildChild1); + + Account accountChildChild2 = new AccountImpl(); + accountChildChild2.setAccountNumber("51"); + accountChildChild2.setLabel("Banques"); + //accountChildChild2.setMasterAccount(accountChild2); + result = instance.createAccount(accountChild2, accountChildChild2); + Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS,result);*/ } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2011-08-05 12:09:49 UTC (rev 3250) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2011-08-08 09:12:40 UTC (rev 3251) @@ -25,12 +25,16 @@ package org.chorem.lima.business; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ejb.EntryBookServiceImpl; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryBookImpl; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -54,16 +58,16 @@ */ @AfterClass public static void tearDownClass() throws Exception { - /*List<JournalDTO> list = instance.getAllJournal(); + List<EntryBook> list = instance.getAllEntryBooks(); // On supprime chaque journal - for (JournalDTO journalDTO : list) { - instance.removeJournal(journalDTO); - }*/ + for (EntryBook entryBook : list) { + instance.removeEntryBook(entryBook); + } } @Before public void setUp() { - //instance = new EntryBookServiceImpl(); + instance = new EntryBookServiceImpl(); } public EntryBookServiceImplTest() { @@ -71,22 +75,26 @@ /** * Permet de tester l'ajout d'un journal dans la base de données. + * @throws LimaException */ @Test - public void createJournalTest() { - /*String result = instance.createJournal("Journal des ventes", "jdv", - "description"); - Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS, result);*/ + public void createJournalTest() throws LimaException { + EntryBook entryBook = new EntryBookImpl(); + entryBook.setLabel("Journal des ventes"); + entryBook.setCode("jdv"); + boolean result = instance.createEntryBook(entryBook); + Assert.assertTrue(result); } /** * Permet de tester la recherche d'un journal suivant son préfixe. + * @throws LimaException */ @Test - public void searchJournalWithLabelTest() { - /*Journal result = instance.searchJournalWithLabel("Journal des ventes"); - Assert.assertEquals("Journal des ventes", result.getLabel()); - result = instance.searchJournalWithLabel("Journal des achats"); + public void searchJournalWithLabelTest() throws LimaException { + List<EntryBook> result = instance.getAllEntryByProperty(EntryBook.LABEL, "Journal des ventes"); + Assert.assertEquals("Journal des ventes", result.get(0).getLabel()); + /*result = instance.searchJournalWithLabel("Journal des achats"); Assert.assertEquals("Journal des achats", result.getLabel());*/ } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java 2011-08-05 12:09:49 UTC (rev 3250) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java 2011-08-08 09:12:40 UTC (rev 3251) @@ -32,8 +32,11 @@ import org.chorem.lima.business.ejb.FinancialPeriodServiceImpl; import org.chorem.lima.business.ejb.FinancialTransactionServiceImpl; import org.chorem.lima.business.ejb.FiscalPeriodServiceImpl; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryBookImpl; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; /** @@ -46,48 +49,72 @@ private static final Log log = LogFactory.getLog(FinancialTransactionServiceImpl.class); private static FinancialTransactionServiceImpl instanceTransaction; - private static FiscalPeriodServiceImpl instancePeriod; - private static FinancialPeriodServiceImpl instanceTimespan; + private static FiscalPeriodServiceImpl instanceFiscalPeriod; + private static FinancialPeriodServiceImpl instanceFinancialPeriod; private static EntryBookServiceImpl instanceJournal; private static AccountServiceImpl instanceAccount; private static String topiaIDTransaction; @Before public void setUp() { - /* instanceTransaction = new FinancialTransactionServiceImpl(); - instancePeriod = new FiscalPeriodServiceImpl(); - instanceTimespan = new FinancialPeriodServiceImpl(); + instanceTransaction = new FinancialTransactionServiceImpl(); + instanceFiscalPeriod = new FiscalPeriodServiceImpl(); + instanceFinancialPeriod = new FinancialPeriodServiceImpl(); instanceJournal = new EntryBookServiceImpl(); - instanceAccount = new AccountServiceImpl();*/ + instanceAccount = new AccountServiceImpl(); } /** * Permet de tester l'ajout d'un timspan + * @throws LimaException */ @Test - public void generate () + public void generate () throws LimaException { - /* + // Création Journal - instanceJournal.createJournal("Journal des ventes", "jv","description"); - instanceJournal.createJournal("Journal des achats", "ja","description"); - instanceJournal.createJournal("Journal de trésorerie", "jt","description"); - instanceJournal.createJournal("Journal des opérations diverses", "OD","description"); - instanceJournal.createJournal("Journal de banque 1", "jb1","description"); - instanceJournal.createJournal("Journal de banque 2", "jb2","description"); + EntryBook entryBook1 = new EntryBookImpl(); + entryBook1.setLabel("Journal des ventes"); + entryBook1.setCode("jv"); + instanceJournal.createEntryBook(entryBook1); + EntryBook entryBook2 = new EntryBookImpl(); + entryBook2.setLabel("Journal des achats"); + entryBook2.setCode("ja"); + instanceJournal.createEntryBook(entryBook2); + EntryBook entryBook3 = new EntryBookImpl(); + entryBook3.setLabel("Journal de trésorerie"); + entryBook3.setCode("jt"); + instanceJournal.createEntryBook(entryBook3); + EntryBook entryBook4 = new EntryBookImpl(); + entryBook4.setLabel("Journal des opérations diverses"); + entryBook4.setCode("od"); + instanceJournal.createEntryBook(entryBook4); + EntryBook entryBook5 = new EntryBookImpl(); + entryBook5.setLabel("Journal de banque"); + entryBook5.setCode("jb"); + /*instanceJournal.createJournal("Journal de banque 2", "jb2","description"); instanceJournal.createJournal("Journal de banque 3", "jb3","description"); instanceJournal.createJournal("Journal de banque 4", "jb4","description"); instanceJournal.createJournal("Journal de banque 5", "jb5","description"); instanceJournal.createJournal("Journal de banque 6", "jb6","description"); instanceJournal.createJournal("Journal de banque 7", "jb7","description"); - instanceJournal.createJournal("Journal de banque 8", "jb8","description"); + instanceJournal.createJournal("Journal de banque 8", "jb8","description");*/ // Création account - instanceAccount.createAccount(1, "COMPTES DE CAPITAUX", null); - instanceAccount.createAccount(2, "COMPTES D'IMMOBILISATIONS", null); - instanceAccount.createAccount(3, "COMPTES DE STOCKS ET EN-COURS ", null); - instanceAccount.createAccount(4, "COMPTES DE TIERS ", null); + Account account1 = new AccountImpl(); + account1.setAccountNumber("1"); + account1.setLabel("COMPTES DE CAPITAUX"); + instanceAccount.createAccount(null, account1); + Account account2 = new AccountImpl(); + account2.setAccountNumber("2"); + account2.setLabel("COMPTES D'IMMOBILISATIONS"); + instanceAccount.createAccount(null, account2); + Account account3 = new AccountImpl(); + account3.setAccountNumber("3"); + account3.setLabel("COMPTES DE STOCKS ET EN-COURS"); + instanceAccount.createAccount(null, account3); + /*instanceAccount.createAccount(4, "COMPTES DE TIERS ", null); instanceAccount.createAccount(5, "COMPTES FINANCIERS", null); instanceAccount.createAccount(6, "COMPTES DE CHARGES", null); instanceAccount.createAccount(7, "COMPTES DE PRODUITS", null); @@ -108,28 +135,25 @@ instanceAccount.createAccount(20, "Immobilisations incorporelles", 2); instanceAccount.createAccount(201, "Frais d'établissement", 20); instanceAccount.createAccount(207, "Fonds commercial", 20); - instanceAccount.createAccount(21, "Immobilisations corporelles", 2); + instanceAccount.createAccount(21, "Immobilisations corporelles", 2);*/ - - - - Date beginTimeSpan; - Date endTimeSpan; + /*Date beginDate; + Date endDate; Date dateSearch; - for (int annee = 109 ; annee < 115 ; annee++) - { - beginTimeSpan = new Date(annee,0,1); - endTimeSpan = new Date(annee,11,31); - instancePeriod.createPeriod(beginTimeSpan, endTimeSpan, false); + for (int annee = 109 ; annee < 115 ; annee++) { + beginDate = new Date(annee,0,1); + endDate = new Date(annee,11,31); + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(beginDate); + fiscalPeriod.setEndDate(endDate); + instanceFiscalPeriod.createFiscalPeriod(fiscalPeriod); - for (int mois = 0 ; mois<11 ; mois++) - { + for (int mois = 0 ; mois<11 ; mois++) { dateSearch = new Date(annee,mois,1); - TimeSpan timespan = instanceTimespan.searchTimeSpanByDate(dateSearch); + TimeSpan timespan = instanceFiscalPeriod.searchTimeSpanByDate(dateSearch); - for (int j=0 ; j<50 ; j++) - { + for (int j=0 ; j<50 ; j++) { Journal journal = instanceJournal.searchJournalWithLabel("Journal des ventes"); topiaIDTransaction = instanceTransaction.createTransaction(dateSearch, "Facture 6", "description transaction", timespan, journal); @@ -145,8 +169,7 @@ Period period = instancePeriod.searchPeriodWithDate(beginTimeSpan); instancePeriod.blockAllTimeSpanOfPeriod(period); instancePeriod.blockPeriod(period); - } - */ + }*/ }