branch feature/8180 updated (d9e0c99 -> 782f88d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d9e0c99 Add test on remove mooring acoustic import new 90f4702 Add migration for database for the mooring new 782f88d Fix test due to mooring acoustic import test The 2 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 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 commit 90f4702fd7e19ea66c721cf4863192cdcd6c22c1 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 11:20:29 2016 +0200 Add migration for database for the mooring Summary of changes: .../service/removedata/strategy/MooringRemoveDataStrategy.java | 7 +++++++ .../ifremer/echobase/services/MigrateImportDataDatabasesIT.java | 4 ++++ .../ui/actions/removedata/MooringRemoveDataServiceTest.java | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) -- 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 feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 90f4702fd7e19ea66c721cf4863192cdcd6c22c1 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jun 27 11:20:29 2016 +0200 Add migration for database for the mooring --- .../fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java index 0cd9cb0..33ffcc9 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java @@ -127,4 +127,8 @@ public class MigrateImportDataDatabasesIT extends EchoBaseServiceSupport { @Test public void catchesWithVoyageResult() { } + + @Test + public void mooring() { + } } -- 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 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>.
participants (1)
-
codelutin.com scm