Author: echatellier Date: 2014-12-05 20:56:31 +0000 (Fri, 05 Dec 2014) New Revision: 4147 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4147 Log: Fix tests by clearing static caches Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -52,7 +52,7 @@ public static final String OBJECTIVE_TEMPLATE = "templates/script/objective.ftl"; /** Instance cache. */ - private static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); + protected static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -52,7 +52,7 @@ public static final String OPTIMIZATION_TEMPLATE = "templates/script/optimization.ftl"; /** Instance cache. */ - private static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); + protected static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); /** * Contruit un nouveau storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -68,7 +68,7 @@ public static final String RULE_TEMPLATE = "templates/script/rule.ftl"; /** Instance cache. */ - private static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); + protected static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); /** * Contruit un nouveau rule storage Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -53,7 +53,7 @@ public static final String SCRIPT_TEMPLATE = "templates/script/script.ftl"; /** Instance cache. */ - static private Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); + static protected Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); /** * Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -55,7 +55,7 @@ public static final String SENSITIVITY_EXPORT_TEMPLATE = "templates/script/sensitivityexport.ftl"; /** Instance cache. */ - private static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); + protected static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); /** * Constructeur. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -65,7 +65,7 @@ public static final String SIMULATION_PLAN_TEMPLATE = "templates/script/simulationplan.ftl"; /** Instance cache. */ - static private Map<String, SimulationPlanStorage> plansCache = new ReferenceMap<>(); + static protected Map<String, SimulationPlanStorage> plansCache = new ReferenceMap<>(); /** * Construit un nouveau SimulationPlan storage. Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -54,7 +54,7 @@ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl"; /** Simulators cache. */ - static private Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); + static protected Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); /** * Constructeur. Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -37,6 +37,7 @@ import fr.ifremer.isisfish.datastore.AutoMigrationIsisH2Config; import fr.ifremer.isisfish.datastore.CodeSourceStorage.Location; +import fr.ifremer.isisfish.datastore.DataStorageTestHelper; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; @@ -100,7 +101,10 @@ // install a new topia migration service callback // to not ask for user for migration during test AutoMigrationIsisH2Config.setTestMigrationCallBack(); - + + // reset static caches + DataStorageTestHelper.clearAllCache(); + FileUtils.copyDirectory(new File("src/test/resources/test-database").getAbsoluteFile(), IsisFish.config.getDatabaseDirectory(), HiddenFileFilter.VISIBLE); } Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2014-12-05 20:37:49 UTC (rev 4146) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2014-12-05 20:56:31 UTC (rev 4147) @@ -38,26 +38,21 @@ */ @Ignore public class DataStorageTestHelper { - - /** - * Clear static simulation cache. - */ - public static void clearSimulationCache() { - SimulationStorage.simulations.clear(); - } /** - * Clear static region cache. - */ - public static void clearRegionCache() { - RegionStorage.regions.clear(); - } - - /** * Clear all static cache. + * + * Sans vider le cache certains test peuvent planter lors de l'execution de multiples test seulement. */ public static void clearAllCache() { - clearSimulationCache(); - clearRegionCache(); + ObjectiveStorage.objectiveCache.clear(); + OptimizationStorage.objectiveCache.clear(); + RegionStorage.regions.clear(); + RuleStorage.rulesCache.clear(); + ScriptStorage.scriptsCache.clear(); + SensitivityAnalysisStorage.sensitivityCache.clear(); + SimulationPlanStorage.plansCache.clear(); + SimulationStorage.simulations.clear(); + SimulatorStorage.simulatorsCache.clear(); } }