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

r2899 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 11 Jan '10

11 Jan '10

Author: chatellier Date: 2010-01-11 14:14:17 +0000 (Mon, 11 Jan 2010) New Revision: 2899 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Remove commented code. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-01-11 10:23:05 UTC (rev 2898) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-01-11 14:14:17 UTC (rev 2899) @@ -33,24 +33,13 @@ import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.TripType; -//protected MatrixPanelListener matrixListener; - protected int month = 0; -/*matrixListener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent event) { - if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { - log.debug("Matrix modified : " + fieldStrategyMonthInfoProportion.getMatrix()); - getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); - } - } -}; -fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);*/ - protected void strategyMonthInfoProportionMatrixChanged(MatrixPanelEvent event) { if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { - log.debug("Matrix modified : " + fieldStrategyMonthInfoProportion.getMatrix()); + if (log.isDebugEnabled()) { + log.debug("Matrix modified : " + fieldStrategyMonthInfoProportion.getMatrix()); + } getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); } }

1 0

r2898 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 11 Jan '10

11 Jan '10

Author: chatellier Date: 2010-01-11 10:23:05 +0000 (Mon, 11 Jan 2010) New Revision: 2898 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Always make sur that getXxx() method has a valid name Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-11 10:19:13 UTC (rev 2897) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-11 10:23:05 UTC (rev 2898) @@ -35,6 +35,7 @@ import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -87,7 +88,8 @@ * @return property value */ public static String getMethod(JComponent component) { - return (String) component.getClientProperty("method"); + String method = (String)component.getClientProperty("method"); + return method; } /** @@ -695,7 +697,10 @@ protected static Object getMethodValue(TopiaEntity entity, String fieldName) { Object result = null; try { - Method m = entity.getClass().getMethod("get" + fieldName); + // fieldName maybe be sometime lower case + String getMethod = "get" + StringUtils.capitalize(fieldName); + + Method m = entity.getClass().getMethod(getMethod); result = m.invoke(entity, (Object[]) null); } catch (Exception ex) { if (log.isErrorEnabled()) {

1 0

r2897 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 11 Jan '10

11 Jan '10

Author: chatellier Date: 2010-01-11 10:19:13 +0000 (Mon, 11 Jan 2010) New Revision: 2897 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java Log: Display stacktrace insteadof exception string Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-08 17:13:45 UTC (rev 2896) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2010-01-11 10:19:13 UTC (rev 2897) @@ -699,7 +699,7 @@ result = m.invoke(entity, (Object[]) null); } catch (Exception ex) { if (log.isErrorEnabled()) { - log.error(ex); + log.error("Can't get entity value", ex); } } return result; @@ -824,7 +824,7 @@ * @param typeClazz type to get editor * @return component */ - protected static JComponent getEditorForType(Class<?> typeClazz) { + public static JComponent getEditorForType(Class<?> typeClazz) { JComponent result = null;

1 0

r2896 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: chatellier Date: 2010-01-08 17:13:45 +0000 (Fri, 08 Jan 2010) New Revision: 2896 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Modify simulation existence to test if simulation parameters file really exists. 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 2010-01-08 14:55:19 UTC (rev 2895) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-08 17:13:45 UTC (rev 2896) @@ -526,9 +526,8 @@ // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) // FIXME check SimulationStorage.exists(control.getId()) condition - if ((control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && SimulationStorage - .exists(control.getId()))) { + if (control.getProgress() > 0 + && control.getProgress() >= control.getProgressMax() && simulationExists(control.getId())) { simulationEnded = true; } } @@ -542,6 +541,27 @@ } /** + * Check if simulation exists by checking "parameters.properties" file + * existense. + * + * @return {@code true} if simulation exists + */ + protected boolean simulationExists(String simulationId) { + boolean result = false; + + // works better than checking simulationDirectory + // existence, because directory can exists event if + // simulations doesn't exists + File simulationDirectory = new File(SimulationStorage.getSimulationDirectory(), simulationId); + File parametersFile = SimulationStorage.getSimulationParametersFile(simulationDirectory); + if (parametersFile.exists()) { + result = true; + } + + return result; + } + + /** * Operation to do after simulation end. * * - get simulation result

1 0

r2895 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export
by chatellier＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: chatellier Date: 2010-01-08 14:55:19 +0000 (Fri, 08 Jan 2010) New Revision: 2895 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java Log: Manage Selectivity.equation factor name. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-08 13:53:22 UTC (rev 2894) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-08 14:55:19 UTC (rev 2895) @@ -25,7 +25,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -35,6 +34,7 @@ import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.StrategyMonthInfo; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.types.RangeOfValues; @@ -197,7 +197,7 @@ exportFactorName = factorClass + "." + lastReadName + "." + propertyName; } else { - // test each entities + // example : EffortDescription.TfjMJyI2.BolincheProfil1gir.fishingOperation if (entity instanceof EffortDescription) { EffortDescription newEntity = (EffortDescription)entity; // FIXME newEntity.getSetOfVessels() is null ??? @@ -205,21 +205,31 @@ exportFactorName += RandomStringUtils.randomAlphanumeric(8); // getSetOfVessels().getName() exportFactorName += "." + newEntity.getPossibleMetiers() + "." + propertyName; } + // example : PopulationGroup.Population_new.0.reproductionRate else if (entity instanceof PopulationGroup) { PopulationGroup newEntity = (PopulationGroup)entity; exportFactorName = factorClass + "." + newEntity.getPopulation().getName(); exportFactorName += "." + newEntity.getId() + "." + propertyName; } + // example : PopulationSeasonInfo.Population_new.janvier.avril.lengthChangeMatrix else if (entity instanceof PopulationSeasonInfo) { PopulationSeasonInfo newEntity = (PopulationSeasonInfo)entity; exportFactorName = factorClass + "." + newEntity.getPopulation().getName() + "."; exportFactorName += newEntity.getFirstMonth() + "." + newEntity.getLastMonth() + "." + propertyName; } + // example : StrategyMonthInfo.Espagnols.janvier.minInactivityDays else if (entity instanceof StrategyMonthInfo) { StrategyMonthInfo newEntity = (StrategyMonthInfo)entity; exportFactorName = factorClass + "." + newEntity.getStrategy().getName() + "."; exportFactorName += newEntity.getMonth() + "." + propertyName; } + // example : Selectivity.Senne.Anchois_long + else if (entity instanceof Selectivity) { + // association class with no name attribute + Selectivity newEntity = (Selectivity)entity; + exportFactorName = factorClass + "." + newEntity.getGear().getName(); + exportFactorName += "." + newEntity.getPopulation().getName(); + } } return exportFactorName;

1 0

r2894 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: jcouteau Date: 2010-01-08 13:53:22 +0000 (Fri, 08 Jan 2010) New Revision: 2894 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Improve code (thks Tony) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 13:33:47 UTC (rev 2893) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 13:53:22 UTC (rev 2894) @@ -67,7 +67,8 @@ * * @throws SensitivityException */ - public void setIsisFactorsR(DesignPlan plan, File outputdirectory) throws SensitivityException { + public void setIsisFactorsR(DesignPlan plan, File outputdirectory) + throws SensitivityException { String nomFacteur = "nomFacteur<-c(%s)"; String factorNames = ""; @@ -247,11 +248,10 @@ } catch (Exception ee) { log.error("An error occurred while trying to get nominal value",ee); } - if (null!=value) { - return value.toString(); - } else { + if (value == null){ return null; } + return value.toString(); } }

1 0

r2893 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: chatellier Date: 2010-01-08 13:33:47 +0000 (Fri, 08 Jan 2010) New Revision: 2893 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java Log: Use abstract calculator instead of interface. Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2010-01-08 13:30:57 UTC (rev 2892) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2010-01-08 13:33:47 UTC (rev 2893) @@ -41,7 +41,7 @@ * * Last update : $Date: 26 févr. 2009 $ By : $Author: chatellier $ */ -public class SensitivityCalculatorRandomMock implements SensitivityCalculator { +public class SensitivityCalculatorRandomMock extends AbstractSensitivityCalculator { private static final Log log = LogFactory.getLog(SimulationServiceTest.class);

1 0

r2892 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: chatellier Date: 2010-01-08 13:30:57 +0000 (Fri, 08 Jan 2010) New Revision: 2892 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java Log: Set topia context on sensitivity calculator before calling compute method. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2010-01-08 11:29:18 UTC (rev 2891) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2010-01-08 13:30:57 UTC (rev 2892) @@ -434,9 +434,18 @@ // compute do bad modification on design plan String xmlDesignPlan = MexicoHelper.getDesignPlanAsXML(designPlan); + // get a TopiaContext on region database, for discret domain + // to get original database value (Nominal value) + RegionStorage regionStorage = RegionStorage.getRegion(param.getRegionName()); + TopiaContext context = regionStorage.getStorage().beginTransaction(); + sensitivitycalculator.setTopiaContext(context); + SensitivityScenarios sensitivityScenarios = sensitivitycalculator .compute(designPlan, masterExportDirectory); + // close context opened for nominal values + context.closeContext(); + // ajout des parametres de simulation localParameters.setSensitivityCalculator(sensitivitycalculator); localParameters.setNumberOfSensitivitySimulation(sensitivityScenarios.getScenarios().size()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 11:29:18 UTC (rev 2891) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 13:30:57 UTC (rev 2892) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2009 Code Lutin + * Copyright (C) 2009-2010 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 @@ -42,13 +42,24 @@ public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { - TopiaContext context; - /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory .getLog(AbstractSensitivityCalculator.class); + /** Topia context used for discrete domain nominal value compute. */ + protected TopiaContext context; + /** + * Set topia context on current region to nominal value compute. + * + * @param context context + */ + @Override + public void setTopiaContext(TopiaContext context) { + this.context = context; + } + + /** * Method to create the isis.factors dataframe in R. * * @param plan Design plan of the sensitivity analysis @@ -224,11 +235,7 @@ } - public void setTopiaContext(TopiaContext context){ - this.context = context; - } - - String getNominalValue(Factor factor){ + protected String getNominalValue(Factor factor){ ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); String path = factor.getPath(); String topiaId = path.substring(0,path.lastIndexOf("#")); @@ -240,7 +247,7 @@ } catch (Exception ee) { log.error("An error occurred while trying to get nominal value",ee); } - if (null!=value){ + if (null!=value) { return value.toString(); } else { return null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2010-01-08 11:29:18 UTC (rev 2891) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2010-01-08 13:30:57 UTC (rev 2892) @@ -21,6 +21,8 @@ import java.io.File; import java.util.List; +import org.nuiton.topia.TopiaContext; + import fr.ifremer.isisfish.datastore.SimulationStorage; /** @@ -37,6 +39,13 @@ public interface SensitivityCalculator { /** + * Set topia context on current region to nominal value compute. + * + * @param context context + */ + void setTopiaContext(TopiaContext context); + + /** * Return calculator description. * * @return calculator description

1 0

r2891 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: jcouteau Date: 2010-01-08 11:29:18 +0000 (Fri, 08 Jan 2010) New Revision: 2891 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java Log: Add method to handle nominal values Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 10:45:28 UTC (rev 2890) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2010-01-08 11:29:18 UTC (rev 2891) @@ -23,6 +23,9 @@ import java.util.Iterator; import java.util.List; +import fr.ifremer.isisfish.util.ConverterUtil; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.j2r.REngine; @@ -33,10 +36,14 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaEntity; public abstract class AbstractSensitivityCalculator implements SensitivityCalculator { + TopiaContext context; + /** to use log facility, just put in your code: log.info("..."); */ private static Log log = LogFactory .getLog(AbstractSensitivityCalculator.class); @@ -61,10 +68,18 @@ String binfValues = ""; String bsup = "Bsup<-c(%s)"; String bsupValues = ""; - String attributes = "attributes(isis.factors)<-list(%s\"nomModel\"=\"isis-fish-externeR\",names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; + String attributes = "attributes(isis.factors)<-list(" + + "%s" + + "\"nomModel\"=\"isis-fish-externeR\"," + + "names=c(\"nomFacteur\",\"Nominal\",\"Continu\",\"Binf\",\"Bsup\"))"; String attribute = "attr(isis.factors,\"%s\")<-\"%s\""; String attributesValues = ""; - String isisfactors = "isis.factors<-data.frame(\"nomFacteur\"=nomFacteur,\"Nominal\"=Nominal,\"Continu\"=Continu,\"Binf\"=Binf,\"Bsup\"=Bsup)"; + String isisfactors = "isis.factors<-data.frame(" + + "\"nomFacteur\"=nomFacteur," + + "\"Nominal\"=Nominal," + + "\"Continu\"=Continu," + + "\"Binf\"=Binf," + + "\"Bsup\"=Bsup)"; //Create the vectors List<Factor<?, ?>> factors = plan.getFactors(); @@ -81,19 +96,10 @@ //Factor names factorNames += "\"" + factor.getName() + "\""; - //Nominal values - /*ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); - String path = factor.getPath(); - String topiaId = path.substring(0,path.lastIndexOf("#")); - String propertyName=path.substring(path.lastIndexOf("#") + 1); - //Object value = beanUtils.convert("${serializedValue}", ${value.class.name}.class); - TopiaEntity entity = db.findByTopiaId(topiaId); - Object value = BeanUtils.getProperty(entity, propertyName);*/ - if (factor.getDomain() instanceof MatrixContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += 1.0; + nominalValues += getNominalValue(factor); //Continu values continuValues += "TRUE"; @@ -126,7 +132,7 @@ } else if (factor.getDomain() instanceof ContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += 0.0; + nominalValues += getNominalValue(factor); //Continu values continuValues += "TRUE"; @@ -141,10 +147,8 @@ .getMaxBound(); } else { + nominalValues += getNominalValue(factor); - //FIXME créer une méthode pour getNominalValue - nominalValues += ""; - //Continu values continuValues += "FALSE"; @@ -220,4 +224,27 @@ } + public void setTopiaContext(TopiaContext context){ + this.context = context; + } + + String getNominalValue(Factor factor){ + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(null); + String path = factor.getPath(); + String topiaId = path.substring(0,path.lastIndexOf("#")); + String propertyName=path.substring(path.lastIndexOf("#") + 1); + Object value = null; + try { + TopiaEntity entity = context.findByTopiaId(topiaId); + value = BeanUtils.getProperty(entity, propertyName); + } catch (Exception ee) { + log.error("An error occurred while trying to get nominal value",ee); + } + if (null!=value){ + return value.toString(); + } else { + return null; + } + } + }

1 0

r2890 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 08 Jan '10

08 Jan '10

Author: chatellier Date: 2010-01-08 10:45:28 +0000 (Fri, 08 Jan 2010) New Revision: 2890 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java Log: Use DOA method in test instead of beanutils (some get method need a non null topia context) Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-01-08 10:38:34 UTC (rev 2889) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2010-01-08 10:45:28 UTC (rev 2890) @@ -25,10 +25,18 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.IsisH2Config; /** * Test for {@link SensitivityUtils} class. @@ -46,6 +54,19 @@ .getLog(SensitivityUtilsTest.class); /** + * Return a basic valid topia context. + * + * @throws TopiaNotFoundException + */ + protected TopiaContext getTopiaContext() throws TopiaNotFoundException { + Properties config = new Properties(); + IsisH2Config.addMemDatabaseConfig(config, "test"); + IsisH2Config.addHibernateMapping(config); + TopiaContext context = TopiaContextFactory.getContext(config); + return context; + } + + /** * Test (par introspection) que tous les facteurs existent. * * @throws ClassNotFoundException @@ -55,19 +76,30 @@ * @throws SecurityException * @throws InvocationTargetException * @throws IllegalArgumentException + * @throws TopiaException */ @Test public void testFactorExistence() throws InstantiationException, IllegalAccessException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, - InvocationTargetException { + InvocationTargetException, TopiaException { Properties factors = SensitivityUtils.getProperties(); + TopiaContext testTC = getTopiaContext(); + TopiaContext context = testTC.beginTransaction(); for (String factorName : factors.stringPropertyNames()) { String className = factorName.substring(0, factorName.indexOf(".")); String propertyName = StringUtils.capitalize(factorName.substring(factorName.indexOf(".") + 1)); - - TopiaEntity entity = (TopiaEntity)Class.forName("fr.ifremer.isisfish.entities." + className + "Impl").newInstance(); + // Simple method + // TopiaEntity entity = (TopiaEntity)Class.forName("fr.ifremer.isisfish.entities." + className + "Impl").newInstance(); + + // Harder method + // but topia context is needed by some getXXX() methods + Method mStatic = IsisFishDAOHelper.class.getMethod("get" + className + "DAO", TopiaContext.class); + TopiaDAO<TopiaEntity> dao = (TopiaDAO<TopiaEntity>) mStatic.invoke(null, new Object[] { context }); + Assert.assertNotNull("No DOA found for factor " + factorName, dao); + TopiaEntity entity = dao.create(); + // call proper property if (log.isDebugEnabled()) { log.debug(" and call get" + propertyName + "() on " + className); @@ -75,5 +107,6 @@ Method m = entity.getClass().getMethod("get" + propertyName); m.invoke(entity, (Object[]) null); } + context.closeContext(); } }

1 0