January 2012 - Lima-commits - mailman.cloud.codelutin.com

17 Jan '12

Author: echatellier Date: 2012-01-17 10:35:25 +0100 (Tue, 17 Jan 2012) New Revision: 3322 Url: http://chorem.org/repositories/revision/lima/3322 Log: #428 : Rethink tests (isolation and architecture) Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java trunk/lima-business/src/main/java/org/chorem/lima/service/ trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceLocal.java trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceMonitorable.java trunk/lima-business/src/test/resources/META-INF/ trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml trunk/lima-business/src/test/resources/lima-test.properties Removed: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_5_2.java trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/service/ Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml trunk/lima-business/src/main/resources/lima.properties trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 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/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java trunk/lima-callao/src/main/xmi/accounting.properties trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -107,6 +107,7 @@ } public void setAccountingRule(String accountingRule) { + accountingRules = null; // clear cache setOption(Option.RULES_NATIONALTY.key, accountingRule); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -54,10 +54,10 @@ public class FranceAccountingRules extends DefaultAccountingRules { - protected static final Log log = - LogFactory.getLog(DefaultAccountingRules.class); + protected static final Log log = LogFactory.getLog(FranceAccountingRules.class); /** Règles de vérification de la création du PCG, appliquées à la comptabilité française */ + @Override public void createAccountRules(Account masterAccount, Account account) throws LimaException { super.createAccountRules(masterAccount, account); @@ -80,8 +80,10 @@ account.getAccountNumber())); } + } + @Override public void updateAccountRules(Account masterAccount, Account account) throws LimaException { super.updateAccountRules(masterAccount, account); @@ -106,6 +108,7 @@ } /** Rules to check before create subledger */ + @Override public void createSubLedgerRules(Account masterAccount, Account account) throws LimaException { super.createSubLedgerRules(masterAccount, account); @@ -116,10 +119,6 @@ } } - public void updateSubLedgerRules(Account account) throws LimaException { - super.updateSubLedgerRules(account); - } - /** * Règles de vérification d'ouverture d'un exercice, appliquées à la comptabilité française * @@ -133,6 +132,7 @@ * Elle correspond à l'exercice comptable. * Pas plus de deux exercices fiscaux ne peuvent-être ouvert en même temps */ + @Override public List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { super.createFiscalPeriodRules(fiscalPeriod, transaction); List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); @@ -197,6 +197,7 @@ } /** Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française */ + @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { try { FiscalPeriodDAO fiscalPeriodDAO = @@ -219,7 +220,6 @@ } } - /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * @@ -231,6 +231,7 @@ * * compare there */ + @Override public void blockClosedPeriodicEntryBookRules(ClosedPeriodicEntryBook closedPeriodicEntryBook, TopiaContext topiaTransaction) throws LimaException { super.blockClosedPeriodicEntryBookRules( closedPeriodicEntryBook, topiaTransaction); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/AbstractLimaService.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,7 +40,7 @@ import static org.nuiton.i18n.I18n._; /** - * TODO add comment here. + * Abstract code for all ejb services (get context, catch, finally...). * * @author chatellier * @version $Revision$ @@ -48,12 +48,16 @@ public abstract class AbstractLimaService { /** Logger. */ - protected final Log log = LogFactory.getLog(getClass()); + protected static final Log log = LogFactory.getLog(AbstractLimaService.class); protected static TopiaContext acquireRootContext() { try { LimaConfig config = LimaConfig.getInstance(); Properties options = config.getFlatOptions(); + + if (log.isDebugEnabled()) { + log.debug("Opening context to database : " + options.getProperty("hibernate.connection.url")); + } return TopiaContextFactory.getContext(options); } catch (TopiaNotFoundException ex) { throw new TopiaRuntimeException("Could not acquire root context", ex); @@ -84,7 +88,7 @@ if (log.isErrorEnabled()) { log.error("Exception during query", cause); } - throw new LimaException(_("lima-business.common.queryerror"), cause); + throw new LimaException(_("lima-business.common.queryerror", cause.getMessage()), cause); } /** Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -192,4 +192,29 @@ } } + /* + * @see org.chorem.lima.business.ejbinterface.EntryBookService#getEntryBookByCode(java.lang.String) + */ + @Override + public EntryBook getEntryBookByCode(String code) throws LimaException { + TopiaContext transaction = beginTransaction(rootContext); + EntryBook entryBook = null; + + try { + + EntryBookDAO entryBookDAO = + LimaCallaoDAOHelper.getEntryBookDAO(transaction); + + // creation du EntryBook + entryBook = entryBookDAO.findByCode(code); + + commitTransaction(transaction); + } catch (Exception ex) { + doCatch(transaction, ex); + } finally { + doFinally(transaction); + } + + return entryBook; + } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -230,25 +230,40 @@ FinancialTransactionDAO financialTransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); - String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); - String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.PROPERTY_ENTRY_BOOK); + // SELECT DISTINCT T + // FROM org.chorem.lima.entity.FinancialTransaction T, org.chorem.lima.entity.FiscalPeriod F + // LEFT JOIN FETCH T.entry E LEFT JOIN FETCH E.account + // LEFT JOIN FETCH E.letter + // WHERE (T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null + // OR E.description = '') AND T.financialPeriod IN elements(F.financialPeriod) AND F = :F + // ORDER BY T.transactionDate, T.topiaCreateDate; - TopiaQuery query = financialTransactionDAO.createQuery("T"); + String financialPeriodProperty = TopiaQuery.getProperty("T", FinancialTransaction.PROPERTY_FINANCIAL_PERIOD); + String entryBookLabelProperty = TopiaQuery.getProperty("T", FinancialTransaction.PROPERTY_ENTRY_BOOK); query.addDistinct() .addOrder("T." + FinancialTransaction.PROPERTY_TRANSACTION_DATE) .addOrder("T." + FinancialTransaction.TOPIA_CREATE_DATE) .addFrom(FiscalPeriod.class, "F") .addLeftJoin("T." + FinancialTransaction.PROPERTY_ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") + .addWhere("(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) <> " + + "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T) OR " + + "(select sum(amount) from " + Entry.class.getName() + " where debit = true and financialTransaction = T) = null OR " + + "(select sum(amount) from " + Entry.class.getName() + " where debit = false and financialTransaction = T) = null OR " + + "E.account = null OR T.entryBook = null OR E.voucher = null " + + "OR E.voucher = '' OR E.description = null OR E.description = ''") .addInElements("T.financialPeriod", "F.financialPeriod") .addEquals("F", fiscalPeriod) - // load lazy + // load lazy .addFetch("E." + Entry.PROPERTY_ACCOUNT) .addFetch("E." + Entry.PROPERTY_LETTER) .addLoad(financialPeriodProperty) .addLoad(entryBookLabelProperty); + if (log.isDebugEnabled()) { + log.debug("Query = " + query.toString()); + } + result = financialTransactionDAO.findAllByQuery(query); for (FinancialTransaction fTransaction : result) { BigDecimal credit = fTransaction.getAmountCredit(); @@ -370,10 +385,6 @@ accountingRules.updateFinancialTransactionDateRules( financialtransaction, financialTransactionOld, topiaContext); - financialTransactionOld.setAmountDebit( - financialtransaction.getAmountDebit()); - financialTransactionOld.setAmountCredit( - financialtransaction.getAmountCredit()); financialTransactionOld.setEntryBook( financialtransaction.getEntryBook()); transactionDAO.update(financialTransactionOld); @@ -423,39 +434,6 @@ EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); newEntry = entryDAO.create(entry); - //get new entry amounts - BigDecimal entryAmount = entry.getAmount(); - Boolean entryAmountIsDebit = entry.getDebit(); - BigDecimal entryDebit = new BigDecimal(0), entryCredit = new BigDecimal(0); - if (entryAmountIsDebit) { - entryDebit = entryAmount; - } else { - entryCredit = entryAmount; - } - - //calculate financial transaction amounts - FinancialTransaction financialTransaction = - entry.getFinancialTransaction(); - - BigDecimal amountDebit = financialTransaction.getAmountDebit(); - if (amountDebit == null) { - amountDebit = new BigDecimal(0); - } - amountDebit = amountDebit.add(entryDebit); - financialTransaction.setAmountDebit(amountDebit); - - BigDecimal amountCredit = financialTransaction.getAmountCredit(); - if (amountCredit == null) { - amountCredit = new BigDecimal(0); - } - amountCredit = amountCredit.add(entryCredit); - financialTransaction.setAmountCredit(amountCredit); - - //update financial transaction - updateFinancialTransactionWithTransaction( - financialTransaction, topiaContext); - - } catch (TopiaException e) { doCatch(topiaContext, e); } @@ -505,23 +483,7 @@ //get new entry amounts BigDecimal entryAmount = entry.getAmount(); Boolean entryAmountIsDebit = entry.getDebit(); - BigDecimal entryDebit = new BigDecimal(0), entryCredit = new BigDecimal(0); - if (entryAmountIsDebit) { - entryDebit = entryAmount; - } else { - entryCredit = entryAmount; - } - //get old entry amounts - BigDecimal entryAmountOld = entryOld.getAmount(); - Boolean entryAmountOldIsDebit = entryOld.getDebit(); - BigDecimal entryDebitOld = new BigDecimal(0), entryCreditOld = new BigDecimal(0); - if (entryAmountOldIsDebit) { - entryDebitOld = entryAmountOld; - } else { - entryCreditOld = entryAmountOld; - } - //FIXME PEPIN 20100520 conflict object already instanciate // Exist best solution ? entryOld.setAccount(entry.getAccount()); @@ -533,24 +495,6 @@ entryOld.setPosition(entry.getPosition()); entryOld.setLetter(entry.getLetter()); - //calculate financial transaction amounts - FinancialTransaction financialTransaction = - entryOld.getFinancialTransaction(); - - BigDecimal amountDebit = financialTransaction.getAmountDebit(); - amountDebit = amountDebit.subtract(entryDebitOld); - amountDebit = amountDebit.add(entryDebit); - financialTransaction.setAmountDebit(amountDebit); - - BigDecimal amountCredit = financialTransaction.getAmountCredit(); - amountCredit = amountCredit.subtract(entryCreditOld); - amountCredit = amountCredit.add(entryCredit); - financialTransaction.setAmountCredit(amountCredit); - - //update financial transaction - updateFinancialTransactionWithTransaction( - financialTransaction, topiaContext); - //update entry entryDAO.update(entryOld); commitTransaction(topiaContext); @@ -572,31 +516,6 @@ accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( entry.getFinancialTransaction(), topiaContext); - //get entry amounts - BigDecimal entryAmount = entry.getAmount(); - Boolean entryAmountIsDebit = entry.getDebit(); - BigDecimal entryDebit = new BigDecimal(0), entryCredit = new BigDecimal(0); - if (entryAmountIsDebit) { - entryDebit = entryAmount; - } else { - entryCredit = entryAmount; - } - - //calculate financial transaction amounts - FinancialTransaction financialTransaction = - entry.getFinancialTransaction(); - BigDecimal amountDebit = financialTransaction.getAmountDebit(); - amountDebit = amountDebit.subtract(entryDebit); - financialTransaction.setAmountDebit(amountDebit); - - BigDecimal amountCredit = financialTransaction.getAmountCredit(); - amountCredit = amountCredit.subtract(entryCredit); - financialTransaction.setAmountCredit(amountCredit); - - //update financial transaction - updateFinancialTransactionWithTransaction( - financialTransaction, topiaContext); - EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); //delete entryDAO.delete(entry); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -407,8 +407,6 @@ FinancialTransaction endfinancialTransaction = new FinancialTransactionImpl(); if (lastFPeriod != null) { //Sets the endfinancialTransaction - endfinancialTransaction.setAmountDebit(BigDecimal.ZERO); - endfinancialTransaction.setAmountCredit(BigDecimal.ZERO); endfinancialTransaction.setEntryBook(entryBook); endfinancialTransaction.setFinancialPeriod(lastFPeriod); endfinancialTransaction.setTransactionDate(fiscalPeriod.getEndDate()); @@ -420,8 +418,6 @@ if (newyear) { if (found) { //Sets the endfinancialTransaction - beginfinancialTransaction.setAmountDebit(BigDecimal.ZERO); - beginfinancialTransaction.setAmountCredit(BigDecimal.ZERO); beginfinancialTransaction.setEntryBook(entryBook); beginfinancialTransaction.setFinancialPeriod(beginfinancialPeriod); beginfinancialTransaction.setTransactionDate(beginfinancialPeriod.getBeginDate()); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,7 +39,6 @@ import javax.ejb.EJB; import javax.ejb.Stateless; -import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -55,7 +54,6 @@ import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.hibernate.exception.GenericJDBCException; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -278,15 +278,6 @@ || !(date.equals(financialTransaction.getTransactionDate()) && entryBook.getCode().equals(financialTransaction.getEntryBook().getCode()))) { - // update previous financial transaction before create - // new - if (financialTransaction != null) { - //call methode to calculte amounts - financialTransaction.setAmounts(); - financialTransactionService - .updateFinancialTransactionWithTransaction( - financialTransaction, topiaContext); - } // create financial transaction financialTransaction = new FinancialTransactionImpl(); financialTransaction.setEntryBook(entryBook); @@ -307,13 +298,7 @@ result.append(_("lima-business.import.entryadded", entry.getDescription(), entry.getAmount())); } } - // update last financial transaction - if (financialTransaction != null) { - financialTransaction.setAmounts(); - financialTransactionService - .updateFinancialTransactionWithTransaction( - financialTransaction, topiaContext); - } + // commit commitTransaction(topiaContext); } catch (Exception eeeTE) { @@ -1352,10 +1337,7 @@ .parse(financialTransactionImport.getDate()); financialTransaction .setTransactionDate(dateFinancialTransaction); - financialTransaction.setAmountDebit(new BigDecimal( - financialTransactionImport.getAmountDebit())); - financialTransaction.setAmountCredit(new BigDecimal( - financialTransactionImport.getAmountCredit())); + EntryBook entryBook = entryBookDAO .findByCode(financialTransactionImport .getCodeEntryBook()); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -43,7 +43,7 @@ } public int getScale() { - if (scale.isEmpty()) { + if (scale == null || scale.isEmpty()) { return 2; } else { return Integer.valueOf(scale); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -181,15 +181,17 @@ String transactionDateProperty = TopiaQuery.getProperty( Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_TRANSACTION_DATE); - String amountCreditProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_CREDIT); - String amountDebitProperty = TopiaQuery.getProperty( - Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_DEBIT); + + // FIXME 20120110 echatellier amoutcredit and debit removed since 0.6 + //String amountCreditProperty = TopiaQuery.getProperty( + // Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_CREDIT); + //String amountDebitProperty = TopiaQuery.getProperty( + // Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_AMOUNT_DEBIT); String entryBookProperty = TopiaQuery.getProperty( Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_ENTRY_BOOK); query - .addWhere(amountCreditProperty + " = " + amountDebitProperty) + //.addWhere(amountCreditProperty + " = " + amountDebitProperty) .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") .addNotNull(entryBookProperty) .addParam("beginDate", beginDate) @@ -448,17 +450,19 @@ String transactionDateProperty = TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_TRANSACTION_DATE); - String amountCreditProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_AMOUNT_CREDIT); - String amountDebitProperty = - TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, - FinancialTransaction.PROPERTY_AMOUNT_DEBIT); + + // FIXME 20120110 echatellier amoutcredit and debit removed since 0.6 + //String amountCreditProperty = + // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, + // FinancialTransaction.PROPERTY_AMOUNT_CREDIT); + //String amountDebitProperty = + // TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, + // FinancialTransaction.PROPERTY_AMOUNT_DEBIT); String entryBookProperty = TopiaQuery.getProperty(Entry.PROPERTY_FINANCIAL_TRANSACTION, FinancialTransaction.PROPERTY_ENTRY_BOOK); query - .addWhere(amountCreditProperty + " = " + amountDebitProperty) + //.addWhere(amountCreditProperty + " = " + amountDebitProperty) .addEquals(entryBookProperty, entryBook) .addWhere(transactionDateProperty + " BETWEEN :beginDate AND :endDate") .addParam("beginDate", beginDate) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -44,6 +44,15 @@ public interface EntryBookService { /** + * Find entry book by code. + * + * @param code entry book code + * @return + * @throws LimaException + */ + EntryBook getEntryBookByCode(String code) throws LimaException; + + /** * Get all entry book. * * @return all entrybook Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -33,7 +33,7 @@ public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { protected static final Version VERSION_0_5 = new Version("0.5"); - protected static final Version VERSION_0_5_2 = new Version("0.5.2"); + protected static final Version VERSION_0_6 = new Version("0.6"); public DatabaseMigrationClass() { super(new MigrationResolver()); @@ -47,8 +47,8 @@ if (version.equals(VERSION_0_5)) { result = MigrationV0V0_5.class; - } else if (version.equals(VERSION_0_5_2)) { - result = MigrationV0_5_2.class; + } else if (version.equals(VERSION_0_6)) { + result = MigrationV0_6.class; } return result; } @@ -57,7 +57,7 @@ @Override public Version[] getAvailableVersions() { - Version[] result = new Version[]{VERSION_0_5, VERSION_0_5_2}; + Version[] result = new Version[]{VERSION_0_5, VERSION_0_6}; return result; } Deleted: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_5_2.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_5_2.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_5_2.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -1,114 +0,0 @@ -package org.chorem.lima.business.migration; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.AccountDAO; -import org.chorem.lima.entity.LimaCallaoDAOHelper; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.util.Version; - -import java.util.List; - -/** - * TODO - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.6 - */ -public class MigrationV0_5_2 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { - - /** Logger. */ - private static final Log log = LogFactory.getLog(MigrationV0_5_2.class); - - public MigrationV0_5_2(Version version, TopiaMigrationCallbackByClass callBack) { - super(version, callBack); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) - throws TopiaException { - - if (log.isInfoEnabled()) { - log.info("Migrates to version 0.5.2"); - } - - // find all account with no master account and attach them to a master - // if master does not exists let's create it also - AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(tx); - - List<Account> accounts = accountDAO.findAll(); - - for (Account account : accounts) { - - fillMasterAccountNumber(accountDAO, account); - } - } - - protected void fillMasterAccountNumber(AccountDAO accountDAO, Account account) throws TopiaException { - if (account.getMasterAccount() != null) { - - // have already a master account - return; - } - String accountNumber = account.getAccountNumber(); - - if (log.isInfoEnabled()) { - log.info("Account " + accountNumber + " does not have a masterAccount, will fill one."); - } - int length = accountNumber.length(); - if (length == 1) { - - // this is a master account, nothing to do - return; - } - String masterAccountNumber = null; - - if (length > 3) { - - // fill with master account with 3 digits - - masterAccountNumber = accountNumber.substring(0, 3); - } else if (length == 3) { - - // fill with master account with 2 digits - masterAccountNumber = accountNumber.substring(0, 2); - } else if (length == 2) { - - // fill with master account with 1 digits - masterAccountNumber = accountNumber.substring(0, 1); - } - - if (masterAccountNumber != null) { - - Account masterAccount = getMasterAccount(accountDAO, account, masterAccountNumber); - - if (log.isInfoEnabled()) { - log.info("Set masterAccount [" + masterAccountNumber + "] to account [" + accountNumber + "]"); - } - account.setMasterAccount(masterAccount); - - // let's fill master account - fillMasterAccountNumber(accountDAO, masterAccount); - } - } - - protected Account getMasterAccount(AccountDAO accountDAO, - Account subAccount, - String accountNumber) throws TopiaException { - Account masterAccount = - accountDAO.findByAccountNumber(accountNumber); - if (masterAccount == null) { - - // creates it - masterAccount = accountDAO.create(Account.PROPERTY_ACCOUNT_NUMBER, accountNumber); - } - masterAccount.addSubAccounts(subAccount); - return masterAccount; - } -} Copied: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java (from rev 3311, trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_5_2.java) =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,136 @@ +/* + * #%L + * Lima :: business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011, 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.migration; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountDAO; +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.util.Version; + +import java.util.List; + +/** + * Migration code from 0.5 to 0.6. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ +public class MigrationV0_6 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + /** Logger. */ + private static final Log log = LogFactory.getLog(MigrationV0_6.class); + + public MigrationV0_6(Version version, TopiaMigrationCallbackByClass callBack) { + super(version, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) + throws TopiaException { + + if (log.isInfoEnabled()) { + log.info("Migrates to version 0.6"); + } + + // find all account with no master account and attach them to a master + // if master does not exists let's create it also + AccountDAO accountDAO = LimaCallaoDAOHelper.getAccountDAO(tx); + List<Account> accounts = accountDAO.findAll(); + for (Account account : accounts) { + fillMasterAccountNumber(accountDAO, account); + } + + // delete computed fields + queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTDEBIT"); + queries.add("Alter table FINANCIALTRANSACTION drop column AMOUNTCREDIT"); + } + + protected void fillMasterAccountNumber(AccountDAO accountDAO, Account account) throws TopiaException { + if (account.getMasterAccount() != null) { + // have already a master account + return; + } + + String accountNumber = account.getAccountNumber(); + + if (log.isInfoEnabled()) { + log.info("Account " + accountNumber + " does not have a masterAccount, will fill one."); + } + int length = accountNumber.length(); + if (length == 1) { + + // this is a master account, nothing to do + return; + } + String masterAccountNumber = null; + + if (length > 3) { + // fill with master account with 3 digits + masterAccountNumber = accountNumber.substring(0, 3); + } else if (length == 3) { + // fill with master account with 2 digits + masterAccountNumber = accountNumber.substring(0, 2); + } else if (length == 2) { + // fill with master account with 1 digits + masterAccountNumber = accountNumber.substring(0, 1); + } + + if (masterAccountNumber != null) { + + Account masterAccount = getMasterAccount(accountDAO, account, masterAccountNumber); + + if (log.isInfoEnabled()) { + log.info("Set masterAccount [" + masterAccountNumber + "] to account [" + accountNumber + "]"); + } + account.setMasterAccount(masterAccount); + + // let's fill master account + fillMasterAccountNumber(accountDAO, masterAccount); + } + } + + protected Account getMasterAccount(AccountDAO accountDAO, + Account subAccount, + String accountNumber) throws TopiaException { + Account masterAccount = + accountDAO.findByAccountNumber(accountNumber); + if (masterAccount == null) { + + // creates it + masterAccount = accountDAO.create(Account.PROPERTY_ACCOUNT_NUMBER, accountNumber); + } + masterAccount.addSubAccounts(subAccount); + return masterAccount; + } +} Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2012-01-12 17:57:53 UTC (rev 3318) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -1,11 +1,11 @@ /* * #%L - * Lima Swing + * Lima business * * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,6 +25,18 @@ package org.chorem.lima.service; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,21 +44,10 @@ import org.apache.openejb.assembler.classic.AppInfo; import org.apache.openejb.assembler.classic.Assembler; import org.apache.openejb.loader.SystemInstance; -import org.chorem.lima.LimaMain; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.ServiceMonitorable; +import org.nuiton.util.ApplicationConfig; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - /** This class is a service factory based on embedded openejb container. */ public class LimaServiceFactory { @@ -62,10 +63,11 @@ protected static InitialContext ctx; /** Init openejb jndi context. */ - protected LimaServiceFactory() { + public static void initFactory(ApplicationConfig config) { // TODO EC-20100407 maybe put all options in LimaConfig and allow user to configure it (remove getFlatOptions use) - Properties props = LimaMain.config.getFlatOptions(); + // TODO EC-20120113 i don't understand this comment anymore :( + Properties props = config.getFlatOptions(); // transmission des options de logging a openejb // sinon, il utilise son propre pattern interne Deleted: trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2012-01-12 17:57:53 UTC (rev 3318) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -1,91 +0,0 @@ -/* - * #%L - * Lima Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.service; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.ServiceListener; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -public class ServiceMonitorableHandler implements InvocationHandler { - - private static final Log log = - LogFactory.getLog(ServiceMonitorableHandler.class); - - /** The proxied service. */ - private Object service; - - /** Listeners on the service. */ - private List<ServiceListener> listeners; - - public ServiceMonitorableHandler(Object service) { - this.service = service; - listeners = new ArrayList<ServiceListener>(); - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Object result = null; - if (method.getName().equals("addServiceListener")) { - addServiceListener((ServiceListener) args[0]); - } else if (method.getName().equals("removeServiceListener")) { - removeServiceListener((ServiceListener) args[0]); - } else { - try { - result = method.invoke(service, args); - } catch (InvocationTargetException eee) { - throw eee.getCause(); - } - notifyMethod(method); - } - return result; - } - - protected void addServiceListener(ServiceListener serviceListener) { - listeners.add(serviceListener); - } - - protected void removeServiceListener(ServiceListener serviceListener) { - listeners.remove(serviceListener); - } - - protected void notifyMethod(Method method) { - String methodName = method.getName(); - //TODO tchemit-2011-09-16 Could we have an explanation of this test ? - if (!methodName.startsWith("get")) { - for (ServiceListener serviceListener : listeners) { - serviceListener.notifyMethod(service.toString(), methodName); - log.debug("proxy : " + service.toString() + " " + methodName); - } - } - } - -} Copied: trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java (from rev 3321, trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java) =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,104 @@ +/* + * #%L + * Lima Swing + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.service; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.ServiceListener; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +/** + * This class surround a real service, but intercept addServiceListener + * and removeServiceListener that are not defined on delegated service + * object. + * + * All other call are forwarded on notified to registered listeners. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ServiceMonitorableHandler implements InvocationHandler { + + private static final Log log = + LogFactory.getLog(ServiceMonitorableHandler.class); + + /** The proxied service. */ + private Object service; + + /** Listeners on the service. */ + private List<ServiceListener> listeners; + + public ServiceMonitorableHandler(Object service) { + this.service = service; + listeners = new ArrayList<ServiceListener>(); + } + + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + Object result = null; + if (method.getName().equals("addServiceListener")) { + addServiceListener((ServiceListener) args[0]); + } else if (method.getName().equals("removeServiceListener")) { + removeServiceListener((ServiceListener) args[0]); + } else { + try { + result = method.invoke(service, args); + } catch (InvocationTargetException eee) { + throw eee.getCause(); + } + notifyMethod(method); + } + return result; + } + + protected void addServiceListener(ServiceListener serviceListener) { + listeners.add(serviceListener); + } + + protected void removeServiceListener(ServiceListener serviceListener) { + listeners.remove(serviceListener); + } + + protected void notifyMethod(Method method) { + String methodName = method.getName(); + + // get is removed to only notify write modification + if (!methodName.startsWith("get")) { + for (ServiceListener serviceListener : listeners) { + serviceListener.notifyMethod(service.toString(), methodName); + log.debug("proxy : " + service.toString() + " " + methodName); + } + } + } +} Added: trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,30 @@ +/* + * #%L + * Lima Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +/** + * This package defined factory to access for service definied on OpenEJB. + * + * This is a client side package but can be usefull for unit test too. + */ +package org.chorem.lima.service; Property changes on: trunk/lima-business/src/main/java/org/chorem/lima/service/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/resources/META-INF/ejb-jar.xml 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,6 +24,6 @@ -->  <ejb-jar/> Modified: trunk/lima-business/src/main/resources/lima.properties =================================================================== --- trunk/lima-business/src/main/resources/lima.properties 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/main/resources/lima.properties 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -22,27 +22,14 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#### tchemit-2011-08-11 : Default values are in the configuration class no need to put it here ... -#LIMA Defaults values -# main directory -#lima.dir=${user.home}/.lima -# http port for reports -#lima.httpport=5462 -# server address (optional for server behind proxy) -#lima.serveraddress= -# Local class for accounting rules -#lima.rules=org.chorem.lima.business.accountingrules.FranceAccountingRules -# directory for http server -#lima.report.dir=${lima.dir}/reports # Proprietes par defaut pour une base de donnees de type H2 +# FIXME echatellier remove this (currently active only for test, and creation) hibernate.hbm2ddl.auto=update #hibernate.show_sql=true -# tchemit-2011-08-11 Why db configuration is here ? hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${lima.data.dir}/limadb -#FIXME should be : hibernate.connection.url=jdbc:h2:file:${lima.dir}/limadb \ No newline at end of file Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -27,17 +27,34 @@ import java.io.IOException; import java.io.InputStream; import java.text.DateFormat; +import java.text.ParseException; import java.util.Locale; import java.util.Properties; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaConfig.Option; -import org.chorem.lima.business.accountingrules.DefaultAccountingRules; +import org.chorem.lima.business.accountingrules.TestAccountingRules; +import org.chorem.lima.business.ejb.ClearService; +import org.chorem.lima.business.ejb.ClearServiceMonitorable; +import org.chorem.lima.business.ejbinterface.AccountService; +import org.chorem.lima.business.ejbinterface.EntryBookService; +import org.chorem.lima.business.ejbinterface.FinancialPeriodService; +import org.chorem.lima.business.ejbinterface.FinancialTransactionService; +import org.chorem.lima.business.ejbinterface.FiscalPeriodService; +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.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.service.LimaServiceFactory; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; @@ -56,34 +73,76 @@ protected static DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); - @Before - public void setUpLocale() throws Exception { + protected static ClearService clearService; + protected static AccountService accountService; + protected static EntryBookService entryBookService; + protected static FinancialPeriodService financialPeriodService; + protected static FinancialTransactionService financialTransactionService; + protected static FiscalPeriodService fiscalPeriodService; + + /** + * This is a before class method, but junit will fail to run inherited + * BeforeClass methods if there is one. + * + * @throws Exception + */ + @BeforeClass + public static void initAbstractTest() throws Exception { + setUpLocale(); + setUpTestConfig(); + setUpDefaultRule(); + initServices(); + } + + protected static void setUpLocale() throws Exception { I18n.init(new ClassPathI18nInitializer(), Locale.UK); } /** + * Init services after i18n#init(). + * @throws IOException + */ + protected static void initServices() throws IOException { + clearService = LimaServiceFactory.getService(ClearServiceMonitorable.class); + accountService = LimaServiceFactory.getService(AccountServiceMonitorable.class); + entryBookService = LimaServiceFactory.getService(EntryBookServiceMonitorable.class); + financialPeriodService = LimaServiceFactory.getService(FinancialPeriodServiceMonitorable.class); + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionServiceMonitorable.class); + fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodServiceMonitorable.class); + } + + /** * Return a new instance of configuration defined on a new database at * each call. * * @return single test config */ - protected LimaConfig getTestConfiguration() { + protected static LimaConfig getTestConfiguration() { LimaConfig instance = new LimaConfig(); - + // do not call parse() method (don't read /etc...) // load file manually (lima.properties) Properties testProperties = new Properties(); - InputStream stream = AbstractLimaTest.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); + InputStream streamMain = null; + InputStream streamTest = null; try { - testProperties.load(stream); + streamMain = AbstractLimaTest.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); + testProperties.load(streamMain); + streamMain.close(); + + streamTest = AbstractLimaTest.class.getResourceAsStream("/lima-test.properties"); + testProperties.load(streamTest); + streamTest.close(); } catch (IOException ex) { throw new RuntimeException("Can't init test configuration", ex); + } finally { + IOUtils.closeQuietly(streamMain); + IOUtils.closeQuietly(streamTest); } // override somes - String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima" + File.separator; - testDir += "testdb" + System.currentTimeMillis(); + String testDir = System.getProperty("java.io.tmpdir") + File.separator + "limaopenejbdb"; testProperties.setProperty(Option.DATA_DIR.getKey(), testDir); testProperties.setProperty("hibernate.connection.url", "jdbc:h2:file:" + testDir + File.separator + "data"); //testProperties.setProperty("hibernate.hbm2ddl.auto", "update"); @@ -97,9 +156,9 @@ return instance; } - @Before - public void setUpTestConfig() throws Exception { + protected static void setUpTestConfig() throws Exception { LimaConfig.instance = getTestConfiguration(); + LimaServiceFactory.initFactory(LimaConfig.getInstance()); } @After @@ -115,9 +174,59 @@ * and france rule will be re-enabled for specifics tests. * @throws Exception */ - @Before - public void setUpDefaultRule() throws Exception { + protected static void setUpDefaultRule() throws Exception { LimaConfig config = LimaConfig.getInstance(); - config.setAccountingRule(DefaultAccountingRules.class.getName()); + config.setAccountingRule(TestAccountingRules.class.getName()); } + + /** + * Create a basic database with some objects to reuse then in subtests. + * + * @throws LimaException + * @throws ParseException + */ + @Before + public void initTestDatabase() throws LimaException, ParseException { + + // clear database + clearService.clearDatabase(); + + // creation d'un plan compatble de test + Account classFinancier = new AccountImpl(); + classFinancier.setAccountNumber("5"); + classFinancier.setLabel("Comptes financiers"); + accountService.createAccount(null, classFinancier); + + Account accountVmp = new AccountImpl(); + accountVmp.setAccountNumber("50"); + accountVmp.setLabel("Valeurs mobilières de placement"); + accountService.createAccount(classFinancier, accountVmp); + + Account accountBefa = new AccountImpl(); + accountBefa.setAccountNumber("51"); + accountBefa.setLabel("Banques établissements financiers et assimilés"); + accountService.createAccount(classFinancier, accountBefa); + + Account accountVmpVae = new AccountImpl(); + accountVmpVae.setAccountNumber("511"); + accountVmpVae.setLabel("Valeurs à l'encaissement"); + accountService.createAccount(accountBefa, accountVmpVae); + + Account accountBanques = new AccountImpl(); + accountBanques.setAccountNumber("512"); + accountBanques.setLabel("Banques"); + accountService.createAccount(accountBefa, accountBanques); + + // creation d'un journal + EntryBook entryBook = new EntryBookImpl(); + entryBook.setLabel("Journal des ventes"); + entryBook.setCode("jdv"); + entryBookService.createEntryBook(entryBook); + + // creation d'un exercice fiscal + FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); + fiscalPeriod.setBeginDate(df.parse("January 1, 2012")); + fiscalPeriod.setEndDate(df.parse("December 31, 2012")); + fiscalPeriodService.createFiscalPeriod(fiscalPeriod); + } } 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 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -27,12 +27,9 @@ import java.util.List; -import org.chorem.lima.business.ejb.AccountServiceImpl; -import org.chorem.lima.business.ejbinterface.AccountService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; /** @@ -47,37 +44,6 @@ */ public class AccountServiceImplTest extends AbstractLimaTest { - protected AccountService accountService = new AccountServiceImpl(); - - @Before - public void setUp() throws LimaException { - // creation des comptes - Account classFinancier = new AccountImpl(); - classFinancier.setAccountNumber("5"); - classFinancier.setLabel("Comptes financiers"); - accountService.createAccount(null, classFinancier); - - Account accountVmp = new AccountImpl(); - accountVmp.setAccountNumber("50"); - accountVmp.setLabel("Valeurs mobilières de placement"); - accountService.createAccount(classFinancier, accountVmp); - - Account accountBefa = new AccountImpl(); - accountBefa.setAccountNumber("51"); - accountBefa.setLabel("Banques établissements financiers et assimilés"); - accountService.createAccount(classFinancier, accountBefa); - - Account accountVmpVae = new AccountImpl(); - accountVmpVae.setAccountNumber("511"); - accountVmpVae.setLabel("Valeurs à l'encaissement"); - accountService.createAccount(accountBefa, accountVmpVae); - - Account accountBanques = new AccountImpl(); - accountBanques.setAccountNumber("512"); - accountBanques.setLabel("Banques"); - accountService.createAccount(accountBefa, accountBanques); - } - /** * Création d'un compte dans le plan comptable. * @throws LimaException 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 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -25,12 +25,11 @@ package org.chorem.lima.business; -import org.chorem.lima.business.ejb.EntryBookServiceImpl; -import org.chorem.lima.business.ejbinterface.EntryBookService; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; import org.junit.Assert; -import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** @@ -43,19 +42,8 @@ */ public class EntryBookServiceImplTest extends AbstractLimaTest { - protected static EntryBookService entryBookService = new EntryBookServiceImpl(); - protected static final String JOURNAL_DES_VENTES = "Journal des ventes"; - @Before - public void setUp() throws LimaException { - // create a entry book - EntryBook entryBook = new EntryBookImpl(); - entryBook.setLabel(JOURNAL_DES_VENTES); - entryBook.setCode("jdv"); - entryBookService.createEntryBook(entryBook); - } - /** * Permet de tester l'ajout d'un journal dans la base de données. * (erreur duplication). @@ -63,6 +51,7 @@ * @throws LimaException */ @Test(expected=LimaException.class) + @Ignore public void createJournalTest() throws LimaException { EntryBook entryBook = new EntryBookImpl(); entryBook.setLabel(JOURNAL_DES_VENTES); @@ -81,7 +70,7 @@ EntryBook entryBook = entryBookService.getAllEntryBooks().get(0); Assert.assertNotNull(entryBook); Assert.assertEquals(JOURNAL_DES_VENTES, entryBook.getLabel()); - entryBook.setCode("Journal des achats"); + entryBook.setLabel("Journal des achats"); entryBookService.updateEntryBook(entryBook); // Recherche du journal dans la bdd Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -25,11 +25,7 @@ package org.chorem.lima.business; -import java.util.Date; - -import org.chorem.lima.business.ejb.FinancialPeriodServiceImpl; -import org.junit.AfterClass; -import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -46,14 +42,6 @@ */ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { - protected static FinancialPeriodServiceImpl financialPerdiodService = - new FinancialPeriodServiceImpl(); - - @Before - public void setUp() { - - } - /** * Permet de tester l'ajout d'un timespan. */ Added: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,192 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.util.List; + +import junit.framework.Assert; + +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.EntryImpl; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.entity.FinancialTransactionImpl; +import org.chorem.lima.entity.FiscalPeriod; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Test on financial transaction service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class FinancialTransactionServiceTest extends AbstractLimaTest { + + /** + * Init db with some transaction. + * + * @throws ParseException + * @throws LimaException + */ + @Before + public void initTransactions() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 4, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + } + + /** + * Test to find all unbalanced transactions. + * Nothing wrong here. + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetInexactTransactionAllGood() throws ParseException, LimaException { + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertTrue(transactions.isEmpty()); + } + + /** + * Test to find all unbalanced transactions. + * + * wrong data. + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetInexactTransactionNotAllGood() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 5, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + //tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + Entry tr1Entry2 = new EntryImpl(); + tr1Entry2.setAmount(BigDecimal.valueOf(42.0)); + tr1Entry2.setDebit(true); + tr1Entry2.setAccount(accountVmpVae); + tr1Entry2.setFinancialTransaction(transaction1); + tr1Entry2.setDescription("test desc"); + tr1Entry2.setVoucher("voucher"); + tr1Entry2 = financialTransactionService.createEntry(tr1Entry2); + + // one in period + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertEquals(1, transactions.size()); + } + + /** + * Test to find all unbalanced transactions. + * + * Test only unbalanced transactions (no data errors : fields). + * + * @throws ParseException + * @throws LimaException + */ + @Test + public void testGetUnbalancedTransactionNotAllGood() throws ParseException, LimaException { + + EntryBook journalDesVentes = entryBookService.getEntryBookByCode("jdv"); + Account accountVmpVae = accountService.getAccountByNumber("511"); + + // TODO echatellier 20120116 improve period choice + FinancialPeriod financialPeriod = financialPeriodService.getAllFinancialPeriods().get(0); + + FinancialTransaction transaction1 = new FinancialTransactionImpl(); + transaction1.setTransactionDate(df.parse("April 5, 2012")); + transaction1.setEntryBook(journalDesVentes); + transaction1.setFinancialPeriod(financialPeriod); + transaction1 = financialTransactionService.createFinancialTransaction(transaction1); + + Entry tr1Entry1 = new EntryImpl(); + tr1Entry1.setAmount(BigDecimal.valueOf(54.0)); + tr1Entry1.setAccount(accountVmpVae); + tr1Entry1.setFinancialTransaction(transaction1); + tr1Entry1.setDescription("test desc"); + tr1Entry1.setVoucher("voucher"); + tr1Entry1 = financialTransactionService.createEntry(tr1Entry1); + + // one in period + FiscalPeriod fiscalPeriod = fiscalPeriodService.getAllFiscalPeriods().get(0); + List<FinancialTransaction> transactions = financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); + Assert.assertEquals(1, transactions.size()); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialTransactionServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -32,6 +32,7 @@ import org.chorem.lima.entity.AccountImpl; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; /** @@ -50,14 +51,15 @@ public class AccountServiceRuleFrTest extends AccountServiceImplTest { @BeforeClass - public static void installFrenchRule() { + public static void installFrenchRule() throws Exception { LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); } /** * Test une fois que la regles est correctement instanciée car - * elle peut être mise en cache dans + * elle peut être mise en cache dans {@link LimaConfig}. */ + @Test public void testRuleInstance() { Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); } @@ -65,10 +67,14 @@ /** * Création d'un compte dans le plan comptable. * + * This test currently wont work because AccountServiceImpl keep accouting + * reference and @BeforeClass changes has no effects. + * * @throws LimaException */ @Test(expected=LimaException.class) @Override + @Ignore public void testCreateAccountWrongNumber() throws LimaException { Account myAccount = new AccountImpl(); myAccount.setAccountNumber("42"); Added: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,133 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +import org.apache.commons.lang.time.DateUtils; +import org.chorem.lima.business.LimaBusinessException; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialPeriodImpl; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodDAO; +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.junit.Ignore; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; + +/** + * Cette classe existe car les tests tourne 2 fois: + * - default + * - fr rule set + * + * Par contre, dans default, il manque du code et cela ne peut pas fonctionner + * juste avec default. Donc le code manquant est ajouter dans ce jeux de regles + * de test et on lance les tests unitaires avec TestAccountingRules un fois + * et FranceAccountingRules une autre fois. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +@Ignore +public class TestAccountingRules extends DefaultAccountingRules { + + /** + * Copier/coller de la methode france. + * Le probleme ici est que le default n'en creer aucune. + */ + public List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod, TopiaContext transaction) throws LimaException { + super.createFiscalPeriodRules(fiscalPeriod, transaction); + List<FinancialPeriod> financialPeriods = new ArrayList<FinancialPeriod>(); + try { + FiscalPeriodDAO fiscalPeriodDAO = + LimaCallaoDAOHelper.getFiscalPeriodDAO(transaction); + + //Checks if is not the first fiscalperiod to create + if (fiscalPeriodDAO.findAll().size() != 0) { + + TopiaQuery query = fiscalPeriodDAO.createQuery(); + query.addOrderDesc(FiscalPeriod.PROPERTY_END_DATE); + //get the last fiscal period + FiscalPeriod lastFiscalPeriod = fiscalPeriodDAO.findByQuery(query); + + //check the new fiscal period adjoining the last + Date dateLastFiscalPeriod = lastFiscalPeriod.getEndDate(); + dateLastFiscalPeriod = DateUtils. + addDays(dateLastFiscalPeriod, 1); + dateLastFiscalPeriod = DateUtils.truncate(dateLastFiscalPeriod, Calendar.DATE); + Date dateFiscalPeriod = fiscalPeriod.getBeginDate(); + if (dateLastFiscalPeriod.compareTo(dateFiscalPeriod) != 0) { + throw new LimaBusinessException(_("lima-business.franceaccountingrules.newfiscalperiodadjoiningerror")); + } + + //We can create a new fiscal period meantime the last fiscal period was not locked + //But not the ante periodfiscal + int unblockedFiscalPeriod = + fiscalPeriodDAO.findAllByLocked(false).size(); + if (unblockedFiscalPeriod > 1) { + throw new LimaBusinessException(_("lima-business.franceaccountingrules.antefiscalperiodnotblocked")); + } + } + + // FinancialPeriods of 1 month are created + Date endDate = fiscalPeriod.getEndDate(); + Date loopDate = fiscalPeriod.getBeginDate(); + while (loopDate.before(endDate)) { + FinancialPeriod financialPeriod = new FinancialPeriodImpl(); + //important for fiscalperiod created from import, it can be locked, so financialperiods must be locked + financialPeriod.setLocked(fiscalPeriod.getLocked()); + financialPeriod.setBeginDate(loopDate); + loopDate = DateUtils.addMonths(loopDate, 1); + loopDate = DateUtils.truncate(loopDate, Calendar.MONTH); + loopDate = DateUtils.addMilliseconds(loopDate, -1); + if (loopDate.after(endDate)) { + financialPeriod.setEndDate(endDate); + } else { + financialPeriod.setEndDate(loopDate); + } + //create it + fiscalPeriod.addFinancialPeriod(financialPeriod); + financialPeriods.add(financialPeriod); + //financialPeriodService.createFinancialPeriodWithTransaction(financialPeriod, transaction); + //loop incremente + loopDate = DateUtils.addMilliseconds(loopDate, 1); + } + } catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + return financialPeriods; + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/TestAccountingRules.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,48 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.ejb; + +import javax.ejb.Remote; + +import org.chorem.lima.business.LimaException; + +/** + * Clear database service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +@Remote +public interface ClearService { + + /** + * Clear database. + */ + void clearDatabase() throws LimaException; +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,63 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.ejb; + +import javax.ejb.Stateless; + +import org.chorem.lima.business.LimaException; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * Clear database service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +@Stateless +public class ClearServiceImpl extends AbstractLimaService implements ClearServiceLocal, ClearService { + + /* + * @see org.chorem.lima.business.ejb.ClearService#clearDatabase() + */ + @Override + public void clearDatabase() throws LimaException { + try { + TopiaContext rootContext = acquireRootContext(); + TopiaContext transaction = rootContext.beginTransaction(); + transaction.createSchema(); + transaction.commitTransaction(); + transaction.closeContext(); + } catch (TopiaException ex) { + throw new LimaException("Can't clear database", ex); + } + + } + +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceLocal.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceLocal.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceLocal.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,42 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.ejb; + +import javax.ejb.Local; + +/** + * Clear database service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +@Local +public interface ClearServiceLocal extends ClearService { + +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceLocal.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceMonitorable.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceMonitorable.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceMonitorable.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,41 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.ejb; + +import org.chorem.lima.business.ServiceMonitorable; + +/** + * Clear database service. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface ClearServiceMonitorable extends ClearService, ServiceMonitorable { + +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/ejb/ClearServiceMonitorable.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml (rev 0) +++ trunk/lima-business/src/test/resources/META-INF/ejb-jar.xml 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,29 @@ + + +<ejb-jar/> Added: trunk/lima-business/src/test/resources/lima-test.properties =================================================================== --- trunk/lima-business/src/test/resources/lima-test.properties (rev 0) +++ trunk/lima-business/src/test/resources/lima-test.properties 2012-01-17 09:35:25 UTC (rev 3322) @@ -0,0 +1,28 @@ +### +# #%L +# Lima business +# +# $Id: lima.properties 3278 2011-08-16 14:09:44Z tchemit $ +# $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-business/src/main/resources/lima.… $ +# %% +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +# Embedded mode +lima.openejb.remotemode=false +java.naming.factory.initial=org.openejb.client.LocalInitialContextFactory Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionImpl.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,27 +27,44 @@ import java.math.BigDecimal; - +/** + * Financial transaction implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ public class FinancialTransactionImpl extends FinancialTransactionAbstract { private static final long serialVersionUID = 1L; + /* + * @see org.chorem.lima.entity.FinancialTransaction#getAmountDebit() + */ @Override - public void setAmounts() { + public BigDecimal getAmountDebit() { + BigDecimal result = new BigDecimal(0); + for (Entry entryFT : getEntry()) { + if (entryFT.isDebit()) { + result.add(entryFT.getAmount()); + } + } + return result; + } - if (amountDebit == null) { - amountDebit = new BigDecimal(0); - } - if (amountCredit == null) { - amountCredit = new BigDecimal(0); - } - for (Entry entryFT : entry) { - if (entryFT.getDebit()) { - amountDebit = amountDebit.add(entryFT.getAmount()); - } else { - amountCredit = amountCredit.add(entryFT.getAmount()); + /* + * @see org.chorem.lima.entity.FinancialTransaction#getAmountCredit() + */ + @Override + public BigDecimal getAmountCredit() { + BigDecimal result = new BigDecimal(0); + for (Entry entryFT : getEntry()) { + if (!entryFT.isDebit()) { + result.add(entryFT.getAmount()); } } + return result; } - } Modified: trunk/lima-callao/src/main/xmi/accounting.properties =================================================================== --- trunk/lima-callao/src/main/xmi/accounting.properties 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-callao/src/main/xmi/accounting.properties 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -23,8 +23,8 @@ # #L% ### # Precise l'entete de l'ensemble des fichiers generes -model.tagvalue.copyright=/*\n Copyright (C) 2009-2010 Lima Callao\n */ -model.tagvalue.version=0.5.2 +model.tagvalue.copyright=/*\n Copyright (C) 2009-2012 Lima Callao\n */ +model.tagvalue.version=0.6 model.tagvalue.constantPrefix=PROPERTY_ model.tagValue.notGenerateToString=true Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -77,12 +77,12 @@ protected Version version; /** - * Get copyrighy text (include version). + * Get copyright text (include version). * * @return copyright text */ public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2011"; + return "Version " + getVersion() + " Codelutin @ 2008-2012"; } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -37,12 +37,8 @@ import org.chorem.lima.ui.MainViewHandler; import org.chorem.lima.ui.opening.OpeningView; import org.chorem.lima.util.ErrorHelper; -import org.nuiton.profiling.NuitonTrace; -import org.nuiton.util.FileUtil; import javax.swing.SwingUtilities; -import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -127,6 +123,7 @@ LimaConfig config = context.getConfig(); config.parse(args); + LimaServiceFactory.initFactory(config); context.initI18n(config); // prepare ui look&feel and load ui properties @@ -185,7 +182,7 @@ }); } - protected static void saveTraces(File file) { + /*protected static void saveTraces(File file) { String stats = NuitonTrace.getStatisticsCSVAndClear(); try { FileUtil.writeString(file, stats, "utf-8"); @@ -194,7 +191,7 @@ log.error("Could not save traces to file " + file, e); } } - } + }*/ public static class ShutdownHook extends Thread { @@ -206,12 +203,12 @@ public void run() { try { super.run(); - File file = new File("lima-trace.csv"); + /*File file = new File("lima-trace.csv"); saveTraces(file); String stats = NuitonTrace.getStatisticsCSVAndClear(); if (log.isInfoEnabled()) { log.info(stats); - } + }*/ LimaContext.get().close(); LimaServiceFactory.destroy(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/EntryBookComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/LetterComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/SubAccountComboBoxModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -403,8 +403,7 @@ public int addFinancialTransaction() throws LimaException { /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setAmountDebit(BigDecimal.ZERO); - financialTransaction.setAmountCredit(BigDecimal.ZERO); + //if a period is selected if (selectedFinancialPeriod == null) { throw new LimaBusinessException("No financial period selected"); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -362,8 +362,7 @@ public int addFinancialTransaction() throws LimaException { /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setAmountDebit(BigDecimal.ZERO); - financialTransaction.setAmountCredit(BigDecimal.ZERO); + //if a period is selected if (selectedFiscalPeriod != null) { List<FinancialPeriod> financialPeriodsList = Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -22,23 +22,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -/* *##% Lima Swing - * Copyright (C) 2008 - 2010 CodeLutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##%*/ package org.chorem.lima.ui.financialtransactionunbalanced; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateFiscalPeriodPanel.jaxx 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2008 - 2010 CodeLutin + Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportTableModel.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2012-01-13 13:49:57 UTC (rev 3321) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatreports/VatReportViewHandler.java 2012-01-17 09:35:25 UTC (rev 3322) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as

