Author: echatellier Date: 2015-06-23 14:46:50 +0000 (Tue, 23 Jun 2015) New Revision: 4285 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4285 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java trunk/src/main/resources/sensitivity.properties trunk/src/test/resources/test-database/scripts/SiMatrix.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -178,10 +178,6 @@ } } } - - // migration v 4.1.2 (resuppression des colunnes pour que la suite de la migration soit cohérente) - tx.executeSQL("alter table POPULATION drop column fbargroupmin"); - tx.executeSQL("alter table POPULATION drop column fbargroupmax"); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV43V44.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -63,6 +63,10 @@ List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { + // relicat de la migration depuis la version MigrationV33V40 + tx.executeSQL("alter table POPULATION drop column IF EXISTS fbargroupmin;"); + tx.executeSQL("alter table POPULATION drop column IF EXISTS fbargroupmax;"); + // add recruitment equation tx.executeSQL("alter table POPULATION add column IF NOT EXISTS RecruitmentEQUATION VARCHAR(255);"); // add abundanceReferenceMonth field Modified: trunk/src/main/resources/sensitivity.properties =================================================================== --- trunk/src/main/resources/sensitivity.properties 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/main/resources/sensitivity.properties 2015-06-23 14:46:50 UTC (rev 4285) @@ -38,8 +38,8 @@ Gear.standardisationFactor Metier.gearParameterValue Population.capturability -Population.groupMax -Population.groupMin +Population.fbarGroupMax +Population.fbarGroupMin Population.growth Population.growthReverse Population.mappingZoneReproZoneRecru Modified: trunk/src/test/resources/test-database/scripts/SiMatrix.java =================================================================== --- trunk/src/test/resources/test-database/scripts/SiMatrix.java 2015-06-23 14:46:29 UTC (rev 4284) +++ trunk/src/test/resources/test-database/scripts/SiMatrix.java 2015-06-23 14:46:50 UTC (rev 4285) @@ -1980,8 +1980,8 @@ List<PopulationGroup> groups = pop.getPopulationGroup(); - int groupMin = pop.getGroupMin(); - int groupMax = pop.getGroupMax(); + int groupMin = pop.getFbarGroupMin(); + int groupMax = pop.getFbarGroupMax(); int Nbre = (int)groupMax - (int)groupMin + 1; //log.info("Nbre = " + Nbre);