This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit a88940fa95542bc7f2174f944fedd7a02f448ff9 Author: David Cossé <cosse@codelutin.com> Date: Fri Jul 8 19:16:21 2016 +0200 refs #1207 retrait de la signature de méthode des exceptions non remontées --- .../org/chorem/lima/business/AbstractLimaTest.java | 19 +++---------------- .../chorem/lima/business/ImportExportServiceTest.java | 10 ++++++++-- .../chorem/lima/report/service/DocumentService.java | 2 +- .../src/main/java/org/chorem/lima/LimaMain.java | 5 ++--- .../org/chorem/lima/LimaSwingApplicationContext.java | 3 +-- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 6ddf862..bbfeb59 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -55,14 +55,12 @@ import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.chorem.lima.entity.LimaCallaoTopiaApplicationContext; import org.hibernate.cfg.Environment; -import org.junit.After; import org.junit.Before; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.topia.persistence.TopiaApplicationContextCache; import java.io.File; -import java.io.IOException; import java.math.BigDecimal; import java.text.DateFormat; import java.util.Date; @@ -122,15 +120,14 @@ public abstract class AbstractLimaTest { context = createNewTestApplicationContext(); } - protected void setUpLocale() throws Exception { + protected void setUpLocale() { I18n.init(new ClassPathI18nInitializer(), Locale.UK); } /** * Init services after i18n#init(). - * @throws java.io.IOException */ - protected void initServices() throws IOException { + protected void initServices() { if(accountService == null) { LimaServiceFactory.initFactory(LimaBusinessConfig.getInstance().getConfig()); accountService = LimaServiceFactory.getService(AccountService.class); @@ -169,11 +166,6 @@ public abstract class AbstractLimaTest { return testProperties; } - @After - public void cleanDatabase() throws Exception { - //context.dropSchema(); - } - /** * Method to use only for class that need a context to be tester. @@ -200,13 +192,9 @@ public abstract class AbstractLimaTest { * Not called by default (<code>@Before</code>) to allow init test with * CSV or EBP import. * - * @throws org.chorem.lima.business.exceptions.LimaException - * @throws java.text.ParseException */ - protected void initTestDatabase() throws Exception { - + protected void initTestDatabase() { context.createSchema(); - } /** @@ -345,5 +333,4 @@ public abstract class AbstractLimaTest { return transaction; } - } diff --git a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java index d76cd5e..4e147a7 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/ImportExportServiceTest.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.BeginAfterEndFiscalPeriodException; -import org.chorem.lima.business.exceptions.ImportEbpException; import org.chorem.lima.business.exceptions.ImportFileException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.MoreOneUnlockFiscalPeriodException; @@ -46,6 +45,7 @@ import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.entity.Identity; import org.chorem.lima.entity.IdentityImpl; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import java.io.BufferedWriter; @@ -615,7 +615,7 @@ public class ImportExportServiceTest extends AbstractLimaTest { } protected void importEBPData() throws IOException, ParseException, BeginAfterEndFiscalPeriodException, - NotBeginNextDayOfLastFiscalPeriodException, MoreOneUnlockFiscalPeriodException, ImportEbpException { + NotBeginNextDayOfLastFiscalPeriodException, MoreOneUnlockFiscalPeriodException { // create fiscal period (mandatory for import) FiscalPeriod fiscalPeriod = new FiscalPeriodImpl(); @@ -673,4 +673,10 @@ public class ImportExportServiceTest extends AbstractLimaTest { Assert.assertNotNull(compteTiers); Assert.assertNotNull(employeAccount); } + + @Test + @Ignore + public void getLimaTestDefaultConfFilename() { + context.showCreateSchema(); + } } diff --git a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java index 4ce1035..fffb871 100644 --- a/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java +++ b/lima-report/src/main/java/org/chorem/lima/report/service/DocumentService.java @@ -154,7 +154,7 @@ public class DocumentService { financialReport = constructHtmlHeader(""); //Split list by financialstatement type - List<List<FinancialStatementAmounts>> listList = new ArrayList<List<FinancialStatementAmounts>>(); + List<List<FinancialStatementAmounts>> listList = new ArrayList<>(); Boolean first = true; int min = 0; int size = financialStatementAmounts.size(); diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index 4cec550..95b0f59 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -25,8 +25,8 @@ package org.chorem.lima; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.LimaServiceFactory; +import org.chorem.lima.business.api.AccountService; import org.chorem.lima.server.LimaServer; import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; @@ -35,7 +35,6 @@ import org.chorem.lima.ui.opening.OpeningView; import javax.swing.*; import java.util.Arrays; import java.util.Date; -import java.util.Locale; import static org.nuiton.i18n.I18n.t; @@ -117,7 +116,7 @@ public class LimaMain { return context; } - protected static void launch(LimaSwingApplicationContext context) throws Exception { + protected static void launch(LimaSwingApplicationContext context) { // prepare ui look&feel and load ui properties try { diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java index d4a3c55..bbbea34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingApplicationContext.java @@ -133,9 +133,8 @@ public class LimaSwingApplicationContext extends DefaultApplicationContext { /** * close the application's context. * - * @throws Exception if any pb while closing */ - public void close() throws Exception { + public void close() { if (log.isDebugEnabled()) { log.debug("closing context " + this); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.