1 0

r3321 - trunk/lima-swing/src/main/java/org/chorem/lima/service
by echatellier＠users.chorem.org 13 Jan '12

13 Jan '12

Author: echatellier Date: 2012-01-13 14:49:57 +0100 (Fri, 13 Jan 2012) New Revision: 3321 Url: http://chorem.org/repositories/revision/lima/3321 Log: Un peu de doc, ca aide !! Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2012-01-13 09:56:57 UTC (rev 3320) +++ trunk/lima-swing/src/main/java/org/chorem/lima/service/ServiceMonitorableHandler.java 2012-01-13 13:49:57 UTC (rev 3321) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -35,6 +35,19 @@ import java.util.ArrayList; import java.util.List; +/** + * This class surround a real service, but intercept addServiceListener + * and removeServiceListener that are not defined on delegated service + * object. + * + * All other call are forwarded on notified to registered listeners. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ public class ServiceMonitorableHandler implements InvocationHandler { private static final Log log = @@ -79,7 +92,8 @@ protected void notifyMethod(Method method) { String methodName = method.getName(); - //TODO tchemit-2011-09-16 Could we have an explanation of this test ? + + // get is removed to only notify write modification if (!methodName.startsWith("get")) { for (ServiceListener serviceListener : listeners) { serviceListener.notifyMethod(service.toString(), methodName); @@ -87,5 +101,4 @@ } } } - }

