branch develop updated (9eabb48 -> 55c5ddf)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 9eabb48 Fusion #6641 dans develop new 55c5ddf Correction du build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 55c5ddfbaaa66e4de39e1b50d080444dbadf0675 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 16:44:07 2015 +0100 Correction du build Summary of changes: .../ifremer/wao/services/service/SampleRowsFilterValues.java | 11 ----------- .../service/SclerochronologySamplingPlanServiceTest.java | 4 ++-- .../java/fr/ifremer/wao/services/service/WaoFixtures.java | 9 +++++---- 3 files changed, 7 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 55c5ddfbaaa66e4de39e1b50d080444dbadf0675 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 16:44:07 2015 +0100 Correction du build --- .../ifremer/wao/services/service/SampleRowsFilterValues.java | 11 ----------- .../service/SclerochronologySamplingPlanServiceTest.java | 4 ++-- .../java/fr/ifremer/wao/services/service/WaoFixtures.java | 9 +++++---- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java index b3c1141..4bad269 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java @@ -56,8 +56,6 @@ public class SampleRowsFilterValues extends AbstractFilterValues { protected SortedSet<FilterOption> organisations = new TreeSet<>(); - protected SortedSet<FilterOption> organisationCompanies = new TreeSet<>(); - protected SortedSet<FilterOption> samplingStrategies = new TreeSet<>(); protected SortedSet<FilterOption> terrestrialDistricts = new TreeSet<>(); @@ -119,7 +117,6 @@ public class SampleRowsFilterValues extends AbstractFilterValues { Organisation organisation = sampleRow.getOrganisation(); if (organisation != null) { organisations.add(FilterOption.forValueAndLabel(organisation.getTopiaId(), organisation.getFullName())); - organisationCompanies.add(FilterOption.forValueAndLabel(organisation.getCompany().getTopiaId(), organisation.getCompany().getFullName())); } if (obsProgram.isObsVente()) { samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); @@ -194,10 +191,6 @@ public class SampleRowsFilterValues extends AbstractFilterValues { return organisations; } - public SortedSet<FilterOption> getOrganisationCompanies() { - return organisationCompanies; - } - public SortedSet<FilterOption> getSamplingStrategies() { return samplingStrategies; } @@ -250,10 +243,6 @@ public class SampleRowsFilterValues extends AbstractFilterValues { this.organisations = organisations; } - public void setOrganisationCompanies(SortedSet<FilterOption> organisationCompanies) { - this.organisationCompanies = organisationCompanies; - } - public void setSamplingStrategies(SortedSet<FilterOption> samplingStrategies) { this.samplingStrategies = samplingStrategies; } diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java index 89eabca..e57c02c 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java @@ -94,8 +94,8 @@ public class SclerochronologySamplingPlanServiceTest extends AbstractWaoServiceT Assert.assertTrue(CollectionUtils.isEmpty(adminFilter.getOrganisationIds())); SampleRowsFilter coordinatorFilter = service.newSampleRowsFilter(fixtures.coordinator()); - Assert.assertFalse(coordinatorFilter.getOrganisationIds().isEmpty()); - Assert.assertTrue(coordinatorFilter.getOrganisationIds().contains(fixtures.coordinator().getOrganisation().getCompany().getTopiaId())); + Assert.assertFalse(coordinatorFilter.getOrganisationCompanyIds().isEmpty()); + Assert.assertTrue(coordinatorFilter.getOrganisationCompanyIds().contains(fixtures.coordinator().getOrganisation().getCompany().getTopiaId())); } @Test diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java index 4a5262c..a9332ee 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java @@ -56,13 +56,14 @@ public class WaoFixtures { this.serviceContext = serviceContext; } - protected Company getCompany(String companyName) { + protected Company getCompany(String companyName, boolean ifremer) { Company company = companies.get(companyName); if (company == null) { CompanyTopiaDao companyDao = serviceContext.getPersistenceContext().getCompanyDao(); company = companyDao.create( Company.PROPERTY_NAME, companyName, - Company.PROPERTY_ACTIVE, true); + Company.PROPERTY_ACTIVE, true, + Company.PROPERTY_IFREMER, ifremer); companies.put(companyName, company); serviceContext.getPersistenceContext().commit(); } @@ -103,11 +104,11 @@ public class WaoFixtures { } public Company ifremer() { - return getCompany("IFREMER"); + return getCompany("IFREMER", true); } public Company oceanet() { - return getCompany("OCEANET"); + return getCompany("OCEANET", false); } public Laboratory emh() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm