- Isis-fish-commits - mailman.cloud.codelutin.com

r2579 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 03 Sep '09

03 Sep '09

Author: chatellier Date: 2009-09-03 08:53:36 +0000 (Thu, 03 Sep 2009) New Revision: 2579 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix a sort problem with equals date (often in windows system). Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-09-02 14:08:08 UTC (rev 2578) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-09-03 08:53:36 UTC (rev 2579) @@ -128,7 +128,13 @@ @Override public int compare(SimpleEntry<Date, SimulationJob> o1, SimpleEntry<Date, SimulationJob> o2) { - return o1.getKey().compareTo(o2.getKey()); + // TODO change this, it's a set with duplicated entries !!! + int result = o1.getKey().compareTo(o2.getKey()); + // with bad luck (or windows system) date can be equals :( + if (result == 0) { + result = o1.getValue().compareTo(o2.getValue()); + } + return result; } }); Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2009-09-03 08:53:36 UTC (rev 2579) @@ -0,0 +1,77 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.simulator.launcher; + +import java.util.Comparator; +import java.util.Date; +import java.util.SortedSet; +import java.util.TreeSet; +import java.util.AbstractMap.SimpleEntry; + +import org.junit.Assert; +import org.junit.Test; + +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.simulator.SimulationControl; +import fr.ifremer.isisfish.simulator.SimulationParameter; + +/** + * Test de la class SimulationMonitor. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SimulationMonitorTest extends AbstractIsisFishTest { + + protected SortedSet<SimpleEntry<Date, SimulationJob>> checkSet = new TreeSet<SimpleEntry<Date, SimulationJob>>(new Comparator<SimpleEntry<Date, SimulationJob>>(){ + @Override + public int compare(SimpleEntry<Date, SimulationJob> o1, + SimpleEntry<Date, SimulationJob> o2) { + + int result = o1.getKey().compareTo(o2.getKey()); + if (result == 0) { + result = o1.getValue().compareTo(o2.getValue()); + } + return result; + } + + }); + + @Test + public void testSimulationSetUniqueNess() { + SimulationService service = SimulationService.getService(); + + SimulationControl control1 = new SimulationControl("test1"); + SimulationItem item1 = new SimulationItem(control1, new SimulationParameter()); + SimulationJob job1 = new SimulationJob(service, item1, 0); + + SimulationControl control2 = new SimulationControl("test2"); + SimulationItem item2 = new SimulationItem(control2, new SimulationParameter()); + SimulationJob job2 = new SimulationJob(service, item2, 0); + + Date d = new Date(); + checkSet.add(new SimpleEntry<Date, SimulationJob>(d, job1)); + checkSet.add(new SimpleEntry<Date, SimulationJob>(d, job2)); + + Assert.assertEquals(2, checkSet.size()); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2578 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 14:08:08 +0000 (Wed, 02 Sep 2009) New Revision: 2578 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: Add duplicated message for code duplication Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-02 14:02:38 UTC (rev 2577) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-09-02 14:08:08 UTC (rev 2578) @@ -64,6 +64,7 @@ import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.ui.WelcomeUI; +import fr.ifremer.isisfish.util.ConverterUtil; import fr.ifremer.isisfish.util.DateConverter; import fr.ifremer.isisfish.util.MonthConverter; import fr.ifremer.isisfish.util.RangeOfValuesConverter; @@ -513,6 +514,8 @@ /** * Initialise les convertiseurs utilisé par commons-beansutils. + * + * @deprecated since 3.2.0.5 duplicated with {@link ConverterUtil#getConverter(org.codelutin.topia.TopiaContext)} */ protected static void initConvertersAndMatrixFactory() {

1 0

r2577 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 14:02:38 +0000 (Wed, 02 Sep 2009) New Revision: 2577 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java Log: Improve test on rules Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 13:47:36 UTC (rev 2576) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 14:02:38 UTC (rev 2577) @@ -204,7 +204,7 @@ info.addRuleInitTime("rule1", 30); info.addRuleInitTime("rule2", 8); info.addRuleInitTime("rule3", 321); - info.addRuleInitTime("rule4", 321); + info.addRuleInitTime("rule4", 123); // time must be added info.addRulePreTime("rule1", 20); @@ -212,8 +212,8 @@ info.addRulePreTime("rule1", 20); info.addRulePostTime("rule1", 25); - info.addRulePreTime("rule2", 20); - info.addRulePostTime("rule2", 25); + info.addRulePreTime("rule2", 18); + info.addRulePostTime("rule2", 500); info.addRulePreTime("rule3", 20); // no additional time for rule 4 @@ -222,10 +222,24 @@ SimulationInformation testInfo = new SimulationInformation(file); Assert.assertFalse(testInfo.hasError()); - //Assert.assertEquals(30, testInfo.getExportTime("export1")); - //Assert.assertEquals(40, testInfo.getExportTime("export2")); - //Assert.assertEquals(50, testInfo.getExportTime("export3")); - //Assert.assertEquals(60, testInfo.getExportTime("export4")); - //Assert.assertTrue(testInfo.toString().indexOf("export1") > 0); + Assert.assertEquals(30, testInfo.getRuleInitTime("rule1")); + Assert.assertEquals(8, testInfo.getRuleInitTime("rule2")); + Assert.assertEquals(321, testInfo.getRuleInitTime("rule3")); + Assert.assertEquals(123, testInfo.getRuleInitTime("rule4")); + + Assert.assertEquals(20 + 20, testInfo.getRulePreTime("rule1")); + Assert.assertEquals(25 + 25, testInfo.getRulePostTime("rule1")); + + Assert.assertEquals(18, testInfo.getRulePreTime("rule2")); + Assert.assertEquals(500, testInfo.getRulePostTime("rule2")); + + Assert.assertEquals(20, testInfo.getRulePreTime("rule3")); + Assert.assertEquals(0, testInfo.getRulePostTime("rule3")); + + Assert.assertEquals(0, testInfo.getRulePreTime("rule4")); + Assert.assertEquals(0, testInfo.getRulePostTime("rule4")); + + // total time present rule2 + Assert.assertTrue(testInfo.toString().indexOf("rule2 : 0.526") > 0); } }

1 0

r2576 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 13:47:36 +0000 (Wed, 02 Sep 2009) New Revision: 2576 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java Log: Add rule time on simulation information. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 13:47:17 UTC (rev 2575) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 13:47:36 UTC (rev 2576) @@ -30,8 +30,10 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Properties; +import java.util.Set; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -58,24 +60,26 @@ private static final String END_SIMULATION = "simulationEnd"; private static final String EXPORT_TIME = "exportTime"; private static final String RULE_TIME = "ruleTime"; + private static final String RULE_TIME_INIT = RULE_TIME + ".init"; + private static final String RULE_TIME_PRE = RULE_TIME + ".pre"; + private static final String RULE_TIME_POST = RULE_TIME + ".post"; private static final String OTHER_INFO = "otherInfo"; private static final String STATISTIC = "statistic"; private static final String OPTIMIZATION_USAGE = "optimizationUsage"; private static final String SIMULATION_EXCEPTION = "exception"; - private static final String RULE_TIME_INIT = "init"; - private static final String RULE_TIME_PRE = "pre"; - private static final String RULE_TIME_POST = "post"; - private static final SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd HH:mm:ss"); protected Properties info = new Properties(); + protected File file = null; /** * Constructor. * + * If file already exists, load his content into current instance. + * * @param file simulation information output file */ public SimulationInformation(File file) { @@ -100,9 +104,13 @@ @Override public String toString() { String result = "Simulation Information:\n"; + + // date start/end result += "Start: " + dateFormat.format(getSimulationStart()) + " End: " + dateFormat.format(getSimulationEnd()) + "\n"; - Map<String, Long> exportTime = getExportTime(); + + // exports + Map<String, Long> exportTime = getExportTimes(); if (exportTime.size() > 0) { result += "Export time:\n"; for (Map.Entry<String, Long> entry : exportTime.entrySet()) { @@ -114,19 +122,56 @@ } } + // rules + Set<String> ruleNames = getRuleNames(); + if (ruleNames.size() > 0) { + result += "Rule time:\n"; + for (String ruleName : ruleNames) { + long time = getRuleInitTime(ruleName); + long total = time; + if (time > 0) { + + String details = ""; + details += "init:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + + // can be 0 if condition always return false, never entrer pre/post + time = getRulePreTime(ruleName); + if (time > 0) { + total += time; + details += ", pre:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + } + time = getRulePostTime(ruleName); + if (time > 0) { + total += time; + details += ", post:" + DurationFormatUtils.formatDuration(time, "s'.'S"); + } + + result += "\t" + ruleName + " : " + DurationFormatUtils.formatDuration(total, "s'.'S"); + result += " (" + details + ")"; + result += "\n"; + } + } + } + + // general information String info = getInformation(); if (info != null && !"".equals(info)) { result += "Information:\n" + info + "\n"; } + // Statistic String v = getStatistic(); if (v != null) { result += "Statistic:\n" + v + "\n"; } + + // Optimisation usage v = getOptimizationUsage(); if (v != null) { result += "Optimisation usage:\n" + v + "\n"; } + + // Exception v = getException(); if (v != null) { result += "Exception:\n" + v + "\n"; @@ -181,8 +226,9 @@ } /** - * Get the date of simulation start - * @return + * Get the date of simulation start. + * + * @return simulation end date */ public Date getSimulationEnd() { String d = info.getProperty(END_SIMULATION); @@ -206,11 +252,16 @@ setInfo(END_SIMULATION, dateFormat.format(date)); } + public void addExportTime(String exportName, long time) { + setInfo(EXPORT_TIME + "." + exportName, String.valueOf(time)); + } + /** - * get all export time in map - * @return + * Get all export time in map. + * + * @return a map with all export time */ - public Map<String, Long> getExportTime() { + protected Map<String, Long> getExportTimes() { Map<String, Long> result = new HashMap<String, Long>(); for (String key : info.stringPropertyNames()) { if (key.startsWith(EXPORT_TIME + ".")) { @@ -235,6 +286,16 @@ return result; } + /** + * Get all export time in map. + * + * @return a map with all export time + * @deprecated since 3.2.0.5, use {@link #getExportTimes()} instead + */ + public Map<String, Long> getExportTime() { + return getExportTimes(); + } + public long getExportTime(String exportName) { String t = info.getProperty(EXPORT_TIME + "." + exportName); long result = 0; @@ -250,10 +311,152 @@ return result; } - public void addExportTime(String exportName, long time) { - setInfo(EXPORT_TIME + "." + exportName, String.valueOf(time)); + /** + * Add rule time. + * + * If a time already exists for ruleName, add time to previous time. + * (usefull because pre/post action are called multiples time) + * + * @param keyName (ie {@link #RULE_TIME_INIT}, {@link #RULE_TIME_PRE}, {@link #RULE_TIME_POST}) + * @param ruleName rule name + * @param time time to add + * + * @since 3.2.0.5 + */ + protected void addRuleTime(String keyName, String ruleName, long time) { + + // get previous time + String previousTimeAsString = info + .getProperty(keyName + "." + ruleName); + long previousTime = 0; + if (previousTimeAsString != null) { + try { + previousTime = Long.parseLong(previousTimeAsString); + } catch (NumberFormatException eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.parse.long", + previousTimeAsString), eee); + } + } + } + + // add + long newTime = previousTime + time; + + // set new time in + setInfo(keyName + "." + ruleName, String.valueOf(newTime)); } + /** + * Add rule init time. + * + * If a time already exists for ruleName, add time to previous time. + * + * @param ruleName rule name + * @param time time to add + * @since 3.2.0.5 + */ + public void addRuleInitTime(String ruleName, long time) { + addRuleTime(RULE_TIME_INIT, ruleName, time); + } + + /** + * Add rule pre operation time time. + * + * If a time already exists for ruleName, add time to previous time. + * + * @param ruleName rule name + * @param time time to add + * @since 3.2.0.5 + */ + public void addRulePreTime(String ruleName, long time) { + addRuleTime(RULE_TIME_PRE, ruleName, time); + } + + /** + * Add rule post operation time. + * + * If a time already exists for ruleName, add time to previous time. + * + * @param ruleName rule name + * @param time time to add + * @since 3.2.0.5 + */ + public void addRulePostTime(String ruleName, long time) { + addRuleTime(RULE_TIME_POST, ruleName, time); + } + + /** + * Get rule init operation time. + * + * @param ruleName rule name + * @return time + * @since 3.2.0.5 + */ + public long getRuleInitTime(String ruleName) { + return getRuleTime(RULE_TIME_INIT, ruleName); + } + + /** + * Get rule pre operation time. + * + * @param ruleName rule name + * @return time + * @since 3.2.0.5 + */ + public long getRulePreTime(String ruleName) { + return getRuleTime(RULE_TIME_PRE, ruleName); + } + + /** + * Get rule post operation time. + * + * @param ruleName rule name + * @return time + * @since 3.2.0.5 + */ + public long getRulePostTime(String ruleName) { + return getRuleTime(RULE_TIME_POST, ruleName); + } + + /** + * Get rule operation time. + * + * @param ruleName rule name + * @since 3.2.0.5 + */ + protected long getRuleTime(String prefixName, String ruleName) { + String t = info.getProperty(prefixName + "." + ruleName); + long result = 0; + if (t != null) { + try { + result = Long.parseLong(t); + } catch (NumberFormatException eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.parse.long", t), eee); + } + } + } + return result; + } + + /** + * Get rules names. + * + * @return a map with all export time + */ + protected Set<String> getRuleNames() { + Set<String> result = new HashSet<String>(); + for (String key : info.stringPropertyNames()) { + if (key.startsWith(RULE_TIME + ".")) { + // recupere le nom apres le deuxieme "." + String ruleName = key.substring(key.indexOf('.', RULE_TIME.length() + 1) + 1); + result.add(ruleName); + } + } + return result; + } + public String getStatistic() { String result = info.getProperty(STATISTIC); return result; @@ -297,6 +500,7 @@ /** * @deprecated since 3.2.0.5, use {@link #getInformation()} instead + * @return other information */ public String getInfomation() { return getInformation(); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 13:47:17 UTC (rev 2575) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 13:47:36 UTC (rev 2576) @@ -26,8 +26,9 @@ import java.text.SimpleDateFormat; import java.util.Date; -import junit.framework.Assert; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; /** @@ -43,6 +44,9 @@ */ public class SimulationInformationTest { + /** Log. */ + protected static Log log = LogFactory.getLog(SimulationInformationTest.class); + /** * Test simulation information with no data. * @@ -60,6 +64,7 @@ Assert.assertFalse(info.hasError()); Assert.assertNull(info.getException()); Assert.assertEquals(0, info.getExportTime("test")); + Assert.assertNotNull(info.toString()); } /** @@ -84,6 +89,7 @@ Assert.assertFalse(info.hasError()); Assert.assertTrue(info.getOptimizationUsage().indexOf("Cache used") > 0); Assert.assertNull(info.getStatistic()); + Assert.assertTrue(info.toString().indexOf("VesselMargin.java") > 0); } /** @@ -101,6 +107,7 @@ SimulationInformation info = new SimulationInformation(file); Assert.assertTrue(info.hasError()); Assert.assertTrue(info.getException().indexOf("TopiaException") > 0); + Assert.assertTrue(info.toString().indexOf("TopiaException") > 0); } /** @@ -130,6 +137,7 @@ SimulationInformation testInfo = new SimulationInformation(file); Assert.assertEquals(d1, testInfo.getSimulationStart()); Assert.assertEquals(d2, testInfo.getSimulationEnd()); + Assert.assertTrue(testInfo.toString().indexOf("15:50:47") > 0); } /** @@ -152,6 +160,7 @@ SimulationInformation testInfo = new SimulationInformation(file); Assert.assertTrue(testInfo.hasError()); Assert.assertTrue(testInfo.getException().indexOf("grave") > 0); + Assert.assertTrue(testInfo.toString().indexOf("grave") > 0); } @@ -178,5 +187,45 @@ Assert.assertEquals(40, testInfo.getExportTime("export2")); Assert.assertEquals(50, testInfo.getExportTime("export3")); Assert.assertEquals(60, testInfo.getExportTime("export4")); + Assert.assertTrue(testInfo.toString().indexOf("export1") > 0); } + + /** + * Test simulation rule time. + * + * @throws IOException + */ + @Test + public void testSimulationRuleTime() throws IOException { + File file = File.createTempFile("information-rule", ".txt"); + file.deleteOnExit(); + + SimulationInformation info = new SimulationInformation(file); + info.addRuleInitTime("rule1", 30); + info.addRuleInitTime("rule2", 8); + info.addRuleInitTime("rule3", 321); + info.addRuleInitTime("rule4", 321); + + // time must be added + info.addRulePreTime("rule1", 20); + info.addRulePostTime("rule1", 25); + info.addRulePreTime("rule1", 20); + info.addRulePostTime("rule1", 25); + + info.addRulePreTime("rule2", 20); + info.addRulePostTime("rule2", 25); + + info.addRulePreTime("rule3", 20); + // no additional time for rule 4 + + info.store(); + + SimulationInformation testInfo = new SimulationInformation(file); + Assert.assertFalse(testInfo.hasError()); + //Assert.assertEquals(30, testInfo.getExportTime("export1")); + //Assert.assertEquals(40, testInfo.getExportTime("export2")); + //Assert.assertEquals(50, testInfo.getExportTime("export3")); + //Assert.assertEquals(60, testInfo.getExportTime("export4")); + //Assert.assertTrue(testInfo.toString().indexOf("export1") > 0); + } }

1 0

r2575 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 13:47:17 +0000 (Wed, 02 Sep 2009) New Revision: 2575 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java Log: Update export doc. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java 2009-09-02 13:28:25 UTC (rev 2574) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/Export.java 2009-09-02 13:47:17 UTC (rev 2575) @@ -24,7 +24,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; /** - * Interface que doivent implanter les classes d'export de resultats + * Interface que doivent implanter les classes d'export de resultats. * * Le nom du fichier d'export qui sera utilisé sera le basé sur le nom de la * classe d'export @@ -40,30 +40,35 @@ public interface Export { /** + * Necessary results names for export execution. + * * @return the necessaryResult name */ public String[] getNecessaryResult(); /** - * Return Export description + * Return Export description. + * * @return string displayable to the end user */ public String getDescription(); /** - * Return filename used to contains export data + * Return filename used to contains export data. + * * @return filename by example "myexport" */ public String getExportFilename(); /** - * Return extension used as filename name extension + * Return extension used as filename name extension. + * * @return extension by example ".csv" */ public String getExtensionFilename(); /** - * Exporte les resultat + * Exporte les resultat. * * @param simulation la simulation dont on souhaite exporter les resultats * @param out la sortie sur lequel il faut ecrire l'export Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-09-02 13:28:25 UTC (rev 2574) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-09-02 13:47:17 UTC (rev 2575) @@ -38,7 +38,7 @@ import fr.ifremer.isisfish.util.ConverterUtil; /** - * Export helper. + * Helper for exports manipulation. * * Created: 20 janv. 2006 01:52:04 *

1 0

r2574 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 13:28:25 +0000 (Wed, 02 Sep 2009) New Revision: 2574 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java Log: Fix junit package Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-09-02 12:29:08 UTC (rev 2573) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-09-02 13:28:25 UTC (rev 2574) @@ -22,8 +22,7 @@ import java.net.URISyntaxException; import java.net.URL; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test;

1 0

r2573 - in isis-fish/trunk/src/test: java/fr/ifremer/isisfish/util/ssh resources resources/fr/ifremer/isisfish resources/fr/ifremer/isisfish/util resources/fr/ifremer/isisfish/util/ssh
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 12:29:08 +0000 (Wed, 02 Sep 2009) New Revision: 2573 Added: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.pub isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.txt Removed: isis-fish/trunk/src/test/resources/ssh/ Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java Log: Load private key in classpath. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-09-02 11:04:38 UTC (rev 2572) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2009-09-02 12:29:08 UTC (rev 2573) @@ -20,6 +20,7 @@ import java.io.File; import java.net.URISyntaxException; +import java.net.URL; import junit.framework.Assert; @@ -51,7 +52,8 @@ */ @BeforeClass public static void init() throws URISyntaxException { - keyFile = new File("src/test/resources/ssh/isistestkey"); + URL keyURL = SSHAgentTest.class.getResource("isistestkey"); + keyFile = new File(keyURL.getPath()); } /** Copied: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey (from rev 2550, isis-fish/trunk/src/test/resources/ssh/isistestkey) =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey (rev 0) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey 2009-09-02 12:29:08 UTC (rev 2573) @@ -0,0 +1,30 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: DES-EDE3-CBC,C78258F97D4516F9 + +31azf6UcEu1zvBpQE/nZuQLR7F97paRe3AvJcfHGlz8bqQd5JP8axRA0RzbKA22+ +C3p8Sk980/oNPDnceR7fGfRWrypzsSaGkV1BsDK2wkcWgpdJIomQVjEqKmNO1jkZ +wKHSE1rAQq1PtJLVoXEwOwpOnH2LRjuiExyIqZePciyMCd/QJ5orU+i4mCZErx3F +1Pdz8VeDLEZRmsfbZh/OKqrZ7z9zRMtpIS9oXgw1sRH303AmU9/2hBflnhFddQFx +d2bjAzAL/5rBIsBuwVJfcfRENWVlJcGJBmeiC8jW7GiBKNv8syPHq3DVg1JbnGWK +0mYRzOcQlj9JOh/C3f2inU2agIJBPnpUqEmhBhXGziBVBwf7ulApjTKyFt2KZ5Tw +aIvrm5LASrUaEDeIx0wCuAyAvgJ0CkcB5BwzTImICqjmKuLnMqV0lUUU4ZmZkDkn +JPwaceaqwHxfHomOhUpESTSrEd6hIoAmBKi++jRWFKzEod1KlK7HL3KNhvnlHyiY +G4i2eIbi7D76iQipynrHtOwdKswqWsz7+YifY5gY/HnJZl4AGGTNG+RXJnoWmMzp +BCXBNbUDRWNZSVgKtcMKBV+0q4REp/EexdpaSNdmmmusMKi/41xNn68pfjGqqNgh +XHHe93lMBdRzwhMbjZzMnGY3mcFuw+BjL3v6L1etz6j/z2mDLGqaWmHbjmWBRxni +y+RdOoX/uUL9hY/aisX7Zm4H6rVNVgxPC7rRPzFu0Oaf5iV3Qbdp5YkMbZCZlQFD +S/g+UOtpx7gYLMWiuqd6CljMgiYVVY/jmMbtL44cKCQbqqfncAmnrGuKMJ/uJR46 +Hw4uSv1i4fZKxb6LhFkQRjkY+yED7a9Mz3yddqeT79DsacM4ctNtnp07LWXaufKt +FXVnBXA0YgjlJDEtDaXvJfXfoV0GjqhogOS+MyYyR0fAhbD+8MOH0wrdCN6ov1PV ++ZdKOgKgTzLg3Aeh+Bkar04W+8YnO4c12IVMe2Iv0IxUZnYPmKBy1UK9PO7qDH3G +GQJrjxcXwFR8CaOzLGNVMvOdLIAzlxrunpTiDOO76EB4uoZCRa4NC9p9aMC0KJ5W +FuSkdpypu3O4JtC+bs2+rjbn9kGzV1rsmTQKs5ZpX7elJZLBVTw6E3it6qCsXv7e +Ak2B6zXd1OiwMYbWdtKGkp70UFprWbha8N46DL2LgSay4OXJLSN8Ha0+Z6vUE8dE +4Qe4oqUGjgE9QnYRpN/sCddJKQMtNjlqkHFmNNo2uIXVZGpueLn5dLNXbOmzI5a2 +R42HIxGMiRbOLc/0X2Dl9S2PU27w2n0woFHI7C1siO8jfHcYrUJWnfTng+/wY0jC +W+qdSsBjjbOzSwalZV7r+xUSjoVe6MemhwYM4Tg7Z/kVGIWt7F2q3GiOHLiYPNdw +9lWQtn8yTZcLUIbwWPWkPZ0vNYUPQcd7z86ysiUtEEZDWVA98fkA8nRWP1qKbO3D +7V9G1YD3KUx8l88kFCKAgt8N+pB9Co8L1P58FioxsXMXbSBlnrf4za80IK5CZ2IR +C2aU6FimsuTnP19cVSj4sUdHr7zYdqJ0JQHlYn/FGb1cp+wPWNvJOw== +-----END RSA PRIVATE KEY----- Copied: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.pub (from rev 2550, isis-fish/trunk/src/test/resources/ssh/isistestkey.pub) =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.pub (rev 0) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.pub 2009-09-02 12:29:08 UTC (rev 2573) @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzQdBma9PwFdIx+GZg/bOlgjFINc9+iv5pe7HmD+v+RuJ7Miw7MBnttpB2mg7Q+p1V/2V2h9QX1QiRC78/JQptkQrqItpnifQduwL7p53oLC57DQXdLdg5waeqp6yhifFosTpvkhNmhni8A8GoJpd8YIAdExttOe2vboBB4NBjlj6ujqXBBwIGNQuGJ+yCN9wiitwawzCPtAn7HXfGSjWSH+vxo75DcT6BaLi2Rwni7CjHQZUoNQMK1aTL0Wn5EvqOW/vHaWQ4ARKxuuVOCwlYMaJxk3orWl90ZZuOtEHkwxTeXEnBS2JnHbiVFTj3R63rr23UofSC32tsz3+YiFTFQ== chatellier at genux Copied: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.txt (from rev 2550, isis-fish/trunk/src/test/resources/ssh/isistestkey.txt) =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.txt (rev 0) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/util/ssh/isistestkey.txt 2009-09-02 12:29:08 UTC (rev 2573) @@ -0,0 +1,3 @@ +Clé ssh pour les tests unitaire de ISIS. + +La passphrase est "isispassphrase".

1 0

r2572 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/datastore test/resources test/resources/fr test/resources/fr/ifremer test/resources/fr/ifremer/isisfish test/resources/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 11:04:38 +0000 (Wed, 02 Sep 2009) New Revision: 2572 Added: isis-fish/trunk/src/test/resources/fr/ isis-fish/trunk/src/test/resources/fr/ifremer/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/exception.information isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/information Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java Log: Ajout de test sur un format de fichier existant. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 10:42:23 UTC (rev 2571) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 11:04:38 UTC (rev 2572) @@ -41,7 +41,7 @@ * Cette classe permet de conserver des informations sur le deroulement d'une * simulation. La plupart des informations sont automatiquement renseignees, * mais l'utilisateur peut lui aussi ajouter des informations avec la methode - * {@link #addInformation(String)} + * {@link #addInformation(String)}. * * @author poussin * @version $Revision$ @@ -307,7 +307,7 @@ * * @return other information */ - public String getInformation() { + protected String getInformation() { String result = info.getProperty(OTHER_INFO); if (result == null) { result = ""; @@ -315,7 +315,12 @@ return result; } - public void addInformation(String value) { - setInfo(OTHER_INFO, getInformation() + value + "\n"); + /** + * Add additional simulation information. + * + * @param info new info + */ + public void addInformation(String info) { + setInfo(OTHER_INFO, getInformation() + info + "\n"); } } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 10:42:23 UTC (rev 2571) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 11:04:38 UTC (rev 2572) @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; +import java.net.URL; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -62,6 +63,47 @@ } /** + * Test que le format du fichier de simulation ne change pas. + * + * @throws ParseException + */ + @Test + public void testExistingSimulationFile() throws ParseException { + URL informationURL = SimulationInformationTest.class.getResource("information"); + File file = new File(informationURL.getPath()); + + Assert.assertTrue(file.exists()); + + // Do not use same format as {@link SimulationInformation#dateFormat} + DateFormat df = new SimpleDateFormat("yyyy/dd/MM hh:mm:ss"); + + SimulationInformation info = new SimulationInformation(file); + Assert.assertEquals(df.parse("2009/31/08 14:44:57"), info.getSimulationStart()); + Assert.assertEquals(df.parse("2009/31/08 14:48:00"), info.getSimulationEnd()); + Assert.assertEquals(1482, info.getExportTime("VesselMargin.java")); + Assert.assertFalse(info.hasError()); + Assert.assertTrue(info.getOptimizationUsage().indexOf("Cache used") > 0); + Assert.assertNull(info.getStatistic()); + } + + /** + * Test que le format du fichier de simulation ne change pas. + * + * Cas d'un fichier avec une erreur. + */ + @Test + public void testExistingSimulationFileException() { + URL informationURL = SimulationInformationTest.class.getResource("exception.information"); + File file = new File(informationURL.getPath()); + + Assert.assertTrue(file.exists()); + + SimulationInformation info = new SimulationInformation(file); + Assert.assertTrue(info.hasError()); + Assert.assertTrue(info.getException().indexOf("TopiaException") > 0); + } + + /** * Test simulation date storage. * * @throws IOException Added: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/exception.information =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/exception.information (rev 0) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/exception.information 2009-09-02 11:04:38 UTC (rev 2572) @@ -0,0 +1,4 @@ +#Simulation Information +#Mon Aug 31 16:02:56 CEST 2009 +exception=org.codelutin.topia.TopiaException\: Error during commit\n\tat org.codelutin.topia.framework.TopiaContextImpl.commitTransaction(TopiaContextImpl.java\:690)\n\tat simulators.DefaultSimulator.simulate(DefaultSimulator.java\:316)\n\tat fr.ifremer.isisfish.simulator.SimulationHelper.localSimulateSameThread(SimulationHelper.java\:475)\n\tat fr.ifremer.isisfish.simulator.SimulationHelper$SimThread.run(SimulationHelper.java\:385)\nCaused by\: org.hibernate.exception.GenericJDBCException\: could not insert\: [fr.ifremer.isisfish.entities.ResultImpl]\n\tat org.hibernate.exception.SQLStateConverter.handledNonSpecificException(SQLStateConverter.java\:103)\n\tat org.hibernate.exception.SQLStateConverter.convert(SQLStateConverter.java\:91)\n\tat org.hibernate.exception.JDBCExceptionHelper.convert(JDBCExceptionHelper.java\:43)\n\tat org.hibernate.persister.entity.AbstractEntityPersister.insert(AbstractEntityPersister.java\:2267)\n\tat org.hibernate.persister.entity.AbstractEntityPersister.insert(AbstractEntityPersister.java\:2660)\n\tat org.hibernate.action.EntityInsertAction.execute(EntityInsertAction.java\:56)\n\tat org.hibernate.engine.ActionQueue.execute(ActionQueue.java\:250)\n\tat org.hibernate.engine.ActionQueue.executeActions(ActionQueue.java\:234)\n\tat org.hibernate.engine.ActionQueue.executeActions(ActionQueue.java\:141)\n\tat org.hibernate.event.def.AbstractFlushingEventListener.performExecutions(AbstractFlushingEventListener.java\:298)\n\tat org.hibernate.event.def.DefaultFlushEventListener.onFlush(DefaultFlushEventListener.java\:27)\n\tat org.hibernate.impl.SessionImpl.flush(SessionImpl.java\:1000)\n\tat org.codelutin.topia.framework.TopiaContextImpl.commitTransaction(TopiaContextImpl.java\:675)\n\t... 3 more\nCaused by\: org.h2.jdbc.JdbcSQLException\: Database is already closed (to disable automatic closing at VM shutdown, add ";DB_CLOSE_ON_EXIT\=FALSE" to the db URL) [90121-60]\n\tat org.h2.message.Message.getSQLException(Message.java\:84)\n\tat org.h2.message.Message.getSQLException(Message.java\:88)\n\tat org.h2.message.Message.getSQLException(Message.java\:66)\n\tat org.h2.message.Message.getSQLException(Message.java\:109)\n\tat org.h2.jdbc.JdbcConnection.checkClosed(JdbcConnection.java\:1174)\n\tat org.h2.jdbc.JdbcConnection.prepareStatement(JdbcConnection.java\:163)\n\tat org.hibernate.jdbc.AbstractBatcher.getPreparedStatement(AbstractBatcher.java\:505)\n\tat org.hibernate.jdbc.AbstractBatcher.prepareStatement(AbstractBatcher.java\:94)\n\tat org.hibernate.jdbc.AbstractBatcher.prepareStatement(AbstractBatcher.java\:87)\n\tat org.hibernate.jdbc.AbstractBatcher.prepareBatchStatement(AbstractBatcher.java\:222)\n\tat org.hibernate.persister.entity.AbstractEntityPersister.insert(AbstractEntityPersister.java\:2224)\n\t... 12 more\n +simulationStart=2009.08.31 15\:37\:17 Added: isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/information =================================================================== --- isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/information (rev 0) +++ isis-fish/trunk/src/test/resources/fr/ifremer/isisfish/datastore/information 2009-09-02 11:04:38 UTC (rev 2572) @@ -0,0 +1,19 @@ +#Simulation Information +#Mon Aug 31 14:48:01 CEST 2009 +exportTime.VesselMargin.java=1482 +optimizationUsage=--- Cache Statistiques ---\nTotal call\: 915765\nCache used\: 527279\nCache usage\: 57%\n--------------------\n +exportTime.EffortsMetier.java=1783 +exportTime.ZonesDefinition.java=29 +exportTime.RejetsPoids.java=2 +exportTime.OwnerMargin.java=275 +exportTime.CapturesPoids.java=1645 +exportTime.RejetsNombre.java=98 +simulationStart=2009.08.31 14\:44\:57 +exportTime.CapturesNombre.java=368 +exportTime.RegionDefinition.java=2 +exportTime.CellsDefinition.java=11 +exportTime.Biomasses.java=1558 +exportTime.NonActivite.java=273 +simulationEnd=2009.08.31 14\:48\:00 +exportTime.All\ export=7839 +exportTime.Abundances.java=305

1 0

r2571 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 10:42:23 +0000 (Wed, 02 Sep 2009) New Revision: 2571 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java Log: Add tests about simulation information Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2009-09-02 10:42:23 UTC (rev 2571) @@ -0,0 +1,140 @@ +/* *##% + * Copyright (C) 2009 Ifremer, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.datastore; + +import java.io.File; +import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import junit.framework.Assert; + +import org.junit.Test; + +/** + * Test for {@link SimulationInformation} class. + * + * No need for isolated directory (system directory not used). + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SimulationInformationTest { + + /** + * Test simulation information with no data. + * + * @throws IOException + */ + @Test + public void testSimulationEmpty() throws IOException { + + File file = File.createTempFile("information-empty", ".txt"); + file.deleteOnExit(); + + SimulationInformation info = new SimulationInformation(file); + Assert.assertEquals(new Date(0), info.getSimulationStart()); + Assert.assertEquals(new Date(0), info.getSimulationEnd()); + Assert.assertFalse(info.hasError()); + Assert.assertNull(info.getException()); + Assert.assertEquals(0, info.getExportTime("test")); + } + + /** + * Test simulation date storage. + * + * @throws IOException + * @throws ParseException + */ + @Test + public void testSimulationDate() throws IOException, ParseException { + + // Do not use same format as {@link SimulationInformation#dateFormat} + DateFormat df = new SimpleDateFormat("hh:mm:ss a"); + + File file = File.createTempFile("information-date", ".txt"); + file.deleteOnExit(); + + SimulationInformation info = new SimulationInformation(file); + + Date d1 = df.parse("3:30:32 pm"); + Date d2 = df.parse("3:50:47 pm"); + info.setSimulationStart(d1); + info.setSimulationEnd(d2); + + info.store(); + + SimulationInformation testInfo = new SimulationInformation(file); + Assert.assertEquals(d1, testInfo.getSimulationStart()); + Assert.assertEquals(d2, testInfo.getSimulationEnd()); + } + + /** + * Test simulation exception storage. + * + * @throws IOException + */ + @Test + public void testSimulationException() throws IOException { + File file = File.createTempFile("information-exception", ".txt"); + file.deleteOnExit(); + + SimulationInformation info = new SimulationInformation(file); + Assert.assertFalse(info.hasError()); + + Exception e = new Exception("Oula la, ya eu une exception super grave"); + info.setException(e); + info.store(); + + SimulationInformation testInfo = new SimulationInformation(file); + Assert.assertTrue(testInfo.hasError()); + Assert.assertTrue(testInfo.getException().indexOf("grave") > 0); + + } + + /** + * Test simulation export time. + * @throws IOException + */ + @Test + public void testSimulationExportTime() throws IOException { + File file = File.createTempFile("information-export", ".txt"); + file.deleteOnExit(); + + SimulationInformation info = new SimulationInformation(file); + info.addExportTime("export1", 30); + info.addExportTime("export2", 40); + info.addExportTime("export3", 50); + info.addExportTime("export4", 60); + + info.store(); + + SimulationInformation testInfo = new SimulationInformation(file); + Assert.assertFalse(testInfo.hasError()); + Assert.assertEquals(30, testInfo.getExportTime("export1")); + Assert.assertEquals(40, testInfo.getExportTime("export2")); + Assert.assertEquals(50, testInfo.getExportTime("export3")); + Assert.assertEquals(60, testInfo.getExportTime("export4")); + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2570 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 02 Sep '09

02 Sep '09

Author: chatellier Date: 2009-09-02 10:39:54 +0000 (Wed, 02 Sep 2009) New Revision: 2570 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java Log: Rename "getInfomation" > "getInformation" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 09:13:35 UTC (rev 2569) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-09-02 10:39:54 UTC (rev 2570) @@ -51,24 +51,32 @@ */ public class SimulationInformation { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimulationInformation.class); + /** Class logger. */ + private static Log log = LogFactory.getLog(SimulationInformation.class); - static private final String START_SIMULATION = "simulationStart"; - static private final String END_SIMULATION = "simulationEnd"; - static private final String EXPORT_TIME = "exportTime"; - static private final String OTHER_INFO = "otherInfo"; - static private final String STATISTIC = "statistic"; - static private final String OPTIMIZATION_USAGE = "optimizationUsage"; - static private final String SIMULATION_EXCEPTION = "exception"; + private static final String START_SIMULATION = "simulationStart"; + private static final String END_SIMULATION = "simulationEnd"; + private static final String EXPORT_TIME = "exportTime"; + private static final String RULE_TIME = "ruleTime"; + private static final String OTHER_INFO = "otherInfo"; + private static final String STATISTIC = "statistic"; + private static final String OPTIMIZATION_USAGE = "optimizationUsage"; + private static final String SIMULATION_EXCEPTION = "exception"; - static private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); + private static final String RULE_TIME_INIT = "init"; + private static final String RULE_TIME_PRE = "pre"; + private static final String RULE_TIME_POST = "post"; + private static final SimpleDateFormat dateFormat = new SimpleDateFormat( + "yyyy.MM.dd HH:mm:ss"); + protected Properties info = new Properties(); protected File file = null; - + /** + * Constructor. * + * @param file simulation information output file */ public SimulationInformation(File file) { this.file = file; @@ -79,32 +87,38 @@ reader.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.read.simulation", file.getPath()), eee); + log.warn(_("isisfish.error.read.simulation", file + .getPath()), eee); } } } } - + /* * @see java.lang.Object#toString() */ @Override public String toString() { String result = "Simulation Information:\n"; - result += "Start: " + dateFormat.format(getSimulationStart()) + " End: " + dateFormat.format(getSimulationEnd()) + "\n"; + result += "Start: " + dateFormat.format(getSimulationStart()) + + " End: " + dateFormat.format(getSimulationEnd()) + "\n"; Map<String, Long> exportTime = getExportTime(); if (exportTime.size() > 0) { result += "Export time:\n"; for (Map.Entry<String, Long> entry : exportTime.entrySet()) { - result += "\t" + entry.getKey() + " : " + DurationFormatUtils.formatDuration(entry.getValue(), "s'.'S") + "\n"; + result += "\t" + + entry.getKey() + + " : " + + DurationFormatUtils.formatDuration(entry.getValue(), + "s'.'S") + "\n"; } } - - String info = getInfomation(); + + String info = getInformation(); if (info != null && !"".equals(info)) { result += "Information:\n" + info + "\n"; } - + String v = getStatistic(); if (v != null) { result += "Statistic:\n" + v + "\n"; @@ -120,7 +134,7 @@ return result; } - + protected void store() { try { FileWriter writer = new FileWriter(file); @@ -128,19 +142,21 @@ writer.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.write.simulation", file.getPath()), eee); + log.warn(_("isisfish.error.write.simulation", file.getPath()), + eee); } } } - + protected void setInfo(String key, String value) { info.setProperty(key, value); store(); } - + /** - * Get the date of simulation start - * @return + * Get the date of simulation start. + * + * @return simulation start date */ public Date getSimulationStart() { String d = info.getProperty(START_SIMULATION); @@ -159,11 +175,11 @@ } return result; } - + public void setSimulationStart(Date date) { setInfo(START_SIMULATION, dateFormat.format(date)); } - + /** * Get the date of simulation start * @return @@ -185,11 +201,11 @@ } return result; } - + public void setSimulationEnd(Date date) { setInfo(END_SIMULATION, dateFormat.format(date)); } - + /** * get all export time in map * @return @@ -218,7 +234,7 @@ } return result; } - + public long getExportTime(String exportName) { String t = info.getProperty(EXPORT_TIME + "." + exportName); long result = 0; @@ -233,56 +249,73 @@ } return result; } - + public void addExportTime(String exportName, long time) { setInfo(EXPORT_TIME + "." + exportName, String.valueOf(time)); } - + public String getStatistic() { String result = info.getProperty(STATISTIC); return result; - } - + } + public void setStatistic(String v) { setInfo(STATISTIC, v); } - + public String getOptimizationUsage() { String result = info.getProperty(OPTIMIZATION_USAGE); return result; } - + public void setOptimizationUsage(String v) { - setInfo(OPTIMIZATION_USAGE, v); + setInfo(OPTIMIZATION_USAGE, v); } - + public String getException() { String result = info.getProperty(SIMULATION_EXCEPTION); return result; } - + public void setException(Throwable eee) { StringWriter w = new StringWriter(); PrintWriter pw = new PrintWriter(w); eee.printStackTrace(pw); String v = w.getBuffer().toString(); - setInfo(SIMULATION_EXCEPTION, v); + setInfo(SIMULATION_EXCEPTION, v); } - + + /** + * Return {@code true} if an exception has been set. + * + * @return {@code true} if there is an exception + */ public boolean hasError() { boolean result = getException() != null && getException().length() > 0; return result; } - + + /** + * @deprecated since 3.2.0.5, use {@link #getInformation()} instead + */ public String getInfomation() { + return getInformation(); + } + + /** + * Get other information. + * + * @return other information + */ + public String getInformation() { String result = info.getProperty(OTHER_INFO); if (result == null) { result = ""; } return result; } - + public void addInformation(String value) { - setInfo(OTHER_INFO, getInfomation() + value + "\n"); + setInfo(OTHER_INFO, getInformation() + value + "\n"); } }

1 0