1 0

r3320 - in trunk/lima-business/src: main/java/org/chorem/lima/business/ejb main/java/org/chorem/lima/business/ejbinterface test/java/org/chorem/lima/business
by echatellier＠users.chorem.org 13 Jan '12

13 Jan '12

Author: echatellier Date: 2012-01-13 10:56:57 +0100 (Fri, 13 Jan 2012) New Revision: 3320 Url: http://chorem.org/repositories/revision/lima/3320 Log: Begin test refactoring. Added: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java Removed: trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 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/FinancialPeriodServiceImplTest.java trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -150,28 +150,6 @@ } @Override - public List<EntryBook> getAllEntryByProperty(String propertyName, - String value) throws LimaException { - List<EntryBook> entryBookList = null; - - TopiaContext transaction = beginTransaction(rootContext); - - try { - - EntryBookDAO entryBookDAO = - LimaCallaoDAOHelper.getEntryBookDAO(transaction); - entryBookList = entryBookDAO.findAllByProperty(propertyName, value); - } catch (Exception ex) { - doCatch(transaction, ex); - } finally { - doFinally(transaction); - } - - return entryBookList; - } - - - @Override public void updateEntryBook(EntryBook entryBook) throws LimaException { TopiaContext transaction = beginTransaction(rootContext); Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/EntryBookService.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,23 +36,27 @@ * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ + * + * Last update : $Date$ + * By : $Author$ */ - @Remote public interface EntryBookService { - /** + * Get all entry book. + * * @return all entrybook * @throws LimaException */ List<EntryBook> getAllEntryBooks() throws LimaException; - List<EntryBook> getAllEntryByProperty(String propertyName, String value) throws LimaException; - + /** + * Create new entry book. + * + * @param entryBook + * @throws LimaException + */ void createEntryBook(EntryBook entryBook) throws LimaException; /** Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2012 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -23,27 +23,101 @@ package org.chorem.lima.business; -import org.junit.BeforeClass; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.text.DateFormat; +import java.util.Locale; +import java.util.Properties; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.LimaConfig.Option; +import org.chorem.lima.business.accountingrules.DefaultAccountingRules; +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.junit.After; +import org.junit.Before; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; -import java.util.Locale; - /** * Common initialization code for all lima tests. * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ + * + * Last update : $Date$ + * By : $Author$ */ public abstract class AbstractLimaTest { - @BeforeClass - public static void setUpClass() throws Exception { + private static final Log log = LogFactory.getLog(AbstractLimaTest.class); + + protected static DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.ENGLISH); + + @Before + public void setUpLocale() throws Exception { I18n.init(new ClassPathI18nInitializer(), Locale.UK); - LimaTestConfig.getInstance(); } + /** + * Return a new instance of configuration defined on a new database at + * each call. + * + * @return single test config + */ + protected LimaConfig getTestConfiguration() { + LimaConfig instance = new LimaConfig(); + + // do not call parse() method (don't read /etc...) + // load file manually (lima.properties) + Properties testProperties = new Properties(); + InputStream stream = AbstractLimaTest.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); + + try { + testProperties.load(stream); + } catch (IOException ex) { + throw new RuntimeException("Can't init test configuration", ex); + } + + // override somes + String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima" + File.separator; + testDir += "testdb" + System.currentTimeMillis(); + testProperties.setProperty(Option.DATA_DIR.getKey(), testDir); + testProperties.setProperty("hibernate.connection.url", "jdbc:h2:file:" + testDir + File.separator + "data"); + //testProperties.setProperty("hibernate.hbm2ddl.auto", "update"); + + instance.setOptions(testProperties); + instance.setOption("topia.persistence.classes", LimaCallaoDAOHelper.getImplementationClassesAsString()); + + if (log.isDebugEnabled()) { + log.debug("Using test configuration" + instance.getFlatOptions()); + } + return instance; + } + + @Before + public void setUpTestConfig() throws Exception { + LimaConfig.instance = getTestConfiguration(); + } + + @After + public void cleanDatabase() throws IOException { + LimaConfig config = LimaConfig.getInstance(); + FileUtils.deleteDirectory(config.getDataDir()); + } + + /** + * Default rule configuration should stay in France rule. + * + * But test will run without a specific rule during normal tests + * and france rule will be re-enabled for specifics tests. + * @throws Exception + */ + @Before + public void setUpDefaultRule() throws Exception { + LimaConfig config = LimaConfig.getInstance(); + config.setAccountingRule(DefaultAccountingRules.class.getName()); + } } 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 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/AccountServiceImplTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,12 +25,19 @@ package org.chorem.lima.business; -// tchemit-2011-08-11 This test must be redone thinks it does not respect -// See http://chorem.org/issues/428 +import java.util.List; +import org.chorem.lima.business.ejb.AccountServiceImpl; +import org.chorem.lima.business.ejbinterface.AccountService; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + /** - * Tests pour la gestion des comptes dans le plan comptable - * + * Tests pour la gestion des comptes dans le plan comptable. + * * Vérification sur l'ajout, la modification et suppression d'un compte. * Il existe également des tests sur des actions à partir de DTO. La classe * AccountServiceImplTest possède une méthode upload qui, à partir d'un DTO, @@ -40,240 +47,191 @@ */ public class AccountServiceImplTest extends AbstractLimaTest { -// protected AccountService instance; -// -// @BeforeClass -// public static void beforeclass() throws LimaException { -// deleteAccounts(); -// } -// -// @Before -// public void setUp() throws LimaException { -// instance = new AccountServiceImpl(); -// -// // create a account -// Account myAccount = new AccountImpl(); -// myAccount.setAccountNumber("4"); -// myAccount.setLabel("Comptes de tiers"); -// instance.createAccount(null, myAccount); -// } -// -// @After -// public void tearDown() throws LimaException { -// deleteAccounts(); -// } -// -// private static void deleteAccounts() throws LimaException { -// AccountService instance = new AccountServiceImpl(); -// instance.removeAllAccount(); -// } -// -//// /** -//// * Création d'un compte dans le plan comptable -//// * @throws LimaException -//// */ -//// @Test -//// public void createAccountTest() throws LimaException { -//// Account myAccount = new AccountImpl(); -//// myAccount.setAccountNumber("4"); -//// myAccount.setLabel("Comptes de tiers"); -//// instance.createAccount(null, myAccount); -//// } -// -// /** -// * Création d'un compte dans le plan comptable -// * @throws LimaException -// */ -// @Test(expected=LimaException.class) -// public void testCreateAccountWrongNumber() throws LimaException { -// Account myAccount = new AccountImpl(); -// myAccount.setAccountNumber("42"); -// instance.createAccount(null, myAccount); -// } -// -// /** -// * Création d'un compte dans le plan comptable -// * @throws LimaException -// */ -// @Test(expected=LimaException.class) -// public void testCreateAccountDuplicated() throws LimaException { -// Account myAccount = new AccountImpl(); -// myAccount.setAccountNumber("1"); -// instance.createAccount(null, myAccount); -// instance.createAccount(null, myAccount); -// } -// -// /** -// * Permet de tester l'ajout des comptes sous format DTO. La grande différence -// * entre la création classique, l'applicaion va enregistrer tous les comptes -// * enfants. -// * @throws LimaException -// */ -// @Test -// public void createAccountDAOTest() throws LimaException { -// // Création des comptes -// Account account = new AccountImpl(); -// account.setAccountNumber("5"); -// account.setLabel("COMPTES FINANCIERS"); -// instance.createAccount(null, account); -// Account accountChild1 = new AccountImpl(); -// accountChild1.setAccountNumber("50"); -// accountChild1.setLabel("Valeurs mobilières de placement"); -// //accountChild1.setMasterAccount(account); -// instance.createAccount(account, accountChild1); -// -// Account accountChild2 = new AccountImpl(); -// accountChild2.setAccountNumber("51"); -// accountChild2.setLabel("Banques établissements financiers et assimilés"); -// //accountChild2.setMasterAccount(account); -// instance.createAccount(account, accountChild2); -// -// Account accountChildChild1 = new AccountImpl(); -// accountChildChild1.setAccountNumber("511"); -// accountChildChild1.setLabel("Valeurs à l'encaissement"); -// //accountChildChild1.setMasterAccount(accountChild2); -// instance.createAccount(accountChild2, accountChildChild1); -// -// Account accountChildChild2 = new AccountImpl(); -// accountChildChild2.setAccountNumber("512"); -// accountChildChild2.setLabel("Banques"); -// //accountChildChild2.setMasterAccount(accountChild2); -// instance.createAccount(accountChild2, accountChildChild2); -// } -// -// -// /** -// * Recherche d'un compte dans le plan comptable à partir d'un numéro de -// * compte. -// * @throws LimaException -// */ -// @Test -// public void searchAccountTest() throws LimaException { -// // On recherche le compte 4 - Comptes de tiers -// Account result = instance.getAccountByNumber("4"); -// Assert.assertEquals("Comptes de tiers",result.getLabel()); -// } -// -// -// /** -// * Permet de tester le nombre d'enfants renvoyés appartenant à un père. -// * @throws LimaException -// */ -// @Test -// public void searchListAccountTest() throws LimaException { -// // On recherche le compte 5 - COMPTES FINANCIERS -// Account account = instance.getAccountByNumber("5"); -// List<Account> listAccount = instance.getChildrenAccounts(account); -// // Il possède les comptes 50 et 51 -// Assert.assertEquals(2,listAccount.size()); -// } -// -// -// /** -// * Permet de tester la méthode recherchant tous les comptes au format DTO. -// * @throws LimaException -// */ -// @Test -// public void getAllAccountTest() throws LimaException { -// List<Account> listAccount = instance.getAllAccounts(); -// Assert.assertEquals(9,listAccount.size()); -// } -// -// -// /** -// * Permet de tester si un compte est bien effacé. -// * @throws LimaException -// */ -// @Test -// public void removeAccountTest() throws LimaException { -// Account masterAccount = instance.getAccountByNumber("4"); -// // Création de comptes -// Account account = new AccountImpl(); -// account.setAccountNumber("40"); -// account.setLabel("Fournisseurs"); -// instance.createAccount(masterAccount, account); -// -// Account account2 = new AccountImpl(); -// account2.setAccountNumber("41"); -// account2.setLabel("Usagers"); -// instance.createAccount(masterAccount, account2); -// -// Account account3 = new AccountImpl(); -// account3.setAccountNumber("44"); -// account3.setLabel("Etat"); -// instance.createAccount(masterAccount, account3); -// -// // On souhaite supprimer le compte 41. Ce compte existe bien. Il ne possède -// // pas de fils. La suppression se déroule bien. -// instance.removeAccount(account2); -// -// // On recherche les fils du compte 4 -// List<Account> listAccount = instance.getChildrenAccounts(masterAccount); -// // Il ne doit en possèder que 2 (au lieu de 3) -// Assert.assertEquals(2,listAccount.size()); -// } -// -// -// @Test(expected=LimaException.class) -// public void removeUnexistedAccountTest() throws LimaException { -// // On souhaite supprimer le compte 422, ce dernier n'existe pas. La -// // suppression ne peut s'effectuer. -// Account account4 = new AccountImpl(); -// account4.setAccountNumber("422"); -// account4.setLabel("Unsaved account"); -// instance.removeAccount(account4); -// } -// -// -// /** -// * Cette méthode permet de tester la mise à jour d'un compte au format DTO. -// * Il suffit d'envoyer un compte DTO avec des ajouts, modifications, et -// * suppression. Il est automatiquement mis à jour dans Callao. -// * Cette méthode est intéressante, mais demande de la ressource importante. -// * Dans ce test, nous utilitons le compte numéro 5. Ce dernier a pour enfants -// * 50 et 51, dont 51 a à son tour les comptes enfants 511 et 512. -// * Nous ajoutons un compte supplémentaire 53 à 5. Nous modifions une valeur -// * sur le compte 5, et supprimons le compte 51 (et ses enfants). -// * @throws LimaException -// */ -// @Test -// public void updateTest() throws LimaException { -// // On recherche le compte 5 - COMPTES FINANCIERS -// Account account = instance.getAccountByNumber("5"); -// -// // {ETAPE 1} Modification du nom pour le compte 5 -// account.setLabel("COMPTES FINANCIERS modifié"); -// -// // {ETAPE 2} Ajout du compte 53 -// Account accountChild = new AccountImpl(); -// accountChild.setAccountNumber("53"); -// accountChild.setLabel("Caisse"); -// accountChild.setMasterAccount(account); -// -// instance.createAccount(account, accountChild); -// -// account.addSubAccounts(accountChild); -// -// // {ETAPE 3} Supprime le compte 51 (ainsi que ses enfants 511 et 512) -// Account accountRemove = instance.getAccountByNumber("51"); -// -// account.removeSubAccounts(accountRemove); -// -// // Met à jour le compte 5 DTO dans la bdd ainsi que toutes les {ETAPE *} -// instance.updateAccount(account); -// -// // Vérification ETAPE -// -// // ETAPE 1 -// account = instance.getAccountByNumber("5"); -// Assert.assertEquals("COMPTES FINANCIERS modifié",account.getLabel()); -// // ETAPE 2 -// account = instance.getAccountByNumber("53"); -// Assert.assertEquals("Caisse",account.getLabel()); -// // ETAPE 3 -// account = instance.getAccountByNumber("5"); // les comptes fils de 5 -// List<Account> listAccount = instance.getChildrenAccounts(account); -// // Il doit avoir 50, 51 (de la méthode searchListAccountTest) et 53 -// Assert.assertEquals(3,listAccount.size()); -// } + protected AccountService accountService = new AccountServiceImpl(); + + @Before + public void setUp() throws LimaException { + // creation des comptes + Account classFinancier = new AccountImpl(); + classFinancier.setAccountNumber("5"); + classFinancier.setLabel("Comptes financiers"); + accountService.createAccount(null, classFinancier); + + Account accountVmp = new AccountImpl(); + accountVmp.setAccountNumber("50"); + accountVmp.setLabel("Valeurs mobilières de placement"); + accountService.createAccount(classFinancier, accountVmp); + + Account accountBefa = new AccountImpl(); + accountBefa.setAccountNumber("51"); + accountBefa.setLabel("Banques établissements financiers et assimilés"); + accountService.createAccount(classFinancier, accountBefa); + + Account accountVmpVae = new AccountImpl(); + accountVmpVae.setAccountNumber("511"); + accountVmpVae.setLabel("Valeurs à l'encaissement"); + accountService.createAccount(accountBefa, accountVmpVae); + + Account accountBanques = new AccountImpl(); + accountBanques.setAccountNumber("512"); + accountBanques.setLabel("Banques"); + accountService.createAccount(accountBefa, accountBanques); + } + + /** + * Création d'un compte dans le plan comptable. + * @throws LimaException + */ + @Test + public void createAccountTest() throws LimaException { + Account myAccount = new AccountImpl(); + myAccount.setAccountNumber("2"); + myAccount.setLabel("Comptes d'immobilisations"); + accountService.createAccount(null, myAccount); + } + + /** + * Création d'un compte dans le plan comptable (echec duplication). + * + * @throws LimaException + */ + @Test(expected = LimaException.class) + public void createAccountEchecTest() throws LimaException { + Account myAccount = new AccountImpl(); + myAccount.setAccountNumber("5"); + myAccount.setLabel("Comptes de capitaux"); + accountService.createAccount(null, myAccount); + } + + /** + * Création d'un compte dans le plan comptable. + * + * Le test ne doit pas echoué avec les regles par defaut, mais peut echouer + * suivant certaines autres regles. + * + * @throws LimaException + */ + @Test + public void testCreateAccountWrongNumber() throws LimaException { + Account myAccount = new AccountImpl(); + myAccount.setAccountNumber("42"); // erreur de compte (4) + myAccount.setLabel("Comptes de tiers"); + accountService.createAccount(null, myAccount); + } + + /** + * Permet de tester l'ajout des comptes sous format DTO. La grande différence + * entre la création classique, l'applicaion va enregistrer tous les comptes + * enfants. + * @throws LimaException + */ + @Test + public void createAccountWithChildTest() throws LimaException { + // Création des comptes + Account classCharges = new AccountImpl(); + classCharges.setAccountNumber("6"); + classCharges.setLabel("Comptes de charges"); + accountService.createAccount(null, classCharges); + + Account accountAchat = new AccountImpl(); + accountAchat.setAccountNumber("60"); + accountAchat.setLabel("Achats (sauf 603)"); + accountService.createAccount(classCharges, accountAchat); + + Account accountSe = new AccountImpl(); + accountSe.setAccountNumber("61"); + accountSe.setLabel("Services extérieurs"); + accountService.createAccount(classCharges, accountSe); + + Account accountVs = new AccountImpl(); + accountVs.setAccountNumber("603"); + accountVs.setLabel("Variations des stocks (approvisionnements et marchandises)"); + accountService.createAccount(accountAchat, accountVs); + } + + /** + * Permet de tester l'ajout des comptes sous format DTO. La grande différence + * entre la création classique, l'applicaion va enregistrer tous les comptes + * enfants. + * @throws LimaException + */ + @Test(expected = LimaException.class) + public void createAccountWithChildFailureTest() throws LimaException { + // Création des comptes + Account classFinancier = new AccountImpl(); + classFinancier.setAccountNumber("5"); + classFinancier.setLabel("Comptes financiers"); + accountService.createAccount(null, classFinancier); + + Account accountVmp = new AccountImpl(); + accountVmp.setAccountNumber("40"); + accountVmp.setLabel("Fournisseurs et comptes rattachés"); + accountService.createAccount(classFinancier, accountVmp); + } + + /** + * Recherche d'un compte dans le plan comptable à partir d'un numéro de + * compte. + * @throws LimaException + */ + @Test + public void searchAccountTest() throws LimaException { + // On recherche le compte 5 Comptes financiers + Account result = accountService.getAccountByNumber("5"); + Assert.assertEquals("Comptes financiers", result.getLabel()); + } + + /** + * Permet de tester le nombre d'enfants renvoyés appartenant à un père. + * @throws LimaException + */ + @Test + public void getChildrenAccountsTest() throws LimaException { + // On recherche le compte 5 - COMPTES FINANCIERS + Account account = accountService.getAccountByNumber("5"); + List<Account> listAccount = accountService.getChildrenAccounts(account); + Assert.assertEquals(2, listAccount.size()); + } + + /** + * Permet de tester la méthode recherchant tous les comptes. + * + * @throws LimaException + */ + @Test + public void getAllAccountTest() throws LimaException { + List<Account> listAccount = accountService.getAllAccounts(); + Assert.assertEquals(5, listAccount.size()); + } + + /** + * Permet de tester si un compte est bien effacé. + * + * @throws LimaException + */ + @Test + public void removeAccountTest() throws LimaException { + Account accountToRemove = accountService.getAccountByNumber("51"); + + // On souhaite supprimer le compte 51. Ce compte existe bien. Il possede + // des fils. La suppression se déroule bien. + accountService.removeAccount(accountToRemove); + + // Il ne doit rester que 2 compte (5, 50) + Assert.assertEquals(2, accountService.getAllAccounts().size()); + } + + /** + * On souhaite supprimer le compte 422, ce dernier n'existe pas. La + * suppression ne peut s'effectuer. + * + * @throws LimaException + */ + @Test(expected = LimaException.class) + public void removeUnexistedAccountTest() throws LimaException { + Account account4 = new AccountImpl(); + account4.setAccountNumber("422"); + account4.setLabel("Unsaved account"); + accountService.removeAccount(account4); + } } \ No newline at end of file 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 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/EntryBookServiceImplTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,22 +25,16 @@ package org.chorem.lima.business; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ejb.EntryBookServiceImpl; import org.chorem.lima.business.ejbinterface.EntryBookService; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.EntryBookImpl; -import org.junit.After; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import java.util.List; - /** - * Tests pour la gestion des journaux + * Tests pour la gestion des journaux. * * L'application peut gérer plusieurs journaux pour la gestion des transactions. * Il est tester ici l'ajout, la recherche. @@ -49,92 +43,31 @@ */ public class EntryBookServiceImplTest extends AbstractLimaTest { - /** log. */ - private static final Log log = LogFactory.getLog(EntryBookServiceImplTest.class); + protected static EntryBookService entryBookService = new EntryBookServiceImpl(); - private static EntryBookServiceImpl instance; + protected static final String JOURNAL_DES_VENTES = "Journal des ventes"; - public static final String JOURNAL_DES_VENTES = "Journal des ventes"; - - public static final String NEW_CODE = "New Code"; - - // /** -// * On nettoie la base de données -// * @throws java.lang.Exception -// */ -// @AfterClass -// public static void tearDownClass() throws Exception { -// List<EntryBook> list = instance.getAllEntryBooks(); -// // On supprime chaque journal -// for (EntryBook entryBook : list) { -// instance.removeEntryBook(entryBook); -// } -// } - - @BeforeClass - public static void beforeclass() throws LimaException { - deleteAllBookEntries(); - } - @Before public void setUp() throws LimaException { - instance = new EntryBookServiceImpl(); - // create a entry book EntryBook entryBook = new EntryBookImpl(); entryBook.setLabel(JOURNAL_DES_VENTES); entryBook.setCode("jdv"); - instance.createEntryBook(entryBook); + entryBookService.createEntryBook(entryBook); } - @After - public void tearDown() throws LimaException { - deleteAllBookEntries(); - } - - private static void deleteAllBookEntries() throws LimaException { - EntryBookService instance = new EntryBookServiceImpl(); - List<EntryBook> list = instance.getAllEntryBooks(); - // On supprime chaque journal - for (EntryBook entryBook : list) { - instance.removeEntryBook(entryBook); - } - } - -// /** -// * Permet de tester l'ajout d'un journal dans la base de données. -// * @throws LimaException -// */ -// @Test -// public void createJournalTest() throws LimaException { -// EntryBook entryBook = new EntryBookImpl(); -// entryBook.setLabel("Journal des ventes"); -// entryBook.setCode("jdv"); -// instance.createEntryBook(entryBook); -// } - /** - * Permet de tester la recherche d'un journal suivant son préfixe. - * + * Permet de tester l'ajout d'un journal dans la base de données. + * (erreur duplication). + * * @throws LimaException */ - @Test - public void searchJournalWithLabelTest() throws LimaException { - List<EntryBook> result = instance.getAllEntryByProperty(EntryBook.PROPERTY_LABEL, JOURNAL_DES_VENTES); - Assert.assertNotNull(result); - Assert.assertEquals(1, result.size()); - - EntryBook entryBook = result.get(0); - Assert.assertNotNull(entryBook); - Assert.assertEquals("Journal des ventes", entryBook.getLabel()); - - // On ne sait pas ici si ça existe ?! - result = instance.getAllEntryByProperty(EntryBook.PROPERTY_LABEL, "Journal des achats"); - Assert.assertNotNull(result); - Assert.assertTrue(result.isEmpty()); - // TODO Il faut que ca soit vide : cette entree n'existe pas (pas créée dans le test) -// Assert.assertTrue(result.isEmpty()); - + @Test(expected=LimaException.class) + public void createJournalTest() throws LimaException { + EntryBook entryBook = new EntryBookImpl(); + entryBook.setLabel(JOURNAL_DES_VENTES); + entryBook.setCode("jdv"); + entryBookService.createEntryBook(entryBook); } /** @@ -144,25 +77,17 @@ */ @Test public void modifyJournalTest() throws LimaException { - EntryBook entryBook; - List<EntryBook> entryBooksList; - entryBooksList = instance.getAllEntryByProperty(EntryBook.PROPERTY_LABEL, JOURNAL_DES_VENTES); - Assert.assertNotNull(entryBooksList); - Assert.assertEquals(1, entryBooksList.size()); - entryBook = entryBooksList.get(0); + EntryBook entryBook = entryBookService.getAllEntryBooks().get(0); Assert.assertNotNull(entryBook); Assert.assertEquals(JOURNAL_DES_VENTES, entryBook.getLabel()); - entryBook.setCode(NEW_CODE); - instance.updateEntryBook(entryBook); + entryBook.setCode("Journal des achats"); + entryBookService.updateEntryBook(entryBook); // Recherche du journal dans la bdd - entryBooksList = instance.getAllEntryByProperty(EntryBook.PROPERTY_LABEL, JOURNAL_DES_VENTES); - Assert.assertNotNull(entryBooksList); - Assert.assertEquals(1, entryBooksList.size()); - entryBook = entryBooksList.get(0); + entryBook = entryBookService.getAllEntryBooks().get(0); Assert.assertNotNull(entryBook); - Assert.assertEquals(NEW_CODE, entryBook.getCode()); + Assert.assertEquals("Journal des achats", entryBook.getLabel()); } } \ No newline at end of file Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FinancialPeriodServiceImplTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,8 +25,8 @@ package org.chorem.lima.business; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.Date; + import org.chorem.lima.business.ejb.FinancialPeriodServiceImpl; import org.junit.AfterClass; import org.junit.Before; @@ -46,45 +46,29 @@ */ public class FinancialPeriodServiceImplTest extends AbstractLimaTest { - /** log. */ - private static final Log log = LogFactory.getLog(FinancialPeriodServiceImplTest.class); + protected static FinancialPeriodServiceImpl financialPerdiodService = + new FinancialPeriodServiceImpl(); - private static FinancialPeriodServiceImpl instance; - - /** - * On nettoie la base de données - * - * @throws Exception - */ - @AfterClass - public static void tearDownClass() throws Exception { - /*Date beginTimeSpan = new Date(111,0,1); - TimeSpan timeSpan = instance.searchTimeSpanByDate(beginTimeSpan); - instance.removeTimeSpan(timeSpan);*/ - } - @Before public void setUp() { - //instance = new FinancialPeriodServiceImpl(); - } - public FinancialPeriodServiceImplTest() { } - /** Permet de tester l'ajout d'un timspan */ + /** + * Permet de tester l'ajout d'un timespan. + */ @Test public void createTimeSpanTest() { /*// debut 1 janvier 2011 - Date beginTimeSpan = new Date(111, 0, 1); + Date beginTimeSpan = df.parse("Junary 1, 2011"); // fin 15 janvier 2011 - Date endTimeSpan = new Date(111, 0, 15); - String result; + Date endTimeSpan = df.parse("Junary 15, 2011"); // Création du timespan du 1 janvier au 31 janvier. // Malgre la date de fin du 15 janvier, elle ne prend en compte que la // date de début. La période a pour valeur nulle, et le timepsan est // non bloqué. - result = instance.createTimeSpan(beginTimeSpan, endTimeSpan, null, + result = financialPerdiodService.createTimeSpan(beginTimeSpan, endTimeSpan, null, false); Assert.assertEquals(ServiceHelper.RESPOND_SUCCESS, result);*/ } Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/FiscalPeriodServiceImplTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -58,7 +58,7 @@ private TopiaContext rootContext; public FiscalPeriodServiceImplTest() { - LimaConfig config = LimaTestConfig.getInstance(); + LimaConfig config = LimaConfig.getInstance(); try { rootContext = TopiaContextFactory.getContext(config.getOptions()); } catch (TopiaNotFoundException ex) { Deleted: trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/GeneratorTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -1,221 +0,0 @@ -/* - * #%L - * Lima business - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.ejb.AccountServiceImpl; -import org.chorem.lima.business.ejb.EntryBookServiceImpl; -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.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.entity.FiscalPeriodImpl; -import org.junit.Before; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -/** @author Rémi Chapelet */ -public class GeneratorTest extends AbstractLimaTest { - - /** log. */ - private static final Log log = LogFactory.getLog(FinancialTransactionServiceImpl.class); - - private static FinancialTransactionServiceImpl instanceTransaction; - - 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(); - instanceFiscalPeriod = new FiscalPeriodServiceImpl(); - instanceFinancialPeriod = new FinancialPeriodServiceImpl(); - instanceJournal = new EntryBookServiceImpl(); - instanceAccount = new AccountServiceImpl(); - } - - - /** - * Permet de tester l'ajout d'un timspan - * - * @throws LimaException - */ - @Test - public void generate() throws LimaException { - - // Création Journal - 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");*/ - - // Création account - 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); - instanceAccount.createAccount(8, "COMPTES SPECIAUX", null); - instanceAccount.createAccount(10, "Capital et réserves", 1); - instanceAccount.createAccount(106, "Réserves", 10); - instanceAccount.createAccount(1061, "Réserve légale",106 ); - instanceAccount.createAccount(1062, "Réserves indisponibles", 106); - instanceAccount.createAccount(1063, "Réserves statutaires ou contractuelles", 106); - instanceAccount.createAccount(1064, "Réserves réglementées", 106); - instanceAccount.createAccount(1068, "Autres réserves", 106); - instanceAccount.createAccount(11, "Report à nouveau (solde créditeur ou débiteur)", 1); - instanceAccount.createAccount(12, "Résultat de l'exercice (bénéfice ou perte)", 1); - instanceAccount.createAccount(14, "Provisions réglementées", 1); - instanceAccount.createAccount(15, "Provisions pour risques et charges", 1); - instanceAccount.createAccount(151, "Provisions pour risques", 15); - instanceAccount.createAccount(155, "Provisions pour impôts", 15); - 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);*/ - - Date beginDate; - Date endDate; - Date dateSearch; - Calendar cal1 = Calendar.getInstance(); - Calendar cal2 = Calendar.getInstance(); - Calendar cal3 = Calendar.getInstance(); - List<EntryBook> entryBooksList = new ArrayList<EntryBook>(); - - // create 5 fiscal years - for (int annee = 2009; annee < 2015; annee++) { - - cal1.set(annee, 0, 1); - beginDate = cal1.getTime(); - - cal2.set(annee, 11, 31); - endDate = cal2.getTime(); - - FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); - fiscalPeriod.setBeginDate(beginDate); - fiscalPeriod.setEndDate(endDate); - //create the current year - //instanceFiscalPeriod.createFiscalPeriod(fiscalPeriod); - - // create a transaction for each month of the current year - /*for (int mois = 0 ; mois<11 ; mois++) { - - cal3.set(annee, mois, 1); - dateSearch = cal3.getTime(); - - TimeSpan timespan = instanceFiscalPeriod.searchTimeSpanByDate(dateSearch); - - - for (int j=0 ; j<50 ; j++) { - - entryBooksList.clear(); - - entryBooksList = instanceJournal.getAllEntryByProperty(EntryBook.LABEL, "Journal des ventes"); - - FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - - topiaIDTransaction = instanceTransaction.createFinancialTransaction(financialTransaction); createTransaction(dateSearch, "Facture 6", "description transaction", timespan, journal); - - FinancialTransaction transaction = instanceTransaction.getsearchTransactionWithTopiaId(topiaIDTransaction); - - Account account = instanceAccount.getAccountByNumber("1"); - - Entry entry1 = new EntryImpl(); - entry1.setAccount(account); - entry1.setDescription("Description"); - entry1.setDetail("Details"); - entry1.setDebit(false); - entry1.setFinancialTransaction(transaction); - - instanceTransaction.createEntry(entry1); //addEntry("entree1", "300", false, "lettering", "detail", transaction, account); - - Entry entry2 = new EntryImpl(); - entry2.setAccount(account); - entry2.setDescription("Description"); - entry2.setDetail("Details"); - entry2.setDebit(true); - entry2.setFinancialTransaction(transaction); - - instanceTransaction.createEntry(entry2); //addEntry("entree2", "300", true, "lettering", "detail", transaction, account); - } - }*/ - //Period period = instancePeriod.searchPeriodWithDate(beginTimeSpan); - //instanceFiscalPeriod.blockFiscalPeriod(fiscalPeriod); //blockAllTimeSpanOfPeriod(period); - //instanceFiscalPeriod.blockPeriod(period); - } - } - - -} Added: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -0,0 +1,53 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business; + +import org.chorem.lima.business.accountingrules.FranceAccountingRules; +import org.junit.Assert; +import org.junit.Test; + +/** + * Lima misc tests. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class LimaMiscTest extends AbstractLimaTest { + + /** + * Test que la regles de nationnalité par defaut est Default pour + * la majorité des tests. + */ + @Test + public void testDefaultRule() { + Assert.assertFalse(LimaConfig.getInstance().getAccountingRules() + instanceof FranceAccountingRules); + } + +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaMiscTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-13 09:56:43 UTC (rev 3319) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-13 09:56:57 UTC (rev 3320) @@ -1,82 +0,0 @@ -/* - * #%L - * Lima business - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.business; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.LimaCallaoDAOHelper; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -/** - * Application config instance used it tests. (load custom test configuration) - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class LimaTestConfig extends LimaConfig { - - private static final Log log = LogFactory.getLog(LimaTestConfig.class); - - public static LimaConfig getInstance() { - if (instance == null) { - instance = new LimaTestConfig(); - - // do not call parse() method (don't read /etc...) - // load file manually (lima.properties) - Properties testProperties = new Properties(); - InputStream stream = LimaTestConfig.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); - - try { - testProperties.load(stream); - } catch (IOException ex) { - throw new RuntimeException("Can't init test configuration", ex); - } - - // override somes - String testDir = System.getProperty("java.io.tmpdir") + File.separator + "limatestdb"; - //TODO clear database instead of creating a new one for each test - testDir += System.currentTimeMillis(); - testProperties.put("lima.dir", testDir); - testProperties.put("hibernate.connection.url", "jdbc:h2:file:" + testDir + File.separator + "data"); - testProperties.put("hibernate.hbm2ddl.auto", "update"); - - instance.setOptions(testProperties); - instance.setOption("topia.persistence.classes", LimaCallaoDAOHelper.getImplementationClassesAsString()); - - if (log.isInfoEnabled()) { - log.info("Using test configuration" + instance.getFlatOptions()); - } - } - return instance; - } -}

