Author: echatellier Date: 2015-06-24 08:04:58 +0000 (Wed, 24 Jun 2015) New Revision: 4291 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4291 Log: Fix tests Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -68,6 +68,11 @@ super(rootSrc, directory, name); } + @Override + public String getPackage() { + return SENSITIVITY_EXPORT_PATH; + } + /** * Get context (official VCS) sensitivity export directory. * Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -72,8 +72,7 @@ .getTemplate(FormuleStorage.FORMULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? + Map<String, Object> root = new HashMap<>(); root.put("category", ""); root.put("name", fileName); root.put("date", new Date()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ObjectiveStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(ObjectiveStorage.OBJECTIVE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/OptimizationStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,8 +73,7 @@ .getTemplate(OptimizationStorage.OPTIMIZATION_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? + Map<String, Object> root = new HashMap<>(); root.put("category", ""); root.put("name", fileName); root.put("date", new Date()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ResultInfoStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -65,9 +65,7 @@ .getTemplate(ResultInfoStorage.RESULT_INFO_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(RuleStorage.RULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); @@ -111,9 +109,7 @@ .getTemplate(RuleStorage.RULE_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -102,12 +102,10 @@ // get template Template template = freemarkerConfiguration - .getTemplate(RuleStorage.RULE_TEMPLATE); + .getTemplate(ScriptStorage.SCRIPT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -74,9 +74,7 @@ .getTemplate(SensitivityAnalysisStorage.SENSITIVITY_ANALYSIS_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -73,9 +73,7 @@ .getTemplate(SensitivityExportStorage.SENSITIVITY_EXPORT_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -74,9 +74,7 @@ .getTemplate(SimulationPlanStorage.SIMULATION_PLAN_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName()); Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2015-06-23 16:49:38 UTC (rev 4290) +++ trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2015-06-24 08:04:58 UTC (rev 4291) @@ -81,9 +81,7 @@ .getTemplate(SimulatorStorage.SIMULATOR_TEMPLATE); // context values - Map<String, Object> root = new HashMap<String, Object>(); - // FIXME what is category ? - root.put("category", ""); + Map<String, Object> root = new HashMap<>(); root.put("name", fileName); root.put("date", new Date()); root.put("author", IsisFish.config.getUserName());