Author: echatellier Date: 2012-03-20 09:58:26 +0100 (Tue, 20 Mar 2012) New Revision: 3664 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3664 Log: Fix all import/export tests Added: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV3.xml Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2012-03-19 17:45:36 UTC (rev 3663) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2012-03-20 08:58:26 UTC (rev 3664) @@ -27,6 +27,7 @@ import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; /** * XML discrete domain visitor. @@ -44,9 +45,26 @@ */ @Override public void start(Domain domain) { + DiscreteDomain discreteDomain = (DiscreteDomain)domain; + // lorsque le facteur est catégoriel, la liste de ses niveaux, par une // liste ouverte d'éléments 'level', d'attributs 'value' et 'weight') - xmlBuffer.append("<domain distributionName=\"categorical\" type=\"discretetruc\">"); + xmlBuffer.append("<domain distributionName=\"categorical\" type=\""); + + if (!discreteDomain.getValues().isEmpty()) { + Object first = discreteDomain.getValues().firstKey(); + Object firstValue = discreteDomain.getValues().get(first); + + if (firstValue instanceof Integer) { + xmlBuffer.append("integer"); + } else if (firstValue instanceof Double) { + xmlBuffer.append("double"); + } else { + xmlBuffer.append("string"); + } + } + + xmlBuffer.append("\">"); } /** Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-03-19 17:45:36 UTC (rev 3663) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-03-20 08:58:26 UTC (rev 3664) @@ -378,9 +378,11 @@ @Test public void testExportImportWithGroup() throws IOException, IsisFishException, TopiaException { + Date date = new Date(); + // first export DesignPlan testDesignPlan = getTestDesignPlan(true, false); - String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan); + String xml1 = MexicoHelper.getDesignPlanAsXML(testDesignPlan, "date", date.toString()); if (log.isDebugEnabled()) { log.debug("xml 1 = " + xml1); } @@ -391,7 +393,7 @@ TopiaContext context = regionContext.beginTransaction(); DesignPlan plan = MexicoHelper.getDesignPlanFromXML(testFile, context); context.closeContext(); - String xml2 = MexicoHelper.getDesignPlanAsXML(plan); + String xml2 = MexicoHelper.getDesignPlanAsXML(plan, "date", date.toString()); if (log.isDebugEnabled()) { log.debug("xml 2 = " + xml2); } @@ -596,9 +598,11 @@ /** * Test que le xml généré est valide avec la xsd mexico (exp design). * + * Test is currently disabled, isis fish doesn't respect all mexico + * file format since it's not possible. + * * @throws Exception */ - //@Test public void validOutputXml() throws Exception { DesignPlan testDesignPlan = getTestDesignPlan(true, true); Added: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV3.xml =================================================================== (Binary files differ) Property changes on: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV3.xml ___________________________________________________________________ Added: svn:mime-type + application/xml