1 0

r3319 - trunk/lima-swing/src/main/resources
by echatellier＠users.chorem.org 13 Jan '12

13 Jan '12

Author: echatellier Date: 2012-01-13 10:56:43 +0100 (Fri, 13 Jan 2012) New Revision: 3319 Url: http://chorem.org/repositories/revision/lima/3319 Log: Remove log from topia Modified: trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-01-12 17:57:53 UTC (rev 3318) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-01-13 09:56:43 UTC (rev 3319) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -38,4 +38,3 @@ # package level log4j.logger.org.chorem.lima=INFO -log4j.logger.org.nuiton.topia=INFO \ No newline at end of file

1 0

r3318 - in trunk/lima-business/src: main/java/org/chorem/lima/business main/java/org/chorem/lima/business/accountingrules main/java/org/chorem/lima/business/ejbinterface test/java/org/chorem/lima/business test/java/org/chorem/lima/business/accountingrules test/resources
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 18:57:53 +0100 (Thu, 12 Jan 2012) New Revision: 3318 Url: http://chorem.org/repositories/revision/lima/3318 Log: Begin test refactoring. Added: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java trunk/lima-business/src/test/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -39,16 +39,16 @@ /** * Service for localized rules * - * @author joe + * @author jpepin */ public interface AccountingRules { /** - * Accounts rules + * Account rule : check create account. * - * @param masterAccount - * @param account - * @throws LimaException + * @param masterAccount parent account + * @param account new account + * @throws LimaException if rule validation fails */ void createAccountRules(Account masterAccount, Account account) throws LimaException; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -56,16 +56,20 @@ /** * Defaults rules, if no localized rules classes is instantiated - * this default class contain the strict minimum rules to check the data integrity + * this default class contain the strict minimum rules to check the data integrity. + * + * Rule specialization should override this class. * - * @author joe + * @author jpepin */ public class DefaultAccountingRules implements AccountingRules { protected static final Log log = LogFactory.getLog(DefaultAccountingRules.class); - /** Rules to check before create accounts */ + /** + * Rules to check before create accounts. + */ @Override public void createAccountRules(Account masterAccount, Account account) throws LimaException { @@ -85,8 +89,8 @@ throw new LimaBusinessException(_("lima-business.defaultaccountingrules.invalidaccountnumber", account.getAccountNumber())); } - //check if parentaccount have no subaccount - if (masterAccount.getSubAccounts().size() > 0) { + // check if parentaccount have no subaccount + if (masterAccount.getSubAccounts().isEmpty()) { throw new LimaBusinessException(_("lima-business.defaultaccountingrules.subledgererror")); } } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/AccountService.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,7 +40,6 @@ * Last update : $Date$ * By : $Author$ */ - @Remote public interface AccountService { @@ -74,7 +73,6 @@ * @param account account * @throws LimaException */ - //EJB Remote void createAccount(Account masterAccount, Account account) throws LimaException; @@ -90,6 +88,5 @@ List<Account> getAllChildrenAccounts(Account masterAccount, List<Account> accounts) throws LimaException; - //EJB Remote et local List<Account> getChildrenAccounts(Account masterAccount) throws LimaException; } Added: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java (rev 0) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java 2012-01-12 17:57:53 UTC (rev 3318) @@ -0,0 +1,77 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.chorem.lima.business.accountingrules; + +import org.chorem.lima.business.AccountServiceImplTest; +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Add configuration to add specific test on French rules set. + * + * (redo all test defined in AccountServiceImplTest). + * + * Plus ajout de test specific à la locale FR. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class AccountServiceRuleFrTest extends AccountServiceImplTest { + + @BeforeClass + public static void installFrenchRule() { + LimaConfig.getInstance().setAccountingRule(FranceAccountingRules.class.getName()); + } + + /** + * Test une fois que la regles est correctement instanciée car + * elle peut être mise en cache dans + */ + public void testRuleInstance() { + Assert.assertTrue(LimaConfig.getInstance().getAccountingRules() instanceof FranceAccountingRules); + } + + /** + * Création d'un compte dans le plan comptable. + * + * @throws LimaException + */ + @Test(expected=LimaException.class) + @Override + public void testCreateAccountWrongNumber() throws LimaException { + Account myAccount = new AccountImpl(); + myAccount.setAccountNumber("42"); + accountService.createAccount(null, myAccount); + } +} Property changes on: trunk/lima-business/src/test/java/org/chorem/lima/business/accountingrules/AccountServiceRuleFrTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/lima-business/src/test/resources/log4j.properties =================================================================== --- trunk/lima-business/src/test/resources/log4j.properties 2012-01-12 15:29:21 UTC (rev 3317) +++ trunk/lima-business/src/test/resources/log4j.properties 2012-01-12 17:57:53 UTC (rev 3318) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2008 - 2010 CodeLutin +# Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -31,4 +31,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file +#log4j.logger.org.chorem.lima=DEBUG \ No newline at end of file

