Author: bleny Date: 2010-10-22 10:35:35 +0000 (Fri, 22 Oct 2010) New Revision: 704 Log: fix tests ; should make build stable Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 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-22 09:31:53 UTC (rev 703) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-10-22 10:35:35 UTC (rev 704) @@ -30,6 +30,8 @@ import fr.ifremer.wao.bean.ContactAverageReactivity; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ContactStateStatistics; +import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; @@ -181,7 +183,8 @@ serviceContact.saveContact(contact3, false); /** EXEC METHOD **/ - BoardingResult result = service.getBoardingBoats(null, null); + SamplingFilter filter = new SamplingFilterImpl(); + BoardingResult result = service.getBoardingBoats(filter); // one boat with one boarding (177474) assertEquals(1, result.getData().get("1").intValue()); // one boat with two boardings (174258) @@ -278,8 +281,10 @@ /** EXEC METHOD **/ // result for company TARTANPION + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); Map<String, Double> results = - service.getComplianceBoardingIndicator(company); + service.getComplianceBoardingIndicator(filter); assertEquals(1, results.size()); @@ -288,7 +293,8 @@ assertEquals(1., value, 0); // result for company BIS using admin mode (no company filtered) - results = service.getComplianceBoardingIndicator(null); + filter = new SamplingFilterImpl(); + results = service.getComplianceBoardingIndicator(filter); assertEquals(2, results.size()); @@ -414,8 +420,10 @@ /** EXEC METHOD **/ // result for company TARTANPION with no period + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); Collection<ContactStateStatistics> results = - service.getContactStateStatistics(company, null); + service.getContactStateStatistics(filter); assertEquals(1, results.size()); ContactStateStatistics result = (ContactStateStatistics)CollectionUtils.get(results, 0); @@ -428,7 +436,8 @@ assertEquals(1, data.get(ContactState.BOAT_REFUSED).intValue()); // result for company BIS using admin mode - results = service.getContactStateStatistics(null, null); + filter = new SamplingFilterImpl(); + results = service.getContactStateStatistics(filter); assertEquals(2, results.size()); result = null; @@ -449,7 +458,10 @@ Date end = DateUtil.createDate(31, 3, 2010); PeriodDates period = new PeriodDates(begin, end); - results = service.getContactStateStatistics(company2, period); + filter = new SamplingFilterImpl(); + filter.setCompany(company2); + filter.setPeriod(period); + results = service.getContactStateStatistics(filter); assertEquals(1, results.size()); result = (ContactStateStatistics)CollectionUtils.get(results, 0); @@ -460,7 +472,7 @@ assertEquals(0, data.get(ContactState.BOAT_UNAVAILABLE).intValue()); } - /** + /** * Test of getBoardingBoats method, of class ServiceSynthesisImpl. */ @Test @@ -547,10 +559,13 @@ /** EXEC METHOD **/ PeriodDates period = new PeriodDates(begin, begin); + SamplingFilter filter = new SamplingFilterImpl(); + filter.setCompany(company); + filter.setPeriod(period); // result for company TARTANPION Collection<ContactAverageReactivity> results = - service.getContactDataInputDateReactivity(company, period); + service.getContactDataInputDateReactivity(filter); assertEquals(1, results.size()); @@ -561,7 +576,9 @@ assertEquals(27., res.getResult(), 0.01); // result for company BIS using admin mode (no company filtered) - results = service.getContactDataInputDateReactivity(null, period); + filter = new SamplingFilterImpl(); + filter.setPeriod(period); + results = service.getContactDataInputDateReactivity(filter); // 0 days for contact3 / 1 = O days res = (ContactAverageReactivity)CollectionUtils.get(results, 0);