Author: bleny Date: 2011-06-10 16:35:23 +0000 (Fri, 10 Jun 2011) New Revision: 1336 Log: refactoring tests Added: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsMerTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/Fixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsDebFixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java Removed: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebPhoneTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/AbstractServiceTest.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/ServiceContactTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -133,8 +133,8 @@ public String toString() { StringBuilder toStringBuilder = new StringBuilder(); toStringBuilder.append(getFullName()).append(" (") - .append(getUser().getCompany().getName()) - .append(getProfile().getDescription()); + .append(getUser().getCompany().getName()).append(", ") + .append(getProfile().getDescription()).append(")"); return toStringBuilder.toString(); } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFieldWorkTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -34,6 +34,7 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.bean.ValidationResult; +import fr.ifremer.wao.business.fixtures.ObsDebFixtures; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ObsDebCode; @@ -44,7 +45,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; @@ -77,13 +77,8 @@ "PLAN_CODE;REGION_IFREMER_COD;OBSERVATEUR_COD;OBSERVATION_DATE;UNITE_OBSERVATION_COD;OBSERVATEURS;LIGNE_SANS_CONTACTS\n" + "2011_890;GA;OBS1;13/02/2010;UO007;josh;N"; - protected ObsDebFixtures fixtures; + protected ObsDebFixtures fixtures = new ObsDebFixtures(manager); - @Before - public void setUpFixtures() { - fixtures = new ObsDebFixtures(manager); - } - /** * As an admin, i must be able to import terrestrial divisions */ Deleted: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -1,146 +0,0 @@ -package fr.ifremer.wao.business; - -import fr.ifremer.wao.WaoServices; -import fr.ifremer.wao.WaoBusinessException; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.UserRole; -import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.CompanyImpl; -import fr.ifremer.wao.entity.UserProfile; -import fr.ifremer.wao.entity.UserProfileImpl; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.entity.WaoUserImpl; -import fr.ifremer.wao.service.ServiceBoat; - -import java.io.InputStream; - -public class ObsDebFixtures { - - protected WaoServices manager; - - protected WaoUser josh; - protected Company codeLutin; - protected Company ifremer; - protected Boat moise; - protected Boat samourai; - - protected boolean boatsImported; - - public ObsDebFixtures(WaoServices manager) { - this.manager = manager; - } - - public Company codeLutin() { - if (codeLutin == null) { - codeLutin = new CompanyImpl(); - codeLutin.setName("Code Lutin"); - codeLutin.setActive(true); - manager.getServiceUser().createUpdateCompany(codeLutin); - } - return codeLutin; - } - - public Company ifremer() { - if (ifremer == null) { - ifremer = new CompanyImpl(); - ifremer.setName("Ifremer"); - ifremer.setActive(true); - manager.getServiceUser().createUpdateCompany(ifremer); - } - return ifremer; - } - - public void boats() { - if ( ! boatsImported) { - ServiceBoat serviceBoat = manager.getServiceBoat(); - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - try { - serviceBoat.importBoatCsv(input); - } catch (WaoBusinessException e) { - throw new RuntimeException(e); - } - } - } - - public Boat samourai() { - if (samourai == null) { - boats(); - ServiceBoat serviceBoat = manager.getServiceBoat(); - try { - samourai = serviceBoat.getBoat(174258); - } catch (WaoBusinessException e) { - throw new RuntimeException(e); - } - } - return samourai; - } - - public Boat moise() { - if (moise == null) { - boats(); - ServiceBoat serviceBoat = manager.getServiceBoat(); - try { - moise = serviceBoat.getBoat(273129); - } catch (WaoBusinessException e) { - throw new RuntimeException(e); - } - } - return moise; - } - - public WaoUser josh() { - if (josh == null) { - josh = new WaoUserImpl(); - josh.setLogin("josh"); - josh.setFirstName("Joshua"); - josh.setLastName("B."); - josh.setPassword(manager.getContext().encodeString("mdp")); - josh.setActive(true); - josh.setCompany(codeLutin()); - UserProfile adminProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.ADMIN, true); - UserProfile coordinatorProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.COORDINATOR, true); - UserProfile observerProfile = new UserProfileImpl(ObsProgram.OBSDEB, UserRole.OBSERVER, true); - josh.addUserProfile(adminProfile); - josh.addUserProfile(coordinatorProfile); - josh.addUserProfile(observerProfile); - try { - manager.getServiceUser().createUpdateUser(josh, false); - } catch (WaoBusinessException e) { - throw new RuntimeException(e); - } - josh.setPassword("mdp"); - } - return josh; - } - - protected ConnectedUser joshAs(UserRole userRole) { - // first, log in as josh - ConnectedUser connectedUser = null; - try { - connectedUser = manager.getServiceUser().connect(josh().getLogin(), josh().getPassword()); - } catch (WaoBusinessException e) { - throw new RuntimeException(e); - } - // then choose profile - for (UserProfile userProfile : josh().getUserProfile()) { - if (userProfile.getUserRole() == userRole) { - connectedUser.setProfile(userProfile); - } - } - return connectedUser; - } - - public ConnectedUser joshAsAdministrator() { - return joshAs(UserRole.ADMIN); - } - - public ConnectedUser joshAsCoordinator() { - return joshAs(UserRole.COORDINATOR); - } - - public ConnectedUser joshAsObserver() { - return joshAs(UserRole.OBSERVER); - } -} \ No newline at end of file Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebPhoneTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebPhoneTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebPhoneTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -3,6 +3,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ObservationType; +import fr.ifremer.wao.business.fixtures.ObsDebFixtures; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ObsDebCode; @@ -11,7 +12,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.time.DateUtils; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.nuiton.util.DateUtil; import org.slf4j.Logger; @@ -31,13 +31,8 @@ "PLAN_CODE;REGION_IFREMER;SOCIETE;OBSERVATEUR_COD;OBSERVATION_DATE;NAVIRE_COD;OBSERVATEURS\n" + "2011_901;MA;Code Lutin;OBS1;6/2010;174258;"; - protected ObsDebFixtures fixtures; + protected ObsDebFixtures fixtures = new ObsDebFixtures(manager); - @Before - public void setUpFixtures() { - fixtures = new ObsDebFixtures(manager); - } - @Test public void adminCanImportPhoneSamplingPlan() throws WaoBusinessException { manager.setCurrentDate(2, 1, 2010); Added: trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsMerTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsMerTest.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsMerTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -0,0 +1,42 @@ +package fr.ifremer.wao.business; + +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.business.fixtures.ObsMerFixtures; +import fr.ifremer.wao.io.ImportResults; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; + +public class ObsMerTest extends AbstractBusinessTest { + + private static final Logger log = + LoggerFactory.getLogger(ObsMerTest.class); + + @Rule + public ObsMerFixtures fixtures = new ObsMerFixtures(manager); + + @Test + public void adminCanImportSamplingPlan() { + + fixtures.tartanpion(); + fixtures.bis(); + fixtures.fishingZones(); + + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + ImportResults result = serviceSampling.importSamplingPlanCsv(input, fixtures.jeanMichmucheAsAdmin()); + Assert.assertEquals(12, result.getNbRowsImported()); + Assert.assertEquals(1, result.getNbRowsRefused()); + } catch (WaoBusinessException e) { + log.error("error while importing sampling plan", e); + } finally { + IOUtils.closeQuietly(input); + } + } +} Copied: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/Fixtures.java (from rev 1327, trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java) =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/Fixtures.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/Fixtures.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -0,0 +1,161 @@ +package fr.ifremer.wao.business.fixtures; + +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.WaoServices; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.CompanyImpl; +import fr.ifremer.wao.entity.UserProfile; +import fr.ifremer.wao.entity.UserProfileImpl; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserImpl; +import fr.ifremer.wao.service.ServiceBoat; +import org.junit.rules.ExternalResource; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + +public abstract class Fixtures extends ExternalResource { + + protected WaoServices manager; + + protected Map<String, Company> companies = new HashMap<String, Company>(); + + protected Map<String, WaoUser> waoUsers = new HashMap<String, WaoUser>(); + + protected Map<Integer, Boat> boats; + + protected TopiaContext transaction; + + public Fixtures(WaoServices manager) { + if (manager == null) { + throw new NullPointerException(); + } + this.manager = manager; + } + + @Override + public void before() {} + + @Override + public void after() { + if (transaction != null && ! transaction.isClosed()) { + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new RuntimeException(e); + } + } + } + + protected TopiaContext getTransaction() { + if (transaction == null) { + try { + transaction = manager.getContext().beginTransaction(); + } catch (TopiaException e) { + throw new RuntimeException(e); + } + } + return transaction; + } + + protected abstract ObsProgram getObsProgram(); + + protected Company getCompany(String name) { + Company company = companies.get(name); + if (company == null) { + company = new CompanyImpl(); + company.setName(name); + company.setActive(true); + manager.getServiceUser().createUpdateCompany(company); + companies.put(name, company); + } + return company; + } + + protected WaoUser getWaoUser(String login, String password, String firstName, String lastName, Company company) { + WaoUser waoUser = waoUsers.get(login); + if (waoUser == null) { + waoUser = new WaoUserImpl(); + waoUser.setLogin(login); + waoUser.setPassword(manager.getContext().encodeString(password)); + waoUser.setFirstName(firstName); + waoUser.setLastName(lastName); + waoUser.setCompany(company); + waoUser.setActive(true); + UserProfile adminProfile = new UserProfileImpl(getObsProgram(), UserRole.ADMIN, true); + UserProfile coordinatorProfile = new UserProfileImpl(getObsProgram(), UserRole.COORDINATOR, true); + UserProfile observerProfile = new UserProfileImpl(getObsProgram(), UserRole.OBSERVER, true); + waoUser.addUserProfile(adminProfile); + waoUser.addUserProfile(coordinatorProfile); + waoUser.addUserProfile(observerProfile); + try { + manager.getServiceUser().createUpdateUser(waoUser, false); + } catch (WaoBusinessException e) { + throw new RuntimeException(e); + } + waoUser.setPassword(password); + waoUsers.put(waoUser.getLogin(), waoUser); + } + return waoUser; + } + + public ConnectedUser connectedUser(WaoUser user, UserRole userRole) { + // first, log in + ConnectedUser connectedUser; + try { + System.out.println("trying to connect " + user.getLogin() + " " + user.getPassword()); + connectedUser = manager.getServiceUser().connect(user.getLogin(), user.getPassword()); + } catch (WaoBusinessException e) { + throw new RuntimeException(e); + } + // then choose profile + for (UserProfile userProfile : user.getUserProfile()) { + if (userProfile.getUserRole() == userRole) { + connectedUser.setProfile(userProfile); + } + } + return connectedUser; + } + + public void boats() { + if (boats == null) { + boats = new HashMap<Integer, Boat>(); + ServiceBoat serviceBoat = manager.getServiceBoat(); + InputStream input = getClass().getResourceAsStream("/import/navires.csv"); + try { + serviceBoat.importBoatCsv(input); + } catch (WaoBusinessException e) { + throw new RuntimeException(e); + } + } + } + + protected Boat getBoat(Integer immatriculation) { + boats(); + Boat boat = boats.get(immatriculation); + if (boat == null) { + ServiceBoat serviceBoat = manager.getServiceBoat(); + try { + boat = serviceBoat.getBoat(immatriculation); + } catch (WaoBusinessException e) { + throw new RuntimeException(e); + } + } + return boat; + } + + public Boat samourai() { + return getBoat(174258); + } + + public Boat moise() { + return getBoat(273129); + } +} \ No newline at end of file Copied: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsDebFixtures.java (from rev 1327, trunk/wao-business/src/test/java/fr/ifremer/wao/business/ObsDebFixtures.java) =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsDebFixtures.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsDebFixtures.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -0,0 +1,44 @@ +package fr.ifremer.wao.business.fixtures; + +import fr.ifremer.wao.WaoServices; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.WaoUser; + +public class ObsDebFixtures extends Fixtures { + + public ObsDebFixtures(WaoServices manager) { + super(manager); + } + + @Override + protected ObsProgram getObsProgram() { + return ObsProgram.OBSDEB; + } + + public Company codeLutin() { + return getCompany("Code Lutin"); + } + + public Company ifremer() { + return getCompany("Ifremer"); + } + + public WaoUser josh() { + return getWaoUser("josh", "mdp", "Joshua", "B.", codeLutin()); + } + + public ConnectedUser joshAsAdministrator() { + return connectedUser(josh(), UserRole.ADMIN); + } + + public ConnectedUser joshAsCoordinator() { + return connectedUser(josh(), UserRole.COORDINATOR); + } + + public ConnectedUser joshAsObserver() { + return connectedUser(josh(), UserRole.OBSERVER); + } +} Added: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java (rev 0) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -0,0 +1,197 @@ +package fr.ifremer.wao.business.fixtures; + +import fr.ifremer.wao.WaoBusinessException; +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoServices; +import fr.ifremer.wao.bean.ConnectedUser; +import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.entity.Boat; +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.ContactImpl; +import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRowDAO; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.service.ServiceContact; +import fr.ifremer.wao.service.ServiceSampling; +import org.apache.commons.io.IOUtils; +import org.nuiton.topia.TopiaException; +import org.nuiton.util.DateUtil; + +import java.io.InputStream; +import java.util.Date; + +public class ObsMerFixtures extends Fixtures { + + public ObsMerFixtures(WaoServices manager) { + super(manager); + } + + @Override + protected ObsProgram getObsProgram() { + return ObsProgram.OBSMER; + } + + public Company tartanpion() { + return getCompany("TARTANPION"); + } + + public Company bis() { + return getCompany("BIS"); + } + + protected boolean fishingZonesImported = false; + + public void fishingZones() { + if ( ! fishingZonesImported) { + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/zonesPeche.csv"); + manager.getServiceReferential().importFishingZoneCsv(input); + } finally { + IOUtils.closeQuietly(input); + } + fishingZonesImported = true; + } + } + + public WaoUser jeanMichmuche() { + return getWaoUser("jmichmuche", "mdp", "Jean", "Michmuche", tartanpion()); + } + + public WaoUser billMurray() { + return getWaoUser("BillMurray", "mdp", "Bill", "Murray", bis()); + } + + public ConnectedUser jeanMichmucheAsAdmin() { + ConnectedUser connectedUser = connectedUser(jeanMichmuche(), UserRole.ADMIN); + return connectedUser; + } + + public void samplingPlan() { + tartanpion(); + bis(); + fishingZones(); + ServiceSampling serviceSampling = manager.getServiceSampling(); + InputStream input = null; + try { + input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + serviceSampling.importSamplingPlanCsv(input, jeanMichmucheAsAdmin()); + } catch (WaoBusinessException e) { + throw new RuntimeException(e); + } finally { + IOUtils.closeQuietly(input); + } + } + + public ConnectedUser connectedAdmin() { + return jeanMichmucheAsAdmin(); + } + + public ConnectedUser jeanMichmucheAsObserver() { + return connectedUser(jeanMichmuche(), UserRole.OBSERVER); + } + + public ConnectedUser billMurrayAsObserver() { + return connectedUser(billMurray(), UserRole.OBSERVER); + } + + public Boat mayflowers() { + return getBoat(177474); + } + + public void contacts() { + Boat boat = samourai(); + Boat boat2 = mayflowers(); + WaoUser user = jeanMichmuche(); + WaoUser user2 = billMurray(); + samplingPlan(); + + try { + manager.setCurrentDate(DateUtil.createDate(5, 10, 2010)); + + SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(getTransaction()); + SampleRow row = rowDAO.findByCode("2010_0001"); + SampleRow row2 = rowDAO.findByCode("2009_0006"); + + ServiceContact serviceContact = manager.getServiceContact(); + + ConnectedUser connectedUser = jeanMichmucheAsAdmin(); + + // Contacts for company TARTANPION + Contact contact1 = new ContactImpl(); + contact1.setBoat(boat); + contact1.setMainObserver(user); + contact1.setSampleRow(row); + contact1.setContactState(ContactState.OBSERVATION_DONE); + Date begin = DateUtil.createDate(3, 3, 2010); + contact1.setObservationBeginDate(begin); + Date end = DateUtil.createDate(4, 3, 2010); + contact1.setObservationEndDate(end); + serviceContact.saveContact(connectedUser, contact1, false); + + Contact contact2 = new ContactImpl(); + contact2.setBoat(boat); + contact2.setMainObserver(user); + contact2.setSampleRow(row); + contact2.setContactState(ContactState.OBSERVATION_DONE); + begin = DateUtil.createDate(3, 10, 2010); + contact2.setObservationBeginDate(begin); + end = DateUtil.createDate(4, 10, 2010); + contact2.setObservationEndDate(end); + serviceContact.saveContact(connectedUser, contact2, false); + + Contact contact3 = new ContactImpl(); + contact3.setBoat(boat); + contact3.setMainObserver(user); + contact3.setSampleRow(row); + contact3.setContactState(ContactState.CONTACT_REFUSED); + begin = DateUtil.createDate(3, 5, 2010); + end = DateUtil.createDate(4, 5, 2010); + contact3.setObservationEndDate(end); + contact3.setCreationDate(begin); + serviceContact.saveContact(connectedUser, contact3, false); + + // Contacts for company BIS + Contact contact4 = new ContactImpl(); + contact4.setBoat(boat2); + contact4.setMainObserver(user2); + contact4.setSampleRow(row2); + contact4.setContactState(ContactState.OBSERVATION_EXPECTED); + begin = DateUtil.createDate(3, 3, 2010); + end = DateUtil.createDate(4, 3, 2010); + contact4.setObservationEndDate(end); + contact4.setCreationDate(begin); + serviceContact.saveContact(connectedUser, contact4, false); + + Contact contact5 = new ContactImpl(); + contact5.setBoat(boat2); + contact5.setMainObserver(user2); + contact5.setSampleRow(row2); + contact5.setContactState(ContactState.OBSERVATION_CANCELLED); + begin = DateUtil.createDate(3, 5, 2010); + end = DateUtil.createDate(4, 5, 2010); + contact5.setObservationEndDate(end); + contact5.setCreationDate(begin); + serviceContact.saveContact(connectedUser, contact5, false); + + // Contact refused by program, will not be in result + Contact contact6 = new ContactImpl(); + contact6.setBoat(boat2); + contact6.setMainObserver(user2); + contact6.setSampleRow(row2); + contact6.setContactState(ContactState.OBSERVATION_CANCELLED); + begin = DateUtil.createDate(3, 3, 2010); + contact6.setCreationDate(begin); + end = DateUtil.createDate(4, 3, 2010); + contact6.setObservationEndDate(end); + contact6.setValidationProgram(Boolean.FALSE); + serviceContact.saveContact(connectedUser, contact6, false); + } catch (TopiaException e) { + throw new RuntimeException(e); + } + } + +} Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -26,27 +26,24 @@ import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoServices; -import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.business.fixtures.ObsMerFixtures; import fr.ifremer.wao.service.AbstractServiceTest; -import fr.ifremer.wao.service.ServiceBoat; import fr.ifremer.wao.service.ServiceContact; -import fr.ifremer.wao.service.ServiceSampling; -import fr.ifremer.wao.service.ServiceUser; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.InputStream; import java.util.Date; -import java.util.List; /** * BoatImplTest @@ -59,68 +56,46 @@ private static final Logger log = LoggerFactory.getLogger(BoatImplTest.class); - /** - * Test of canCreateContact method, of class BoatImpl. - */ - @Test - public void testCanCreateContact() throws Exception { - /** PREPARE DATA **/ - ServiceUser serviceUser = manager.getServiceUser(); - Company company = new CompanyImpl(); - company.setName("TARTANPION"); - serviceUser.createUpdateCompany(company); - Company company2 = new CompanyImpl(); - company2.setName("BIS"); - serviceUser.createUpdateCompany(company2); - - WaoUser user = new WaoUserImpl(); - user.setLogin("user"); - user.setFirstName("Jean"); - user.setLastName("Michmuche"); - user.setCompany(company); - serviceUser.createUpdateUser(user, true); + protected TopiaContext transaction; - ConnectedUser connectedUser = getConnectedUser(user, UserRole.ADMIN, ObsProgram.OBSMER); - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - ServiceBoat serviceBoat = manager.getServiceBoat(); - serviceBoat.importBoatCsv(input); - List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); - Boat boat = boats.get(0); + protected SampleRow row; + protected SampleRow row2; + protected ServiceContact serviceContact; - TopiaContext transaction = manager.getContext().beginTransaction(); + @Before + public void initSampleRows() throws TopiaException { + obsMerFixtures.samplingPlan(); - FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); + transaction = manager.getContext().beginTransaction(); + SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); + row = rowDAO.findByCode("2010_0001"); + row2 = rowDAO.findByCode("2009_0006"); - transaction.commitTransaction(); + serviceContact = manager.getServiceContact(); + } - ServiceSampling serviceSampling = manager.getServiceSampling(); - input = getClass().getResourceAsStream("/import/echantillonnage.csv"); - serviceSampling.importSamplingPlanCsv(input, getConnectedAdmin()); + @After + public void closeTransaction() throws TopiaException { + if (transaction != null) { + transaction.closeContext(); + } + } - SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - SampleRow row = rowDAO.findByCode("2010_0001"); - row.getCompany(); - row.getProfession(); - row.sizeElligibleBoat(); - row.sizeSampleMonth(); - row.sizeSampleRowLog(); - transaction.closeContext(); - - row.setCompany(company); - serviceSampling.createUpdateSampleRow(row, boats, new SampleRowLogImpl(), getConnectedAdmin()); + /** + * Test of canCreateContact method, of class BoatImpl. + */ + @Test + public void testCanCreateContact() throws Exception { - ServiceContact serviceContact = manager.getServiceContact(); - Contact contact1 = serviceContact.newContact(connectedUser, row, boat); + Boat boat = obsMerFixtures.samourai(); + Contact contact1 = serviceContact.newContact(obsMerFixtures.jeanMichmucheAsObserver(), row, boat); contact1.setContactState(ContactState.CONTACT_START); - serviceContact.saveContact(connectedUser, contact1, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); manager.setCurrentDate(DateUtil.createDate(5, 3, 2010)); /** EXEC METHOD **/ - boolean result = boat.canCreateContact(ObsProgram.OBSMER, company); + boolean result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion()); // contact still open Assert.assertFalse(result); @@ -128,34 +103,34 @@ contact1.setComment("why contact was definitely refused"); contact1.setDataReliability(DataReliability.RELIABLE); contact1.setValidationProgram(Boolean.TRUE); - serviceContact.saveContact(connectedUser, contact1, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); - result = boat.canCreateContact(ObsProgram.OBSMER, company); + result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion()); // contact have a definitive refused for this boat Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_DONE); contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010)); contact1.setObservationEndDate(DateUtil.createDate(4, 3, 2010)); - contact1.setMainObserver(user); - serviceContact.saveContact(connectedUser, contact1, false); + contact1.setMainObserver(obsMerFixtures.jeanMichmuche()); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); - result = boat.canCreateContact(ObsProgram.OBSMER, company); + result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion()); // contact is finished Assert.assertTrue(result); contact1.setContactState(ContactState.OBSERVATION_CANCELLED); contact1.setComment("why it was cancelled"); - serviceContact.saveContact(connectedUser, contact1, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); - result = boat.canCreateContact(ObsProgram.OBSMER, company); + result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion()); // contact is finished Assert.assertTrue(result); contact1.setContactState(ContactState.CONTACT_REFUSED); - serviceContact.saveContact(connectedUser, contact1, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); - result = boat.canCreateContact(ObsProgram.OBSMER, company); + result = boat.canCreateContact(ObsProgram.OBSMER, obsMerFixtures.tartanpion()); // contact is finished Assert.assertTrue(result); } @@ -165,79 +140,25 @@ */ @Test public void testGetNbBoarding() throws Exception { - /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - ServiceBoat serviceBoat = manager.getServiceBoat(); - serviceBoat.importBoatCsv(input); - List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); - Boat boat = boats.get(0); - TopiaContext transaction = manager.getContext().beginTransaction(); - - CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - Company company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); - Company company2 = companyDAO.create(Company.PROPERTY_NAME, "BIS"); - - WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", - WaoUser.PROPERTY_COMPANY, company); - company.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", - WaoUser.PROPERTY_COMPANY, company2); - company2.addWaoUser(user2); - - transaction.commitTransaction(); - - FishingZoneDAO zoneDAO = WaoDAOHelper.getFishingZoneDAO(transaction); - FishingZone zoneIId = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IId"); - FishingZone zoneIV = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "IV"); - FishingZone zoneI = zoneDAO.create(FishingZone.PROPERTY_DISTRICT_CODE, "I"); - - transaction.commitTransaction(); - - ServiceSampling serviceSampling = manager.getServiceSampling(); - input = getClass().getResourceAsStream("/import/echantillonnage.csv"); - serviceSampling.importSamplingPlanCsv(input, getConnectedUser(null, UserRole.ADMIN, ObsProgram.OBSMER)); - - SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - SampleRow row = rowDAO.findByCode("2010_0001"); - SampleRow row2 = rowDAO.findByCode("2009_0006"); - row.getCompany(); - row.getProfession(); - row.sizeElligibleBoat(); - row.sizeSampleMonth(); - row2.getCompany(); - row2.getProfession(); - row2.sizeElligibleBoat(); - row2.sizeSampleMonth(); - -// BoatInfosDAO boatInfosDAO = WaoDAOHelper.getBoatInfosDAO(transaction); -// BoatInfos boatInfos = boatInfosDAO.create(BoatInfos.BOAT, boat, BoatInfos.COMPANY, company); - - transaction.closeContext(); - manager.setCurrentDate(DateUtil.createDate(5, 8, 2010)); - ConnectedUser connectedUser = getConnectedUser(user, UserRole.ADMIN, ObsProgram.OBSMER); - ServiceContact serviceContact = manager.getServiceContact(); - - // First contact : OK - Contact contact1 = serviceContact.newContact(connectedUser, row, boat); + Boat boat = obsMerFixtures.samourai(); + Contact contact1 = serviceContact.newContact(obsMerFixtures.jeanMichmucheAsObserver(), row, boat); contact1.setContactState(ContactState.OBSERVATION_DONE); Date begin = DateUtil.createDate(3, 5, 2010); contact1.setObservationBeginDate(begin); Date end = DateUtil.createDate(4, 5, 2010); contact1.setObservationEndDate(end); contact1.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(connectedUser, contact1, false); - /** EXEC METHOD **/ + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact1, false); Date fromDate = DateUtil.createDate(1, 5, 2010); int result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact2 = serviceContact.newContact(connectedUser, row, boat); + Contact contact2 = serviceContact.newContact(obsMerFixtures.jeanMichmucheAsObserver(), row, boat); // Second contact with ValidationProgram = FALSE contact2.setContactState(ContactState.OBSERVATION_DONE); begin = DateUtil.createDate(3, 8, 2010); @@ -246,12 +167,12 @@ contact2.setObservationEndDate(end); contact2.setValidationCompany(Boolean.TRUE); contact2.setValidationProgram(Boolean.FALSE); - serviceContact.saveContact(connectedUser, contact2, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsAdmin(), contact2, false); result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - Contact contact3 = serviceContact.newContact(connectedUser, row, boat); + Contact contact3 = serviceContact.newContact(obsMerFixtures.jeanMichmucheAsObserver(), row, boat); // Third contact with tideBeginDate < fromDate contact3.setContactState(ContactState.OBSERVATION_DONE); begin = DateUtil.createDate(3, 3, 2010); @@ -259,13 +180,12 @@ end = DateUtil.createDate(4, 3, 2010); contact3.setObservationEndDate(end); contact3.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(connectedUser, contact3, false); + serviceContact.saveContact(obsMerFixtures.jeanMichmucheAsObserver(), contact3, false); result = boat.getNbBoarding(fromDate); Assert.assertEquals(1, result); - connectedUser = getConnectedUser(user2, UserRole.ADMIN, ObsProgram.OBSMER); - Contact contact4 = serviceContact.newContact(connectedUser, row2, boat); + Contact contact4 = serviceContact.newContact(obsMerFixtures.billMurrayAsObserver(), row2, boat); // Fourth contact : OK with an other company contact4.setContactState(ContactState.OBSERVATION_DONE); begin = DateUtil.createDate(3, 5, 2010); @@ -273,7 +193,7 @@ end = DateUtil.createDate(4, 5, 2010); contact4.setObservationEndDate(end); contact4.setValidationCompany(Boolean.TRUE); - serviceContact.saveContact(connectedUser, contact4, false); + serviceContact.saveContact(obsMerFixtures.billMurrayAsObserver(), contact4, false); result = boat.getNbBoarding(fromDate); Assert.assertEquals(2, result); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/AbstractServiceTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/AbstractServiceTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -21,43 +21,35 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.WaoServices; -import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.WaoServices; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.UserRole; +import fr.ifremer.wao.business.fixtures.ObsMerFixtures; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.CompanyDAO; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactDAO; -import fr.ifremer.wao.entity.ContactImpl; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.ElligibleBoatDAO; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowDAO; -import fr.ifremer.wao.entity.UserProfileImpl; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.entity.WaoUserDAO; -import fr.ifremer.wao.entity.WaoUserImpl; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.util.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.io.InputStream; -import java.util.Date; -import java.util.List; /** * AbstractServiceTest @@ -71,15 +63,26 @@ private static final Logger log = LoggerFactory.getLogger(AbstractServiceTest.class); + protected WaoServices getWaoServices() { + // laziness ensure that manager is always available whatever the order + // of the rules + if (manager == null) { + manager = new WaoServices(); + } + return manager; + } + @Rule - public WaoServices manager = new WaoServices(); + public WaoServices manager = getWaoServices(); + @Rule + public ObsMerFixtures obsMerFixtures = new ObsMerFixtures(getWaoServices()); + protected ServiceSamplingImpl serviceSampling; protected static final String BOAT_DEFAULT_NAME = "SPRINGFIELD"; protected static final int BOAT_DEFAULT_IMMATRICULATION = 123456; protected static final String SAMPLE_ROW_DEFAULT_CODE = "2010_0001"; - protected static final String COMPANY_DEFAULT_NAME = "TARTANPION"; protected static final String OBSERVER_DEFAULT_FIRST_NAME = "Homer"; protected static final String OBSERVER_DEFAULT_LAST_NAME = "Simpson"; protected static final String OBSERVER_DEFAULT_LOGIN = "homer"; @@ -102,7 +105,7 @@ } @Before - public void setUp() throws Exception { + public void setUp() throws Throwable { serviceSampling = (ServiceSamplingImpl) manager.getServiceSampling(); } @@ -125,7 +128,7 @@ try { WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); observer = userDAO.create( - WaoUser.PROPERTY_COMPANY, findDefaultCompany(), + WaoUser.PROPERTY_COMPANY, obsMerFixtures.tartanpion(), WaoUser.PROPERTY_LOGIN, OBSERVER_DEFAULT_LOGIN, WaoUser.PROPERTY_FIRST_NAME, OBSERVER_DEFAULT_FIRST_NAME, WaoUser.PROPERTY_LAST_NAME, OBSERVER_DEFAULT_LAST_NAME); @@ -182,19 +185,6 @@ /** * Create a company : <br /> * <ul> - * <li>name : TARTANPION</li> - * </ul> - * - * @return the new Company - * @throws TopiaException - */ - protected Company createDefaultCompany() throws TopiaException { - return createCompany(COMPANY_DEFAULT_NAME); - } - - /** - * Create a company : <br /> - * <ul> * <li>name : defined with {@code name} argument</li> * </ul> * @@ -230,7 +220,7 @@ * @throws TopiaException */ protected SampleRow createDefaultSampleRow() throws TopiaException { - return createSampleRow(SAMPLE_ROW_DEFAULT_CODE, findDefaultCompany()); + return createSampleRow(SAMPLE_ROW_DEFAULT_CODE, obsMerFixtures.tartanpion()); } /** @@ -398,28 +388,7 @@ } return contact; } - - protected Company findDefaultCompany() throws TopiaException { - Company findCompany = findCompanyByName(BOAT_DEFAULT_NAME); - if (findCompany == null) { - findCompany = createDefaultCompany(); - } - return findCompany; - } - protected Company findCompanyByName(String name) throws TopiaException { - Company company = null; - TopiaContext transaction = manager.getContext().beginTransaction(); - try { - CompanyDAO dao = WaoDAOHelper.getCompanyDAO(transaction); - - company = dao.findByName(name); - } finally { - transaction.closeContext(); - } - return company; - } - protected SampleRow findDefaultSampleRow(String... properties) throws TopiaException { SampleRow findRow = findSampleRowByCode( @@ -516,136 +485,14 @@ return user; } - protected void prepareContactsData(Company company1, Company company2) - throws WaoBusinessException, TopiaException { - - manager.setCurrentDate(DateUtil.createDate(5, 10, 2010)); - - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - ServiceBoat serviceBoat = manager.getServiceBoat(); - serviceBoat.importBoatCsv(input); - List<Boat> boats = serviceBoat.getBoatsByImmatriculations("174258"); - Boat boat = boats.get(0); - - List<Boat> boats2 = serviceBoat.getBoatsByImmatriculations("177474"); - Boat boat2 = boats2.get(0); - - TopiaContext transaction = manager.getContext().beginTransaction(); - - WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - WaoUser user = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Jean", WaoUser.PROPERTY_LAST_NAME, "Michmuche", - WaoUser.PROPERTY_COMPANY, company1); - company1.addWaoUser(user); - WaoUser user2 = userDAO.create(WaoUser.PROPERTY_FIRST_NAME,"Bill", WaoUser.PROPERTY_LAST_NAME, "Murray", - WaoUser.PROPERTY_COMPANY, company2); - company2.addWaoUser(user2); - - transaction.commitTransaction(); - - input = getClass().getResourceAsStream("/import/zonesPeche.csv"); - ServiceReferential serviceReferential = manager.getServiceReferential(); - serviceReferential.importFishingZoneCsv(input); - - input = getClass().getResourceAsStream("/import/echantillonnage.csv"); - ServiceSampling serviceSampling = manager.getServiceSampling(); - serviceSampling.importSamplingPlanCsv(input, getConnectedUser(null, UserRole.ADMIN, ObsProgram.OBSMER)); - - SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); - SampleRow row = rowDAO.findByCode("2010_0001"); - SampleRow row2 = rowDAO.findByCode("2009_0006"); - - transaction.closeContext(); - - - ServiceContact serviceContact = manager.getServiceContact(); - - ConnectedUser connectedUser = getConnectedUser(user, UserRole.ADMIN, ObsProgram.OBSMER); - - // Contacts for company TARTANPION - Contact contact1 = new ContactImpl(); - contact1.setBoat(boat); - contact1.setMainObserver(user); - contact1.setSampleRow(row); - contact1.setContactState(ContactState.OBSERVATION_DONE); - Date begin = DateUtil.createDate(3, 3, 2010); - contact1.setObservationBeginDate(begin); - Date end = DateUtil.createDate(4, 3, 2010); - contact1.setObservationEndDate(end); - serviceContact.saveContact(connectedUser, contact1, false); - - Contact contact2 = new ContactImpl(); - contact2.setBoat(boat); - contact2.setMainObserver(user); - contact2.setSampleRow(row); - contact2.setContactState(ContactState.OBSERVATION_DONE); - begin = DateUtil.createDate(3, 10, 2010); - contact2.setObservationBeginDate(begin); - end = DateUtil.createDate(4, 10, 2010); - contact2.setObservationEndDate(end); - serviceContact.saveContact(connectedUser, contact2, false); - - Contact contact3 = new ContactImpl(); - contact3.setBoat(boat); - contact3.setMainObserver(user); - contact3.setSampleRow(row); - contact3.setContactState(ContactState.CONTACT_REFUSED); - begin = DateUtil.createDate(3, 5, 2010); - end = DateUtil.createDate(4, 5, 2010); - contact3.setObservationEndDate(end); - contact3.setCreationDate(begin); - serviceContact.saveContact(connectedUser, contact3, false); - - // Contacts for company BIS - Contact contact4 = new ContactImpl(); - contact4.setBoat(boat2); - contact4.setMainObserver(user2); - contact4.setSampleRow(row2); - contact4.setContactState(ContactState.OBSERVATION_EXPECTED); - begin = DateUtil.createDate(3, 3, 2010); - end = DateUtil.createDate(4, 3, 2010); - contact4.setObservationEndDate(end); - contact4.setCreationDate(begin); - serviceContact.saveContact(connectedUser, contact4, false); - - Contact contact5 = new ContactImpl(); - contact5.setBoat(boat2); - contact5.setMainObserver(user2); - contact5.setSampleRow(row2); - contact5.setContactState(ContactState.OBSERVATION_CANCELLED); - begin = DateUtil.createDate(3, 5, 2010); - end = DateUtil.createDate(4, 5, 2010); - contact5.setObservationEndDate(end); - contact5.setCreationDate(begin); - serviceContact.saveContact(connectedUser, contact5, false); - - // Contact refused by program, will not be in result - Contact contact6 = new ContactImpl(); - contact6.setBoat(boat2); - contact6.setMainObserver(user2); - contact6.setSampleRow(row2); - contact6.setContactState(ContactState.OBSERVATION_CANCELLED); - begin = DateUtil.createDate(3, 3, 2010); - contact6.setCreationDate(begin); - end = DateUtil.createDate(4, 3, 2010); - contact6.setObservationEndDate(end); - contact6.setValidationProgram(Boolean.FALSE); - serviceContact.saveContact(connectedUser, contact6, false); - } - + @Deprecated public ConnectedUser getConnectedUser(WaoUser user, UserRole userRole, ObsProgram obsProgram) { - ConnectedUser connectedUser = new ConnectedUserImpl(); - if (user == null) { - WaoUser waoUser = new WaoUserImpl(); - connectedUser.setUser(waoUser); - } else { - connectedUser.setUser(user); - } - connectedUser.setProfile(new UserProfileImpl(obsProgram, userRole, true)); - return connectedUser; + return obsMerFixtures.jeanMichmucheAsAdmin(); } + @Deprecated public ConnectedUser getConnectedAdmin() { - return getConnectedUser(null, UserRole.ADMIN, ObsProgram.OBSMER); + return obsMerFixtures.connectedAdmin(); } } 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 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -24,49 +24,36 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.WaoServices; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; -import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.BoatFilterImpl; import fr.ifremer.wao.bean.CompanyBoatInfos; import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ConnectedUserImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.UserRole; -import fr.ifremer.wao.entity.ActivityCalendar; -import fr.ifremer.wao.entity.ActivityCalendarDAO; +import fr.ifremer.wao.business.fixtures.ObsMerFixtures; import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.BoatDAO; import fr.ifremer.wao.entity.BoatInfos; import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.CompanyDAO; -import fr.ifremer.wao.entity.CompanyImpl; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ElligibleBoat; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowDAO; import fr.ifremer.wao.entity.SampleRowLogImpl; -import fr.ifremer.wao.entity.UserProfile; -import fr.ifremer.wao.entity.UserProfileImpl; import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.entity.WaoUserImpl; import fr.ifremer.wao.io.ImportResults; -import org.junit.After; +import org.apache.commons.io.IOUtils; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; @@ -81,10 +68,10 @@ private static final Logger log = LoggerFactory.getLogger(ServiceBoatImplTest.class); - private ServiceBoat service; + protected ServiceBoat service; @Before - public void setUp() throws Exception { + public void setUp() { service = manager.getServiceBoat(); } @@ -94,22 +81,11 @@ */ @Test public void testGetBoatsByFilter() throws Exception { - log.info("getBoatsByFilter"); - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - service.importBoatCsv(input); - - ServiceUser serviceUser = manager.getServiceUser(); - Company company = new CompanyImpl(); - company.setName("TARTANPION"); - serviceUser.createUpdateCompany(company); - WaoUser user = new WaoUserImpl(); - user.setLogin("login"); - user.setFirstName("Jean"); - user.setLastName("Michmuche"); - user.setCompany(company); - serviceUser.createUpdateUser(user, true); + obsMerFixtures.boats(); + Company company = obsMerFixtures.tartanpion(); List<SampleRow> rows = prepareSampleRows(company); + obsMerFixtures.jeanMichmuche(); BoatFilter filter = new BoatFilterImpl(); @@ -157,11 +133,8 @@ @Test public void testGetBoatsByImmatriculations() throws Exception { - log.info("getBoats"); + obsMerFixtures.boats(); - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - service.importBoatCsv(input); - String immatriculations = "174592 978419 273129"; List<Boat> results = service.getBoatsByImmatriculations(immatriculations); Assert.assertEquals(3, results.size()); @@ -172,45 +145,30 @@ @Test public void testGetElligibleBoats() throws Exception { - log.info("getElligibleBoats"); - /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - service.importBoatCsv(input); - - Company company = new CompanyImpl(); - company.setName("TARTANPION"); + obsMerFixtures.boats(); + Company company = obsMerFixtures.tartanpion(); prepareSampleRows(company); - /** EXEC METHOD **/ - CompanyBoatInfos result = service.getCompanyBoatInfos(ObsProgram.OBSMER, 174592, company); Assert.assertNotNull(result); Assert.assertEquals(174592, result.getBoatInfos().getBoat().getImmatriculation()); - Assert.assertEquals("TARTANPION", result.getCompany().getName()); + Assert.assertEquals(company.getName(), result.getCompany().getName()); // only row1 is getting Assert.assertEquals(1, result.getElligibleBoatsValues().size()); } private List<SampleRow> prepareSampleRows(Company company) throws TopiaException, WaoBusinessException { - ServiceReferential serviceReferential = manager.getServiceReferential(); - InputStream input = getClass().getResourceAsStream("/import/zonesPeche.csv"); - serviceReferential.importFishingZoneCsv(input); + obsMerFixtures.fishingZones(); + obsMerFixtures.bis(); - TopiaContext transaction = manager.getContext().beginTransaction(); - // Create a company - CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - manager.getContext().prepareTopiaId(Company.class, company); - companyDAO.update(company); - companyDAO.create(Company.PROPERTY_NAME, "BIS"); - transaction.commitTransaction(); - ServiceSampling serviceSampling = manager.getServiceSampling(); - input = getClass().getResourceAsStream("/import/echantillonnage.csv"); + InputStream input = getClass().getResourceAsStream("/import/echantillonnage.csv"); serviceSampling.importSamplingPlanCsv(input, getConnectedUser(null, UserRole.ADMIN, ObsProgram.OBSMER)); // Get two SampleRows : 2009_3 & 2010_4 + TopiaContext transaction = manager.getContext().beginTransaction(); SampleRowDAO rowDAO = WaoDAOHelper.getSampleRowDAO(transaction); SampleRow row1 = rowDAO.findByCode("2009_0003"); row1.getProfession(); @@ -240,26 +198,16 @@ @Test public void testCreateUpdateBoatInfos() throws Exception { - log.info("createUpdateBoatInfos"); /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - service.importBoatCsv(input); + obsMerFixtures.boats(); List<Boat> boats = service.getBoatsByImmatriculations("174592"); Boat boat = boats.get(0); // Two rows created : 2009_3 & 2010_4 and one Company : "TARTANPION" - ServiceUser serviceUser = manager.getServiceUser(); - Company company = new CompanyImpl(); - company.setName("TARTANPION"); - serviceUser.createUpdateCompany(company); - WaoUser user = new WaoUserImpl(); - user.setLogin("user"); - user.setFirstName("Jean"); - user.setLastName("Michmuche"); - user.setCompany(company); - serviceUser.createUpdateUser(user, true); + Company company = obsMerFixtures.tartanpion(); + WaoUser user = obsMerFixtures.jeanMichmuche(); List<SampleRow> rows = prepareSampleRows(company); TopiaContext transaction = manager.getContext().beginTransaction(); @@ -334,89 +282,93 @@ */ @Test public void testImportBoatCsv() throws Exception { - log.info("importBoatCsv"); - - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - ImportResults importResults = service.importBoatCsv(input); - Assert.assertEquals(6, importResults.getNbRowsImported()); - // new boats added - Assert.assertEquals(6, importResults.getNbRowsImportedNew()); - - // Check boat 174592 is active &nd boat 177474 is inactive - List<Boat> results = service.getBoatsByImmatriculations("174592 177474"); - Assert.assertTrue(results.get(0).getActive()); - Assert.assertFalse(results.get(1).getActive()); - } - - @Test - public void testGetLastActivityCalendar() throws Exception { - log.info("getLastActivityCalendar"); - - /** PREPARE DATA **/ - TopiaContext transaction = manager.getContext().beginTransaction(); - - BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); - Boat boat = boatDAO.create( - Boat.PROPERTY_NAME, "TESTBOAT", - Boat.PROPERTY_IMMATRICULATION, 174592); - - ActivityCalendarDAO dao = WaoDAOHelper.getActivityCalendarDAO(transaction); - - ActivityCalendar calendar1 = dao.create( - ActivityCalendar.PROPERTY_BOAT, boat, - ActivityCalendar.PROPERTY_YEAR, 2008); - - ActivityCalendar calendar2 = dao.create( - ActivityCalendar.PROPERTY_BOAT, boat, - ActivityCalendar.PROPERTY_YEAR, 2007); - - ActivityCalendar calendar3 = dao.create( - ActivityCalendar.PROPERTY_BOAT, boat, - ActivityCalendar.PROPERTY_YEAR, 2009); - - transaction.commitTransaction(); - transaction.closeContext(); - - /** EXEC METHOD **/ - WaoUser user = new WaoUserImpl(); - user.setFirstName("Jean"); - user.setLastName("Michmuche"); - // Evo #2063 : the defaut instanciation of WaoUser doesn't put the - // user automatically as an non admin - UserProfile profile = new UserProfileImpl(ObsProgram.OBSMER, UserRole.OBSERVER, true); - user.addUserProfile(profile); - Company company = new CompanyImpl(); - company.setName("TARTANPION"); - user.setCompany(company); - - ConnectedUser connectedUser = new ConnectedUserImpl(); - connectedUser.setUser(user); - connectedUser.setProfile(profile); - - ActivityCalendar result = service.getLastActivityCalendar(connectedUser, boat); - Assert.assertNotNull(result); - Assert.assertEquals(2009, result.getYear()); - - - String filename = WaoProperty.FILENAME_LOG_ACTIVITY_ACCESS.getValue(); - - if (log.isDebugEnabled()) { - log.debug("ActivityCalendar filename for access : " + filename); - } - - File file = new File(filename); - Assert.assertTrue(file.exists()); - - BufferedReader reader = new BufferedReader(new FileReader(file)); + InputStream input = null; 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")); + input = getClass().getResourceAsStream("/import/navires.csv"); + ImportResults importResults = service.importBoatCsv(input); + Assert.assertEquals(6, importResults.getNbRowsImported()); + // new boats added + Assert.assertEquals(6, importResults.getNbRowsImportedNew()); + + // Check boat 174592 is active and boat 177474 is inactive + List<Boat> results = service.getBoatsByImmatriculations("174592 177474"); + Assert.assertTrue(results.get(0).getActive()); + Assert.assertFalse(results.get(1).getActive()); } finally { - reader.close(); + IOUtils.closeQuietly(input); } } +// @Test +// @Ignore("activity calendars are deprecated") +// public void testGetLastActivityCalendar() throws Exception { +// log.info("getLastActivityCalendar"); +// +// /** PREPARE DATA **/ +// TopiaContext transaction = manager.getContext().beginTransaction(); +// +// BoatDAO boatDAO = WaoDAOHelper.getBoatDAO(transaction); +// Boat boat = boatDAO.create( +// Boat.PROPERTY_NAME, "TESTBOAT", +// Boat.PROPERTY_IMMATRICULATION, 174592); +// +// ActivityCalendarDAO dao = WaoDAOHelper.getActivityCalendarDAO(transaction); +// +// ActivityCalendar calendar1 = dao.create( +// ActivityCalendar.PROPERTY_BOAT, boat, +// ActivityCalendar.PROPERTY_YEAR, 2008); +// +// ActivityCalendar calendar2 = dao.create( +// ActivityCalendar.PROPERTY_BOAT, boat, +// ActivityCalendar.PROPERTY_YEAR, 2007); +// +// ActivityCalendar calendar3 = dao.create( +// ActivityCalendar.PROPERTY_BOAT, boat, +// ActivityCalendar.PROPERTY_YEAR, 2009); +// +// transaction.commitTransaction(); +// transaction.closeContext(); +// +// /** EXEC METHOD **/ +// WaoUser user = new WaoUserImpl(); +// user.setFirstName("Jean"); +// user.setLastName("Michmuche"); +// // Evo #2063 : the defaut instanciation of WaoUser doesn't put the +// // user automatically as an non admin +// UserProfile profile = new UserProfileImpl(ObsProgram.OBSMER, UserRole.OBSERVER, true); +// user.addUserProfile(profile); +// Company company = new CompanyImpl(); +// company.setName("TARTANPION"); +// user.setCompany(company); +// +// ConnectedUser connectedUser = new ConnectedUserImpl(); +// connectedUser.setUser(user); +// connectedUser.setProfile(profile); +// +// ActivityCalendar result = service.getLastActivityCalendar(connectedUser, boat); +// Assert.assertNotNull(result); +// Assert.assertEquals(2009, result.getYear()); +// +// +// String filename = WaoProperty.FILENAME_LOG_ACTIVITY_ACCESS.getValue(); +// +// if (log.isDebugEnabled()) { +// log.debug("ActivityCalendar filename for access : " + filename); +// } +// +// File file = new File(filename); +// 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 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -30,6 +30,7 @@ import fr.ifremer.wao.entity.BoatDistrictDAO; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.io.ImportResults; +import org.apache.commons.io.IOUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -41,7 +42,6 @@ import java.io.IOException; import java.io.InputStream; -import java.lang.annotation.Inherited; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -68,12 +68,10 @@ public void testImportBoatDistrictKml() throws WaoBusinessException, TopiaException { - /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - manager.getServiceBoat().importBoatCsv(input); + obsMerFixtures.boats(); /** EXEC METHOD **/ - input = getClass().getResourceAsStream("/import/boat_districts.kml"); + InputStream input = getClass().getResourceAsStream("/import/boat_districts.kml"); ImportResults results = service.importBoatDistrictKml(input); Assert.assertEquals(3, results.getNbRowsImported()); Assert.assertEquals(0, results.getNbRowsRefused()); @@ -107,12 +105,10 @@ @Test @Ignore("SAX print a stack trace in log while testing :-(") public void testImportBoatDistrictBadKml() throws WaoBusinessException { - /** PREPARE DATA **/ - InputStream input = getClass().getResourceAsStream("/import/navires.csv"); - manager.getServiceBoat().importBoatCsv(input); - /** EXEC METHOD **/ - input = getClass().getResourceAsStream("/import/activity.csv"); + obsMerFixtures.boats(); + + InputStream input = getClass().getResourceAsStream("/import/activity.csv"); try { ImportResults results = service.importBoatDistrictKml(input); } catch (WaoException eee) { @@ -121,23 +117,20 @@ } @Test - public void testExportContactStatisticsKml() throws TopiaException, WaoBusinessException { - /** PREPARE DATA **/ + public void testExportContactStatisticsKml() throws IOException { + obsMerFixtures.contacts(); - // Company TARTANPION - Company company = createDefaultCompany(); - 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); + service.importBoatDistrictKml(input); - /** EXEC METHOD **/ ContactFilter filter = new ContactFilterImpl(); filter.setObsProgram(ObsProgram.OBSMER); InputStream stream = service.exportContactStatisticsKml(filter); - //FileUtils.readFileToString() + String kml = IOUtils.toString(stream); + if (log.isDebugEnabled()) { + log.debug("exported contact statistics Kml", kml); + } + //FIXME tchemit 2010-10-13 : Ca sert a quoi, on teste rien ? } } 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 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -125,16 +125,9 @@ try { if (needObserver) { - CompanyDAO companyDAO = WaoDAOHelper.getCompanyDAO(transaction); - company = companyDAO.create(Company.PROPERTY_NAME, "TARTANPION"); + company = obsMerFixtures.tartanpion(); + observer = obsMerFixtures.jeanMichmuche(); - WaoUserDAO userDAO = WaoDAOHelper.getWaoUserDAO(transaction); - observer = userDAO.create( - WaoUser.PROPERTY_COMPANY, company, - WaoUser.PROPERTY_LOGIN, "jmichmuche", - WaoUser.PROPERTY_FIRST_NAME, "Jean", - WaoUser.PROPERTY_LAST_NAME, "Michmuche"); - when(contact.getMainObserver()).thenReturn(observer); } @@ -605,7 +598,7 @@ /** PREPARE DATA **/ prepareData(true, true); - ConnectedUser connectedUser = getConnectedUser(observer, UserRole.OBSERVER, ObsProgram.OBSMER); + ConnectedUser connectedUser = obsMerFixtures.jeanMichmucheAsObserver(); // Don't use a mock in this case Contact newContact = service.newContact(connectedUser, sampleRow, boat); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -78,7 +78,7 @@ log.info("test 2 : Bad filter, no contact is returned"); WaoUser observer2 = createUser("marge", - UserRole.OBSERVER, findDefaultCompany()); + UserRole.OBSERVER, obsMerFixtures.tartanpion()); filter.setObserver(observer2); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -24,8 +24,6 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.WaoServices; -import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.FishingZone; @@ -94,32 +92,17 @@ assertTrue(sectors.contains("Golfe de Gascogne")); } - /** - * Test of getFishingZones method, of class ServiceReferentialImpl. - * @throws WaoException if error during import or getFishingZones - */ @Test public void testGetFishingZones() { InputStream input = getClass().getResourceAsStream("/import/zonesPeche.csv"); int nbNew = service.importFishingZoneCsv(input); - // nbNew = 6 + assertEquals(6, nbNew); List<FishingZone> results = service.getFishingZones(); - assertEquals(nbNew, results.size()); + assertEquals(6, results.size()); } - /** - * Test of importFishingZoneCsv method, of class ServiceReferentialImpl. - * @throws WaoException if import error - */ @Test - public void testImportFishingZoneCsv() { - InputStream input = getClass().getResourceAsStream("/import/zonesPeche.csv"); - int result = service.importFishingZoneCsv(input); - assertEquals(6, result); - } - - @Test public void testImportTerrestrialDivision() { InputStream input = null; try { Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisTest.java 2011-06-10 08:49:15 UTC (rev 1335) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisTest.java 2011-06-10 16:35:23 UTC (rev 1336) @@ -297,14 +297,10 @@ */ @Test public void testGetContactStateStatistics() throws Exception { - /** PREPARE DATA **/ + obsMerFixtures.contacts(); + Company company = obsMerFixtures.tartanpion(); + Company company2 = obsMerFixtures.bis(); - // Company TARTANPION - Company company = createDefaultCompany(); - Company company2 = createCompany("BIS"); - - prepareContactsData(company, company2); - /** EXEC METHOD **/ // result for company TARTANPION with no period