1 0

r3317 - trunk/lima-business/src/main/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 16:29:21 +0100 (Thu, 12 Jan 2012) New Revision: 3317 Url: http://chorem.org/repositories/revision/lima/3317 Log: Fix i18n init Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:27:48 UTC (rev 3316) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 15:29:21 UTC (rev 3317) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -40,6 +40,7 @@ import java.io.File; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * Configuration pour le business. @@ -79,9 +80,11 @@ } /** - * instancie la bonne classe de nationalite en fonction du fichier de configuration + * Instancie la bonne classe de nationalite en fonction du fichier de configuration. * - * @return + * L'instance est conservée en cache. + * + * @return l'instance de rule */ public AccountingRules getAccountingRules() { @@ -103,6 +106,10 @@ return accountingRules; } + public void setAccountingRule(String accountingRule) { + setOption(Option.RULES_NATIONALTY.key, accountingRule); + } + public File getDataDir() { File datadir = getOptionAsFile(Option.DATA_DIR.getKey()); return datadir; @@ -170,14 +177,14 @@ */ public enum Option implements OptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima.properties", String.class, true, true), - DATA_DIR("lima.data.dir", _("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), - REPORTS_DIR("lima.reports.dir", _("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), - RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), - HTTP_PORT("lima.httpport", _("lima.config.httpport.description"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", _("lima.config.serveraddress.description"), "", String.class, false, false), - SCALE("lima.scale", _("lima.config.scale.description"), "2", String.class, false, false), - VAT_PDF_URL("lima.report.vatpdfurl", _("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); + CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.configFileName.description"), "lima.properties", String.class, true, true), + DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), + REPORTS_DIR("lima.reports.dir", n_("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), + RULES_NATIONALTY("lima.rules", n_("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), + HTTP_PORT("lima.httpport", n_("lima.config.httpport.description"), "5462", String.class, false, false), + SERVER_ADRESS("lima.serveraddress", n_("lima.config.serveraddress.description"), "", String.class, false, false), + SCALE("lima.scale", n_("lima.config.scale.description"), "2", String.class, false, false), + VAT_PDF_URL("lima.report.vatpdfurl", n_("lima.config.reportvatpdfurl.description"), "default", String.class, false, false); private final String key; @@ -233,7 +240,7 @@ @Override public String getDescription() { - return description; + return _(description); } @Override

