[Fudaa-svn-commit] SF.net SVN: fudaa:[8282] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 8282
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8282&view=rev
Author:   deniger
Date:     2013-02-19 07:37:39 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
corrections tests unitaires

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java

Added Paths:
-----------
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java	2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java	2013-02-19 07:37:39 UTC (rev 8282)
@@ -133,6 +133,11 @@
     res.add("condLimite.positions.tarage");
     res.add("condLimite.positions.manoeuvre");
     res.add("condLimite.positions.qruis");
+    res.add("groupeDessin.visible");
+    res.add("groupHydraulique.visible");
+    res.add("groupeImage.visible");
+    res.add("groupeAutre.visible");
+    res.add("groupeFichierSIG.visible");
     return res;
   }
 

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java	2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java	2013-02-19 07:37:39 UTC (rev 8282)
@@ -25,8 +25,19 @@
     this.parser = parser;
     findUsedVar = this.parser.findUsedVar();
   }
+
   
+  /**
+   * pour les tests
+   * @param service 
+   */
+  protected void setService(ReportReadResultServiceContrat service) {
+    this.service = service;
+  }
   
+  
+  
+  
 
   @Override
   public Double getValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {

Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/MockResultProvider.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java	2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,40 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.fudaa.fudaa.crue.report.service.ReportReadResultServiceContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class MockResultProvider implements ReportReadResultServiceContrat {
+
+  Map<String, Double> values = new HashMap<String, Double>();
+
+  public void setValue(String name, double val) {
+    values.put(name, val);
+  }
+
+  @Override
+  public Double getReadValue(ReportRunVariableKey key, String emhNom) {
+    return values.get(key.getVariable().getVariableName());
+  }
+
+  @Override
+  public CrueConfigMetier getCcm() {
+    return CrueConfigMetierLoaderDefaultTest.DEFAULT;
+  }
+
+  @Override
+  public Double getReadValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {
+    return values.get(key.getVariable().getVariableName());
+  }
+}

Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/VariableContentFormuleTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	                        (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java	2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,54 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import org.fudaa.fudaa.crue.report.formule.FormuleCalculatorExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleParametersExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleContentExpr;
+import java.util.Arrays;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.fudaa.crue.report.data.ReportRunKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class VariableContentFormuleTest {
+  
+  public VariableContentFormuleTest() {
+  }
+  
+  @Test
+  public void testGoodFormula() {
+    FormuleParametersExpr params = new FormuleParametersExpr();
+    params.setFormule("x+y+10");
+    params.setVariables(Arrays.asList("x", "y"));
+    FormuleContentExpr content = new FormuleContentExpr();
+    CtuluLog log = content.setParameter(params);
+    assertFalse(log.containsErrors());
+    FormuleCalculatorExpr calculator = content.getCalculator();
+    MockResultProvider mock = new MockResultProvider();
+    mock.setValue("x", 100);
+    mock.setValue("y", 1000);
+    calculator.setService(mock);
+    Double value = calculator.getValue(null, new ReportRunVariableKey(new ReportRunKey(), ""), null);
+    assertEquals(1110, value.intValue());
+  }
+  
+  @Test
+  public void testBadFormula() {
+    FormuleParametersExpr params = new FormuleParametersExpr();
+    params.setFormule("x+y+10");
+    params.setVariables(Arrays.asList("x"));
+    FormuleContentExpr content = new FormuleContentExpr();
+    CtuluLog log = content.setParameter(params);
+    assertTrue(log.containsErrorOrSevereError());
+    CtuluLogRecord get = log.getRecords().get(0);
+    assertEquals("Unrecognized symbol \"y\"", get.getMsg().trim());
+  }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.