[Echobase-commits] r432 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata

28 Mar 2012

Author: tchemit
Date: 2012-03-28 19:53:48 +0200 (Wed, 28 Mar 2012)
New Revision: 432

Url: http://forge.codelutin.com/repositories/revision/echobase/432

Log:
remove TODO from tests (referentiel is ok)

Modified:
   trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java
   trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java
   trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java

Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java
===================================================================

--- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java	2012-03-28 17:49:29 UTC (rev 431)
+++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java	2012-03-28 17:53:48 UTC (rev 432)
@@ -25,16 +25,12 @@
 
 import fr.ifremer.echobase.InputFile;
 import fr.ifremer.echobase.csv.CsvFileImportResult;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
 import fr.ifremer.echobase.entities.data.Category;
 import fr.ifremer.echobase.entities.data.Result;
 import fr.ifremer.echobase.entities.references.AgeCategory;
-import fr.ifremer.echobase.entities.references.DataMetadata;
 import fr.ifremer.echobase.entities.references.SizeCategory;
 import fr.ifremer.echobase.entities.references.SpeciesCategory;
 import fr.ifremer.echobase.services.FakeEchoBaseServiceContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
 
 import java.util.List;
@@ -47,10 +43,6 @@
  */
 public class ResultsEsduCellImportServiceIT extends AbstractImportDataServiceIT {
 
-    /** Logger. */
-    private static final Log log =
-            LogFactory.getLog(ResultsEsduCellImportServiceIT.class);
-
     protected FakeEchoBaseServiceContext initContext() {
         return new FakeEchoBaseServiceContext(
                 IMPORT_DATA_ECHOBASE_CATCHES_AND_VOYAGE_RESULT);
@@ -113,12 +105,6 @@
 
         addMissingEsduCells("name", conf.getVoyageId(), inputFile);
 
-        //TODO Remove this when referentiel is ok
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "SigmaSp");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondBiomass");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "pondAbundance");
-
-
         List<CsvFileImportResult> result;
         result = doImport(conf, ResultsEsduCellImportService.class, 1);
 

Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java
===================================================================
--- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java	2012-03-28 17:49:29 UTC (rev 431)
+++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java	2012-03-28 17:53:48 UTC (rev 432)
@@ -24,11 +24,11 @@
 package fr.ifremer.echobase.services.importdata;
 
 import fr.ifremer.echobase.csv.CsvFileImportResult;
+import fr.ifremer.echobase.entities.data.Category;
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Data;
 import fr.ifremer.echobase.entities.data.Result;
 import fr.ifremer.echobase.services.FakeEchoBaseServiceContext;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
@@ -50,18 +50,15 @@
         return new String[]{"/import-data", "result", "map", filename};
     }
 
-    @Ignore
     @Test
     public void doImportMap() throws Exception {
 
-        //TODO
-
         assertImportCommonData();
         assertImportOperations();
         assertImportSampleDatas();
         assertImportVoyageResult();
 
-        assertNoEntities(Result.class);
+        assertNoEntities(Result.class, Data.class);
 
         ResultsImportConfiguration conf =
                 new ResultsImportConfiguration(getLocale());
@@ -71,16 +68,14 @@
         conf.setImportMode(ResultsImportMode.MAP);
 
         prepareInputFile(conf.getMapsFile(), getImportPath("maps.csv.gz"));
-        //TODO Use this
-        //prepareInputFile(conf.getMapResultFile(), getImportPath("mapResults.csv.gz"));
 
         List<CsvFileImportResult> result;
         result = doImport(conf, ResultsMapCellImportService.class, 1);
 
-        assertCsvImportResult(result, 0, Cell.class, 0);
-        assertCsvImportResult(result, 0, Data.class, 0);
-//        assertCsvImportResult(result,1, Result.class, 0);
-
+        assertCsvImportResult(result, 0, Cell.class, 380);
+        assertCsvImportResult(result, 0, Data.class, 2280);
+        assertCsvImportResult(result, 0, Result.class, 380);
+        assertCsvImportResult(result, 0, Category.class, 1);
     }
 
 }
\ No newline at end of file

Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java
===================================================================
--- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java	2012-03-28 17:49:29 UTC (rev 431)
+++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java	2012-03-28 17:53:48 UTC (rev 432)
@@ -24,13 +24,10 @@
 package fr.ifremer.echobase.services.importdata;
 
 import fr.ifremer.echobase.csv.CsvFileImportResult;
-import fr.ifremer.echobase.entities.EchoBaseEntityEnum;
 import fr.ifremer.echobase.entities.data.Category;
 import fr.ifremer.echobase.entities.data.Cell;
 import fr.ifremer.echobase.entities.data.Data;
 import fr.ifremer.echobase.entities.data.Result;
-import fr.ifremer.echobase.entities.references.CellType;
-import fr.ifremer.echobase.entities.references.DataMetadata;
 import fr.ifremer.echobase.entities.references.SpeciesCategory;
 import fr.ifremer.echobase.services.FakeEchoBaseServiceContext;
 import org.junit.Test;
@@ -78,30 +75,6 @@
         prepareInputFile(conf.getRegionResultFile(),
                          getImportPath("regionResults.csv.gz"));
 
-        //TODO Remove this when referentiel is ok
-        create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionSURF");
-        create(getDAO(EchoBaseEntityEnum.CellType), CellType.PROPERTY_NAME, "RegionCLAS");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "RegionEnvCoordinates");
-
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "VarianceXe");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "VarianceNASC");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanNASC");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedMeanXe");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Nesdu");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Nhauls");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanNASCWeightedBiomassDensity");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedEstimationVariance");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedEstimationCV");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "MeanBiomassDensity");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "EstimationVariance");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "EstimationCV");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "TotalEstimationVariance");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "TotalNASCWeightedEstimationVariance");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "ProportionOfTotalEstimationVariance");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "ProportionOfNASCWeightedTotalEstimationVariance");
-        //create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "Biomass");
-        create(getDAO(EchoBaseEntityEnum.DataMetadata), DataMetadata.PROPERTY_NAME, "NASCWeightedBiomass");
-
         addMissingEsduCells("esdu.name",
                             conf.getVoyageId(),
                             conf.getRegionAssociationFile());
@@ -112,9 +85,9 @@
         assertCsvImportResult(result, 0, Cell.class, 10, 0, 2083);
         assertCsvImportResult(result, 0, Data.class, 238);
         assertCsvImportResult(result, 1, Cell.class, 0, 4146, 2083);
-        assertCsvImportResult(result,2, Result.class, 1873);
-        assertCsvImportResult(result,2, Category.class, 27);
-        assertCsvImportResult(result,2, SpeciesCategory.class, 1,0,458);
+        assertCsvImportResult(result, 2, Result.class, 1873);
+        assertCsvImportResult(result, 2, Category.class, 27);
+        assertCsvImportResult(result, 2, SpeciesCategory.class, 1, 0, 458);
     }
 
 }
\ No newline at end of file

    

[Echobase-commits] r432 - trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata

tchemit＠users.forge.codelutin.com