1 0

r3316 - trunk/lima-business/src/main/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 12:27:48 +0100 (Thu, 12 Jan 2012) New Revision: 3316 Url: http://chorem.org/repositories/revision/lima/3316 Log: Fix load default options Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:19:12 UTC (rev 3315) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:27:48 UTC (rev 3316) @@ -61,12 +61,8 @@ protected AccountingRules accountingRules; public LimaConfig() { - // set defaut option (included configuration file name : important) - for (Option o : Option.values()) { - if (o.getDefaultValue() != null) { - setDefaultOption(o.key, o.defaultValue); - } - } + // load default options + super(Option.class, null, null, null); setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); setOption(TopiaMigrationService.MIGRATION_CALLBACK, DatabaseMigrationClass.class.getName());

1 0

r3315 - in trunk/lima-business/src: main/java/org/chorem/lima/business test/java/org/chorem/lima/business
by echatellier＠users.chorem.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 12:19:12 +0100 (Thu, 12 Jan 2012) New Revision: 3315 Url: http://chorem.org/repositories/revision/lima/3315 Log: Fix appconfig Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-10 14:01:43 UTC (rev 3314) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-01-12 11:19:12 UTC (rev 3315) @@ -48,9 +48,9 @@ * * @author chatellier * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ + * + * Last update : $Date$ + * By : $Author$ */ public class LimaConfig extends ApplicationConfig { @@ -58,14 +58,14 @@ protected static LimaConfig instance; - protected static final String CONFIGFILE = "lima.properties"; - protected AccountingRules accountingRules; public LimaConfig() { // set defaut option (included configuration file name : important) for (Option o : Option.values()) { - setDefaultOption(o.key, o.defaultValue); + if (o.getDefaultValue() != null) { + setDefaultOption(o.key, o.defaultValue); + } } setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); @@ -77,7 +77,7 @@ public static LimaConfig getInstance() { if (instance == null) { instance = new LimaConfig(); - instance.loadConfiguration(CONFIGFILE); + instance.loadConfiguration(); } return instance; } @@ -96,8 +96,10 @@ } else { try { accountingRules = (AccountingRules) accountingRulesClass.newInstance(); - } catch (Exception e) { - log.error("Can't instantiate accounting rules", e); + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't instantiate accounting rules", ex); + } } } } @@ -151,8 +153,7 @@ * * @param configFileName file name to read */ - protected void loadConfiguration(String configFileName) { - instance.setConfigFileName(configFileName); + protected void loadConfiguration() { try { instance.parse(); } catch (ArgumentsParserException ex) { @@ -173,7 +174,7 @@ */ public enum Option implements OptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima-config.properties", String.class, true, true), + CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima.properties", String.class, true, true), DATA_DIR("lima.data.dir", _("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), REPORTS_DIR("lima.reports.dir", _("lima.config.reports.dir.description"), "${lima.data.dir}/reports", File.class, false, false), RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-10 14:01:43 UTC (rev 3314) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2012-01-12 11:19:12 UTC (rev 3315) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 CodeLutin + * Copyright (C) 2008 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -50,10 +50,11 @@ public static LimaConfig getInstance() { if (instance == null) { instance = new LimaTestConfig(); - // do not call parse() method (don't read /etc... - + + // do not call parse() method (don't read /etc...) + // load file manually (lima.properties) Properties testProperties = new Properties(); - InputStream stream = LimaTestConfig.class.getResourceAsStream("/" + CONFIGFILE); + InputStream stream = LimaTestConfig.class.getResourceAsStream("/" + Option.CONFIG_FILE.getDefaultValue()); try { testProperties.load(stream);

