[tutti] branch develop updated (cf75b91 -> 8b4070b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from cf75b91 fixes #5843: [SYNCHRO] Mauvaise icone utilisé pour représenter l'état de synchronisation d'une campagne new 8b4070b fix bad merge 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 8b4070bc0ef46d7829eb077a8be647843507d5d6 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 24 15:58:45 2014 +0200 fix bad merge Summary of changes: .../service/bigfin/BigfinImportServiceTest.java | 48 ---------------------- 1 file changed, 48 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 tutti. See http://git.codelutin.com/tutti.git commit 8b4070bc0ef46d7829eb077a8be647843507d5d6 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 24 15:58:45 2014 +0200 fix bad merge --- .../service/bigfin/BigfinImportServiceTest.java | 48 ---------------------- 1 file changed, 48 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java index f50fc2e..85c48df 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java @@ -18,10 +18,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -<<<<<<< HEAD -======= import org.nuiton.jaxx.application.ApplicationBusinessException; ->>>>>>> fixes #5411 [CAPTURE] Import BIGFIN import java.io.File; import java.io.IOException; @@ -34,32 +31,16 @@ import java.util.List; public class BigfinImportServiceTest { @ClassRule -<<<<<<< HEAD - public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbExport"); -======= public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbImportBigfin"); ->>>>>>> fixes #5411 [CAPTURE] Import BIGFIN /** Logger. */ private static final Log log = LogFactory.getLog(BigfinImportServiceTest.class); -<<<<<<< HEAD - public static final String PROGRAM_ID = "CAM-TEST_ELEVATION"; - - public static final String CRUISE_ID = "100003"; - - public static final String OPERATION_1_ID = "100112"; - - public static final String OPERATION_2_ID = "100113"; - - public static final String OPERATION_3_ID = "100115"; -======= public static final String PROGRAM_ID = "CAM-TEST_"; public static final String CRUISE_ID = "0"; public static final String OPERATION_1_ID = "0"; ->>>>>>> fixes #5411 [CAPTURE] Import BIGFIN protected BigfinImportService service; @@ -85,14 +66,7 @@ public class BigfinImportServiceTest { persistenceService = serviceContext.getService(PersistenceService.class); service = serviceContext.getService(BigfinImportService.class); -<<<<<<< HEAD - progressionModel = new ProgressionModel(); - progressionModel.setTotal(9); - - dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 3, OPERATION_2_ID, OPERATION_1_ID, OPERATION_3_ID); -======= dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID); ->>>>>>> fixes #5411 [CAPTURE] Import BIGFIN vracPredicate = SpeciesAbleBatchs.newSpeciesAbleBatchCategoryPredicate(PmfmId.SORTED_UNSORTED.getValue(), QualitativeValueId.VRAC.getValue()); } @@ -167,27 +141,6 @@ public class BigfinImportServiceTest { int nbNewFrequencies = 0; Assert.assertEquals(nbNewFrequencies, nbFrequenciesAdded); -<<<<<<< HEAD - Assert.assertEquals(nbFatals, fatals.size()); - Assert.assertEquals(nbErrors, errors.size()); - - // no batch imported - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); - -// int totalSortedBatchs = 0; -// for (SpeciesBatch speciesBatch : rootSpeciesBatchAfter.getChildren()) { -// -// boolean sorted = vracPredicate.apply(speciesBatch); -// -// if (sorted) { -// totalSortedBatchs++; -// } else { -// totalUnsortedBatchs++; -// } -// } - -// Assert.assertEquals(nbFrequenciesAdded, totalSortedBatchs); -======= Assert.assertEquals(2, errors.size()); Assert.assertEquals(0, warnings.size()); @@ -204,7 +157,6 @@ public class BigfinImportServiceTest { failIfNoProtocol = true; } Assert.assertTrue(failIfNoProtocol); ->>>>>>> fixes #5411 [CAPTURE] Import BIGFIN } @Test -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm