Author: chatellier Date: 2011-06-09 12:25:52 +0000 (Thu, 09 Jun 2011) New Revision: 3374 Log: Fix test (design plan save/reloading) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -61,7 +61,7 @@ */ protected void appendDomain(ContinuousDomain domain) { // facteur continue pourcentage - if (domain.getCoefficient() != null || domain.getReferenceValue() != null) { + if (domain.isPercentageType()) { xmlBuffer.append("<reference coefficient=\"" + domain.getCoefficient() + "\">"); xmlBuffer.append(domain.getReferenceValue()); xmlBuffer.append("</reference>"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -155,7 +155,7 @@ if (property.endsWith(CONTINUOUS)) { ContinuousDomain domain; - if(property.equals(MATRIXCONTINUOUS)) { + if (property.equals(MATRIXCONTINUOUS)) { // matrix specific // <coefficient operator="-" value="0.799"/> MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); @@ -350,7 +350,7 @@ ContinuousDomain domain; if(property.equals(MATRIXCONTINUOUS)) { - MatrixContinuousDomain mdomain = new MatrixContinuousDomain(true); + MatrixContinuousDomain mdomain = new MatrixContinuousDomain(); Element referenceElement = fixedElement.element(REFERENCE); if (referenceElement != null) { // matrix specific Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -68,7 +68,7 @@ EquationContinuousDomain eDomain = (EquationContinuousDomain)domain; // facteur continue pourcentage - if (domain.getCoefficient() != null || domain.getReferenceValue() != null) { + if (domain.isPercentageType()) { xmlBuffer.append("<reference coefficient=\"") .append(eDomain.getCoefficient()) .append( "\">"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:04:28 UTC (rev 3373) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-09 12:25:52 UTC (rev 3374) @@ -165,7 +165,7 @@ // factor 1 Factor factorContinuousPercentage = new Factor("factor 6 (double continuous percentage)"); - ContinuousDomain domain6 = new ContinuousDomain(); + ContinuousDomain domain6 = new ContinuousDomain(true); domain6.setCoefficient(5.0); domain6.setReferenceValue(14.0); domain6.setCardinality(5); @@ -379,7 +379,7 @@ // factor x1 Factor factorContinuous = new Factor("factor x1"); - ContinuousDomain domain1 = new ContinuousDomain(); + ContinuousDomain domain1 = new ContinuousDomain(true); domain1.setReferenceValue(42.0); domain1.setCoefficient(0.05); factorContinuous.setDomain(domain1); @@ -411,7 +411,7 @@ File tempFile = File.createTempFile("testdesignplan", ".xml"); tempFile.deleteOnExit(); FileUtils.writeStringToFile(tempFile, content); - + System.out.println(content); // test to read it and get content DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null); String reReadContent = MexicoHelper.getDesignPlanAsXML(plan);