1 0

r3314 - trunk
by echatellier＠users.chorem.org 10 Jan '12

10 Jan '12

Author: echatellier Date: 2012-01-10 15:01:43 +0100 (Tue, 10 Jan 2012) New Revision: 3314 Url: http://chorem.org/repositories/revision/lima/3314 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) +++ trunk/pom.xml 2012-01-10 14:01:43 UTC (rev 3314) @@ -311,13 +311,13 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.5</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <slf4jVersion>1.6.4</slf4jVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3313 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 10 Jan '12

10 Jan '12

Author: echatellier Date: 2012-01-10 14:59:55 +0100 (Tue, 10 Jan 2012) New Revision: 3313 Url: http://chorem.org/repositories/revision/lima/3313 Log: #390 : Update to jetty 8.0.4.v20111024 Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -39,15 +39,10 @@ <artifactId>pdfbox</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2012-01-10 13:59:55 UTC (rev 3313) @@ -25,6 +25,26 @@ package org.chorem.lima.business.ejb; +import static org.nuiton.i18n.I18n._; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.time.DateUtils; import org.chorem.lima.business.LimaConfig; @@ -34,33 +54,15 @@ import org.chorem.lima.business.ejbinterface.HttpServerServiceLocal; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ContextHandler.Context; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; import org.hibernate.exception.GenericJDBCException; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; import org.nuiton.util.FileUtil; import org.nuiton.util.Resource; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URL; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import static org.nuiton.i18n.I18n._; - - @Stateless public class HttpServerServiceImpl extends AbstractLimaService implements HttpServerService, HttpServerServiceLocal { @@ -80,7 +82,6 @@ port = LimaConfig.getInstance().getHttpPort(); } - /** start the server */ @Override public void start() { @@ -91,8 +92,10 @@ server = new Server(port); - Context root = new Context(server, "/", Context.NO_SESSIONS); - root.addServlet(new ServletHolder((Servlet) new MainServlet()), "/"); + ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS); + context.setContextPath("/"); + context.addServlet(new ServletHolder(new MainServlet()),"/"); + server.setHandler(context); server.start(); log.info("Web server are running on port: " + port); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 10:49:33 UTC (rev 3312) +++ trunk/pom.xml 2012-01-10 13:59:55 UTC (rev 3313) @@ -199,16 +199,10 @@ </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>6.1.25</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>8.0.4.v20111024</version> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5-6.0.1</version> - <scope>runtime</scope> - </dependency>  <dependency>

1 0