[Suiviobsmer-commits] r671 - in trunk/wao-business/src/test/java/fr/ifremer/wao: . entity service
Author: tchemit Date: 2010-10-13 11:48:46 +0000 (Wed, 13 Oct 2010) New Revision: 671 Log: rename field logger to log + add some fixme + close some stream Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-10-13 11:48:46 UTC (rev 671) @@ -69,6 +69,7 @@ private static TestManager manager; + //FIXME tchemit 2010-10-13 : on ne met pas ce genre d'objet en attibut, ou bien on s'assure qu'ils seront bien fermer dans une AfterClass private static Writer writerAll; private static Writer writerKos; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/WaoUserImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -34,7 +34,8 @@ */ public class WaoUserImplTest { - private static final Logger logger = LoggerFactory.getLogger(WaoUserImplTest.class); + private static final Logger log = + LoggerFactory.getLogger(WaoUserImplTest.class); @Test Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -54,7 +54,8 @@ private static TestManager manager; - private static final Logger log = LoggerFactory.getLogger(ActivityCalendarImportTest.class); + private static final Logger log = + LoggerFactory.getLogger(ActivityCalendarImportTest.class); public ActivityCalendarImportTest() { } @@ -106,10 +107,13 @@ Assert.assertTrue(file.exists()); BufferedReader reader = new BufferedReader(new FileReader(file)); - String line = null; + try {String line; while ((line = reader.readLine()) != null) { log.info(line); } + } finally { + reader.close(); + } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -259,7 +259,7 @@ row2.setCompany(company); serviceSampling.createUpdateSampleRow(row2, new ArrayList<Boat>(), new SampleRowLogImpl()); - return Arrays.asList(new SampleRow[] { row1, row2}); + return Arrays.asList(row1, row2); } @Test @@ -428,11 +428,15 @@ Assert.assertTrue(file.exists()); BufferedReader reader = new BufferedReader(new FileReader(file)); + try { String line = reader.readLine(); Assert.assertTrue(line.contains("Jean Michmuche")); Assert.assertTrue(line.contains("TARTANPION")); Assert.assertTrue(line.contains("TESTBOAT")); Assert.assertTrue(line.contains("174592")); + } finally { + reader.close(); + } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -51,14 +51,14 @@ */ public class ServiceCartographyImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceCartographyImplTest.class); private ServiceCartography service; @Before public void initialize() { - logger.info("initialize ServiceCartographyImplTest"); + log.info("initialize ServiceCartographyImplTest"); service = manager.getServiceCartography(); } @@ -126,6 +126,7 @@ Company company2 = createCompany("BIS"); prepareContactsData(company, company2); + //FIXME tchemit 2010-10-13 : Ca sert a quoi, on teste rien ? InputStream input = getClass().getResourceAsStream("/import/boat_districts.kml"); ImportResults results = service.importBoatDistrictKml(input); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -48,20 +48,20 @@ */ public class ServiceContactImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceContactImplTest.class); private ServiceContact service; @Before public void initialize() { - logger.info("initialize ServiceContactImplTest"); + log.info("initialize ServiceContactImplTest"); service = manager.getServiceContact(); } @Test public void testGetContactsFilteredByObserver() throws TopiaException { - logger.info("getContactsFilteredByObserver"); + log.info("getContactsFilteredByObserver"); /** PREPARE DATA **/ Contact contact = createDefaultContact(); @@ -70,14 +70,14 @@ ContactFilter filter = new ContactFilterImpl(); filter.setObserver(findDefaultObserver()); - logger.info("test 1 : Ok good filter, contact is correctly returned"); + log.info("test 1 : Ok good filter, contact is correctly returned"); Map<String, Contact> results = service.getContacts(filter); Assert.assertEquals(1, results.size()); Contact contactFind = results.get(contact.getTopiaId()); Assert.assertEquals(contact, contactFind); - logger.info("test 2 : Bad filter, no contact is returned"); + log.info("test 2 : Bad filter, no contact is returned"); WaoUser observer2 = createUser("marge", UserRole.OBSERVER, findDefaultCompany()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -88,7 +88,7 @@ private static TestManager manager; - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceContactInternalTest.class); private ServiceContactImpl service; @@ -134,7 +134,7 @@ protected void prepareData(boolean needBoat, boolean needObserver) throws TopiaException { - logger.info("Prepare data :"); + log.info("Prepare data :"); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -155,13 +155,13 @@ SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - logger.info("SampleRow : 2010_0001"); + log.info("SampleRow : 2010_0001"); sampleRow = rowDAO.create(SampleRow.CODE, "2010_0001", SampleRow.COMPANY, company); SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); - logger.info("SampleMonth : 03/2010 _ row 2010_0001"); + log.info("SampleMonth : 03/2010 _ row 2010_0001"); Date monthDate = DateUtil.createDate(1, 3, 2010); sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); @@ -188,13 +188,13 @@ @Test public void testGetExistingSampleMonthForContact() throws TopiaException, NullSampleMonthException { - logger.info("testGetExistingSampleMonthForContact"); + log.info("testGetExistingSampleMonthForContact"); // /** PREPARE DATA **/ // prepareData(false, false); // // /** EXEC METHOD **/ -// logger.info("test 1 : SampleMonth exists for contact"); +// log.info("test 1 : SampleMonth exists for contact"); // TopiaContext transaction = manager.getContext().beginTransaction(); // try { // SampleMonthDAO monthDAO = @@ -212,7 +212,7 @@ // transaction.closeContext(); // } // -// logger.info("test 2 : contact tideBeginDate doesn't match with any" + +// log.info("test 2 : contact tideBeginDate doesn't match with any" + // " SampleMonth"); // transaction = manager.getContext().beginTransaction(); // try { @@ -225,7 +225,7 @@ // service.getExistingSampleMonthForContact(monthDAO, // contact.getSampleRow(), contact.getTideBeginDate()); // } catch (Exception eee) { -// logger.error("Error : " + eee.getMessage()); +// log.error("Error : " + eee.getMessage()); // assertEquals(NullSampleMonthException.class, eee.getClass()); // } finally { // transaction.closeContext(); @@ -235,7 +235,7 @@ @Test public void testUpdateSampleMonthTidesValue() throws TopiaException, NullSampleMonthException { - logger.info("testUpdateSampleMonthTidesValue"); + log.info("testUpdateSampleMonthTidesValue"); /** PREPARE DATA **/ prepareData(false, false); @@ -247,7 +247,7 @@ when(contact.getValidationProgram()).thenReturn(null); /** EXEC METHOD **/ - logger.info("test 1 : ContactState changed from null to BOARDING_DONE" + + log.info("test 1 : ContactState changed from null to BOARDING_DONE" + " -> increment estimated tides value"); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -262,10 +262,10 @@ transaction.closeContext(); } - logger.info("test 1 : verification sampleMonth estimated tides = 1"); + log.info("test 1 : verification sampleMonth estimated tides = 1"); checkTidesValue(1, false); - logger.info("test 2 : ContactState changed from BOARDING_DONE to " + + log.info("test 2 : ContactState changed from BOARDING_DONE to " + "BOAT_REFUSED -> decrement estimated tides value"); transaction = manager.getContext().beginTransaction(); try { @@ -283,14 +283,14 @@ transaction.closeContext(); } - logger.info("test 2 : verification sampleMonth estimated tides = 0"); + log.info("test 2 : verification sampleMonth estimated tides = 0"); checkTidesValue(0, false); // Reset contactState to BOARDING_DONE for next test when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); - logger.info("test 3 : CompanyValidation changed from null to " + + log.info("test 3 : CompanyValidation changed from null to " + "FALSE -> do nothing"); transaction = manager.getContext().beginTransaction(); try { @@ -306,10 +306,10 @@ transaction.closeContext(); } - logger.info("test 3 : verification sampleMonth real tides = 0"); + log.info("test 3 : verification sampleMonth real tides = 0"); checkTidesValue(0, true); - logger.info("test 4 : CompanyValidation changed from FALSE to " + + log.info("test 4 : CompanyValidation changed from FALSE to " + "TRUE -> increment real tides value"); transaction = manager.getContext().beginTransaction(); try { @@ -326,13 +326,13 @@ transaction.closeContext(); } - logger.info("test 4 : verification sampleMonth real tides = 1"); + log.info("test 4 : verification sampleMonth real tides = 1"); checkTidesValue(1, true); // ContactReference after saving contact will normally have this value : when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); - logger.info("test 5 : CompanyValidation doesn't changed but " + + log.info("test 5 : CompanyValidation doesn't changed but " + "ProgramValidation is set to FALSE -> decrement real tides"); transaction = manager.getContext().beginTransaction(); try { @@ -346,10 +346,10 @@ transaction.closeContext(); } - logger.info("test 5 : verification sampleMonth real tides = 0"); + log.info("test 5 : verification sampleMonth real tides = 0"); checkTidesValue(0, true); - logger.info("test 6 : Prepare data for delete case"); + log.info("test 6 : Prepare data for delete case"); // PREPARE DATA : update estimated to 1 and real to 1 transaction = manager.getContext().beginTransaction(); try { @@ -375,7 +375,7 @@ when(contactReference.getValidationProgram()).thenReturn(Boolean.TRUE); when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); - logger.info("test 6 : Delete contact (new contact is null) -> " + + log.info("test 6 : Delete contact (new contact is null) -> " + "decrement realTides and estimatedTides"); transaction = manager.getContext().beginTransaction(); try { @@ -389,12 +389,12 @@ transaction.closeContext(); } - logger.info("test 6 : verification sampleMonth real tides = 0" + + log.info("test 6 : verification sampleMonth real tides = 0" + "and estimated tides = 0"); checkTidesValue(0, true); checkTidesValue(0, false); - logger.info("test 7 : SampleMonth will change from 03/2010 to 04/2010" + + log.info("test 7 : SampleMonth will change from 03/2010 to 04/2010" + " -> decrement estimated tides from oldMonth"); transaction = manager.getContext().beginTransaction(); try { @@ -415,10 +415,10 @@ transaction.closeContext(); } - logger.info("test 7 : verification old sampleMonth estimated tides = 0"); + log.info("test 7 : verification old sampleMonth estimated tides = 0"); checkTidesValue(0, false); - logger.info("test 7 : verification new sampleMonth estimated " + + log.info("test 7 : verification new sampleMonth estimated " + "tides = 1 and real tides = 1"); transaction = manager.getContext().beginTransaction(); try { @@ -440,7 +440,7 @@ @Test public void testDecrementSampleMonthContactRefused() throws TopiaException, NullSampleMonthException { - logger.info("testDecrementSampleMonthContactRefused"); + log.info("testDecrementSampleMonthContactRefused"); /** PREPARE DATA **/ prepareData(false, false); @@ -477,7 +477,7 @@ checkTidesValue(1, true); /** EXEC METHOD **/ - logger.info("test 1 : validationProgram null -> FALSE, estimated -1" + + log.info("test 1 : validationProgram null -> FALSE, estimated -1" + " and real -1"); transaction = manager.getContext().beginTransaction(); try { @@ -497,7 +497,7 @@ checkTidesValue(0, false); checkTidesValue(0, true); - logger.info("test 2 : validationProgram FALSE -> null, estimated +1" + + log.info("test 2 : validationProgram FALSE -> null, estimated +1" + " and real +1"); transaction = manager.getContext().beginTransaction(); try { @@ -538,7 +538,7 @@ IOException, ImportRefusedException, ParseException { - logger.info("testLoadContactCsv"); + log.info("testLoadContactCsv"); /** PREPARE DATA **/ prepareData(true, true); @@ -581,7 +581,7 @@ /** EXEC METHOD **/ - logger.info("test 1 : load contact by Creator jmichmuche -> no error"); + log.info("test 1 : load contact by Creator jmichmuche -> no error"); ContactInput result = new ContactInput(); TopiaContext transaction = manager.getContext().beginTransaction(); try { @@ -610,34 +610,34 @@ transaction.closeContext(); } - logger.info("test 2 : Error on boat"); + log.info("test 2 : Error on boat"); when(reader.get(BOAT.NAVS_COD.name())).thenReturn("2222"); checkImportError(Contact.BOAT); // Reinit boat when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); - logger.info("test 3 : Error on company"); + log.info("test 3 : Error on company"); when(creator.getCompany()).thenReturn(null); checkImportError(WaoUser.COMPANY); // Reinit creator company when(creator.getCompany()).thenReturn(company); - logger.info("test 4 : Error on observer"); + log.info("test 4 : Error on observer"); when(reader.get(CONTACT.OBSERV_ID.name())).thenReturn("FAKE"); checkImportError(Contact.OBSERVER); // Reinit observer when(reader.get(CONTACT.OBSERV_ID.name())). thenReturn(observer.getLogin()); - logger.info("test 5 : Error on sampleRow"); + log.info("test 5 : Error on sampleRow"); when(reader.get(SAMPLING.PLAN_CODE.name())).thenReturn("FAKE"); checkImportError(Contact.SAMPLE_ROW); // Reinit sampleRow when(reader.get(SAMPLING.PLAN_CODE.name())). thenReturn(sampleRow.getCode()); - logger.info("test 6 : Error on state"); + log.info("test 6 : Error on state"); when(reader.get(CONTACT.CONT_ETAT.name())).thenReturn("FAKE"); checkImportError(Contact.STATE); // Reinit state @@ -652,7 +652,7 @@ result.initialize(transaction, creator, 1); service.loadContactCsv(reader, result, false); } catch (Exception eee) { - logger.error("Error : " + eee.getMessage()); + log.error("Error : " + eee.getMessage()); assertEquals(ImportRefusedException.class, eee.getClass()); ImportRefusedException ex = (ImportRefusedException)eee; assertEquals(field, ex.getField()); @@ -664,7 +664,7 @@ @Test public void testCreateOrUpdateContact() throws TopiaException, NullSampleMonthException { - logger.info("testCreateOrUpdateContact"); + log.info("testCreateOrUpdateContact"); /** PREPARE DATA **/ prepareData(true, true); @@ -675,7 +675,7 @@ /** EXEC METHOD **/ - logger.info("test 1 : Create new contact with state CONTACT_START"); + log.info("test 1 : Create new contact with state CONTACT_START"); TopiaContext transaction = null; String newTopiaId = null; try { @@ -694,7 +694,7 @@ } } - logger.info("test 1 : Check contact existence"); + log.info("test 1 : Check contact existence"); try { transaction = manager.getContext().beginTransaction(); @@ -713,7 +713,7 @@ } } - logger.info("test 2 : Update the contact with state BOARDING_DONE, " + + log.info("test 2 : Update the contact with state BOARDING_DONE, " + "tideBeginDate, tideEndDate and NbObservants"); Date tideBeginDate = DateUtil.createDate(18,3,2010); Date tideEndDate = DateUtil.createDate(19,3,2010); @@ -736,7 +736,7 @@ } } - logger.info("test 2 : Check update contact"); + log.info("test 2 : Check update contact"); try { transaction = manager.getContext().beginTransaction(); @@ -767,7 +767,7 @@ @Test public void testImportContactCsv() throws TopiaException, WaoBusinessException, IOException { - logger.info("testImportContactCsv"); + log.info("testImportContactCsv"); /** PREPARE DATA **/ prepareData(true, true); @@ -777,7 +777,7 @@ when(creator.getLogin()).thenReturn(observer.getLogin()); /** EXEC METHOD **/ - logger.info("test 1 : Import new contact with observer creator"); + log.info("test 1 : Import new contact with observer creator"); InputStream input = getClass().getResourceAsStream("/import/contacts.csv"); try { @@ -789,7 +789,7 @@ input.close(); } - logger.info("test 1 : Check creation of the contact"); + log.info("test 1 : Check creation of the contact"); TopiaContext transaction = null; try { transaction = manager.getContext().beginTransaction(); @@ -807,7 +807,7 @@ } } - logger.info("test 2 : Import new contact with super admin creator"); + log.info("test 2 : Import new contact with super admin creator"); when(creator.getCompany()).thenReturn(company); when(creator.isAdmin()).thenReturn(true); when(creator.getLogin()).thenReturn("admin"); @@ -822,7 +822,7 @@ input.close(); } - logger.info("test 2 : Check update validations of the contact"); + log.info("test 2 : Check update validations of the contact"); try { transaction = manager.getContext().beginTransaction(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -63,14 +63,14 @@ */ public class ServiceSynthesisImplTest extends AbstractServiceTest { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceSynthesisImplTest.class); private ServiceSynthesis service; @Before public void initialize() { - logger.info("initialize ServiceSynthesisImplTest"); + log.info("initialize ServiceSynthesisImplTest"); service = manager.getServiceSynthesis(); } @@ -107,7 +107,7 @@ */ @Test public void testGetBoardingBoats() throws Exception { - logger.info("getBoardingBoats"); + log.info("getBoardingBoats"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -195,7 +195,7 @@ */ @Test public void testGetNonComplianceBoardingIndicator() throws Exception { - logger.info("getNonComplianceBoardingIndicator"); + log.info("getNonComplianceBoardingIndicator"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -302,7 +302,7 @@ */ @Test public void testGetContactStateStatistics() throws Exception { - logger.info("getContactStateStatistics"); + log.info("getContactStateStatistics"); /** PREPARE DATA **/ // InputStream input = getClass().getResourceAsStream("/import/navires.csv"); // ServiceBoat serviceBoat = manager.getServiceBoat(); @@ -465,7 +465,7 @@ */ @Test public void testGetContactDataInputDateReactivity() throws Exception { - logger.info("getContactDataInputDateReactivity"); + log.info("getContactDataInputDateReactivity"); /** PREPARE DATA **/ InputStream input = getClass().getResourceAsStream("/import/navires.csv"); ServiceBoat serviceBoat = manager.getServiceBoat(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-10-13 11:48:18 UTC (rev 670) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-10-13 11:48:46 UTC (rev 671) @@ -49,7 +49,7 @@ private static TestManager manager; - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceUserImplTest.class); private ServiceUser service; @@ -130,7 +130,7 @@ */ @Test public void testGetObservers() throws Exception { - logger.info("## START ## getObservers"); + log.info("## START ## getObservers"); Company company = new CompanyImpl(); company.setName("TARTANPION"); @@ -193,7 +193,7 @@ */ @Test public void testCreateDefaultAdmin() throws Exception { - logger.info("## START ## createDefaultAdmin"); + log.info("## START ## createDefaultAdmin"); service.createDefaultAdmin();
participants (1)
-
tchemit＠users.labs.libre-entreprise.org