[Echobase-commits] 03/04: fix test results

2 Apr 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/8170 in repository echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

commit c621df7d5a10a3e4825fd5465f97f83580c16427
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sat Apr 2 15:22:59 2016 +0200

    fix test results
---
 .../VoyageCatchesAllImportServiceIT.java           | 60 +++++++++++++++-------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java
index 40412da..569c5ba 100644
--- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java
+++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java
@@ -20,14 +20,13 @@
  */
 package fr.ifremer.echobase.services.service.importdata;
 
+import com.google.common.collect.Iterables;
 import fr.ifremer.echobase.entities.data.Sample;
 import fr.ifremer.echobase.entities.data.SampleData;
-import fr.ifremer.echobase.entities.references.SpeciesCategory;
 import fr.ifremer.echobase.services.FakeEchoBaseServiceContext;
 import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration;
 
 import java.io.IOException;
-import java.util.Set;
 
 /**
  * @author Tony Chemit - chemit@codelutin.com
@@ -65,22 +64,47 @@ public class VoyageCatchesAllImportServiceIT extends VoyageCatchesImportServiceI
     @Override
     protected void assertAfertImport(ImportDataResult<VoyageCatchesImportConfiguration> result) throws IOException {
 
-        Set<ImportDataFileResult> importDataFileResults = result.getImportResults();
-
-        assertNbIds(importDataFileResults, 0, fixtures.NB_SAMPLE_TOTAL());
-
-        assertCsvImportResult(importDataFileResults, 0, Sample.class, fixtures.NB_SAMPLE_TOTAL(), 0, fixtures.NB_SAMPLE());
-        assertCsvImportResult(importDataFileResults, 0, SampleData.class, fixtures.NB_SAMPLE_DATA_TOTAL(), 0, fixtures.NB_SAMPLE_DATA());
-        assertCsvImportResult(importDataFileResults, 0, SpeciesCategory.class, 4, 0, 456);
-
-        assertNbIds(importDataFileResults, 1, fixtures.NB_SAMPLE_UNSORTED());
-        assertCsvImportResult(importDataFileResults, 1, Sample.class, fixtures.NB_SAMPLE_UNSORTED(), 0, fixtures.NB_SAMPLE());
-        assertCsvImportResult(importDataFileResults, 1, SampleData.class, fixtures.NB_SAMPLE_DATA_UNSORTED(), 0, fixtures.NB_SAMPLE_DATA());
-        assertCsvImportResult(importDataFileResults, 1, SpeciesCategory.class, 9, 0, 456);
-
-        assertNbIds(importDataFileResults, 2, fixtures.NB_SAMPLE_BIOMETRY());
-        assertCsvImportResult(importDataFileResults, 2, Sample.class, fixtures.NB_SAMPLE_BIOMETRY(), 0, fixtures.NB_SAMPLE());
-        assertCsvImportResult(importDataFileResults, 2, SampleData.class, fixtures.NB_SAMPLE_DATA_BIOMETRY(), 0, fixtures.NB_SAMPLE_DATA());
+        int nbSample = fixtures.NB_SAMPLE();
+        int nbSampleData = fixtures.NB_SAMPLE_DATA();
+
+        int nbSampleTotal = fixtures.NB_SAMPLE_TOTAL();
+        int nbSampleDataTotal = fixtures.NB_SAMPLE_DATA_TOTAL();
+
+        int nbSampleUnsorted = fixtures.NB_SAMPLE_UNSORTED();
+        int nbSampleDataUnsorted = fixtures.NB_SAMPLE_DATA_UNSORTED();
+
+        int nbSampleBiometry = fixtures.NB_SAMPLE_BIOMETRY();
+        int nbSampleDataBiometry = fixtures.NB_SAMPLE_DATA_BIOMETRY();
+
+        {
+            ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 0);
+
+            assertCsvImportResultPerEntity(importDataFileResult, Sample.class, nbSampleTotal, 0, nbSample);
+            assertCsvImportResultPerEntity(importDataFileResult, SampleData.class, nbSampleDataTotal, 0, nbSampleData);
+            assertCsvImportResult0(importDataFileResult, nbSampleTotal);
+        }
+        {
+            ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 1);
+            assertCsvImportResultPerEntity(importDataFileResult, Sample.class, nbSampleUnsorted, 0, nbSample);
+            assertCsvImportResultPerEntity(importDataFileResult, SampleData.class, nbSampleDataUnsorted, 0, nbSampleData);
+            assertCsvImportResult0(importDataFileResult, nbSampleUnsorted + nbSampleDataUnsorted);
+        }
+
+        {
+            ImportDataFileResult importDataFileResult = Iterables.get(result.getImportResults(), 2);
+            assertCsvImportResultPerEntity(importDataFileResult, Sample.class, nbSampleBiometry, 0, nbSample);
+            assertCsvImportResultPerEntity(importDataFileResult, SampleData.class, nbSampleDataBiometry, 0, nbSampleData);
+            assertCsvImportResult0(importDataFileResult, nbSampleBiometry + nbSampleDataBiometry);
+
+        }
+//        assertNbIds(importDataFileResults, 1, fixtures.NB_SAMPLE_UNSORTED());
+//        assertCsvImportResult(importDataFileResults, 1, Sample.class, fixtures.NB_SAMPLE_UNSORTED(), 0, fixtures.NB_SAMPLE());
+//        assertCsvImportResult(importDataFileResults, 1, SampleData.class, fixtures.NB_SAMPLE_DATA_UNSORTED(), 0, fixtures.NB_SAMPLE_DATA());
+//        assertCsvImportResult(importDataFileResults, 1, SpeciesCategory.class, 9, 0, 456);
+//
+//        assertNbIds(importDataFileResults, 2, fixtures.NB_SAMPLE_BIOMETRY());
+//        assertCsvImportResult(importDataFileResults, 2, Sample.class, fixtures.NB_SAMPLE_BIOMETRY(), 0, fixtures.NB_SAMPLE());
+//        assertCsvImportResult(importDataFileResults, 2, SampleData.class, fixtures.NB_SAMPLE_DATA_BIOMETRY(), 0, fixtures.NB_SAMPLE_DATA());
 
         assertImportSampleDatas();
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Echobase-commits] 03/04: fix test results

codelutin.com scm