This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 782f88d94552887fe3d4bbabaad40cfaf50e6e8a Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 11:27:08 2016 +0200 Fix test due to mooring acoustic import test --- .../service/removedata/strategy/MooringRemoveDataStrategy.java | 7 +++++++ .../ui/actions/removedata/MooringRemoveDataServiceTest.java | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java index 547b5eb..68cca93 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringRemoveDataStrategy.java @@ -26,6 +26,7 @@ import fr.ifremer.echobase.entities.DataAccousticProvider; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Mooring; +import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -55,6 +56,12 @@ public class MooringRemoveDataStrategy extends AbstractRemoveDataStrategy<Moorin } @Override + protected void removePostData(DataAccousticProvider<Mooring> provider) throws TopiaException { + // remove orphans cells + removeOrphanCells(); + } + + @Override protected void removeImportData(DataAccousticProvider<Mooring> provider, String id) throws TopiaException { if (id.startsWith(Mooring.class.getName())) { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/MooringRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/MooringRemoveDataServiceTest.java index 6fb1d69..4d46478 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/MooringRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/MooringRemoveDataServiceTest.java @@ -39,8 +39,14 @@ public class MooringRemoveDataServiceTest extends AbstractRemoveDataServiceTest removeImport(// import to remove importMooringId, + + // data that should be removed mooringId, - importMooringId); + dataAcquisition2Id, cellEsdu2Id, cellElementary2Id, + + // importLog that should be removed + importMooringId, + importMooringAcousticId); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.