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

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

Revision: 7842
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7842&view=rev
Author:   deniger
Date:     2012-11-01 08:24:32 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
correction tests unitaires

Modified Paths:
--------------
    trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
    trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java
    trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java

Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java	2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java	2012-11-01 08:24:32 UTC (rev 7842)
@@ -29,6 +29,9 @@
 
   public LinkedHashMap<String, Property> getProperties(VisuConfiguration in, LayerVisibility visibility) {
     LinkedHashMap<String, Property> res = new LinkedHashMap<String, Property>();
+    if (in == null) {
+      return res;
+    }
     Sheet.Set generalConfig = VisuConfigurationInfo.createSet(in);
     ConfigSaverHelper.addProperties(res, generalConfig);
     List<Sheet.Set> sectionConfig = SectionConfigurationInfo.createSet(in.getSectionConfiguration());

Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java	2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java	2012-11-01 08:24:32 UTC (rev 7842)
@@ -4,7 +4,6 @@
 package org.fudaa.fudaa.crue.report.persist;
 
 import com.rits.cloning.Cloner;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
 import java.awt.Color;
 import java.awt.Font;
 import org.fudaa.fudaa.crue.planimetry.configuration.LayerVisibility;

Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java	2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java	2012-11-01 08:24:32 UTC (rev 7842)
@@ -3,15 +3,21 @@
  */
 package org.fudaa.fudaa.crue.report.view.persist;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.fudaa.ctulu.converter.ColorToStringTransformer;
 import org.fudaa.dodico.crue.io.AbstractIOTestCase;
 import org.fudaa.dodico.crue.io.common.CrueIOResu;
-import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
+import org.fudaa.dodico.crue.io.conf.Option;
 import org.fudaa.ebli.converter.TraceToStringConverter;
 import org.fudaa.fudaa.crue.report.persist.ReportConfigContrat;
 import org.fudaa.fudaa.crue.report.data.ReportRunKey;
 import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfig;
+import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfigPersist;
 import org.fudaa.fudaa.crue.report.view.transformer.KeysToStringConverter;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -32,22 +38,23 @@
     File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/planimetry.xml");
     ReportConfigContrat metier = read(file);
     assertNotNull(metier);
-    assertEquals(ReportPlanimetryConfig.class, metier.getClass());
+    assertEquals(ReportPlanimetryConfigPersist.class, metier.getClass());
     file.delete();
-    ReportPlanimetryConfig config = (ReportPlanimetryConfig) metier;
+    ReportPlanimetryConfigPersist config = (ReportPlanimetryConfigPersist) metier;
     testContent(config);
   }
 
   @Test
   public void testWriteTransversal() throws IOException {
     File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/planimetry.xml");
-    ReportConfigContrat metier = read(file);
+    ReportPlanimetryConfigPersist metier = (ReportPlanimetryConfigPersist) read(file);
+    ReportPlanimetryConfig config = metier.createConfig();
     file.delete();
     File out = File.createTempFile("planimetry", ".xml");
-    createSaver().save(out, metier, "test");
-    metier = read(out);
+    createSaver().save(out, config, "test");
+    metier = (ReportPlanimetryConfigPersist) read(out);
     out.delete();
-    testContent((ReportPlanimetryConfig) metier);
+    testContent(metier);
   }
 
   private ReportConfigContrat read(File file) {
@@ -58,8 +65,17 @@
     return metier;
   }
 
-  private void testContent(ReportPlanimetryConfig config) {
-    config.getVisuConfiguration().getBrancheConfiguration().getColor(EnumBrancheType.EMHBrancheSaintVenant);
+  private void testContent(ReportPlanimetryConfigPersist config) {
+    List<Option> visuConfiguration = config.getVisuConfiguration();
+    Map<String, Option> options = new HashMap<String, Option>();
+    for (Option option : visuConfiguration) {
+      options.put(option.getNom(), option);
+    }
+    Option colorOption = options.get("branches.colors.EMHBrancheSaintVenant");
+    String valeur = colorOption.getValeur();
+    Color color = new ColorToStringTransformer().fromString(valeur);
+    assertEquals(new Color(204, 0, 51), color);
+
   }
 
   @Test
@@ -71,12 +87,11 @@
     CrueIOResu<ReportConfigContrat> read = saver.read(target);
     ReportConfigContrat metier = read.getMetier();
     assertNotNull(metier);
-    assertEquals(ReportPlanimetryConfig.class, metier.getClass());
+    assertEquals(ReportPlanimetryConfigPersist.class, metier.getClass());
     target.delete();
-    ReportPlanimetryConfig readConfig = (ReportPlanimetryConfig) metier;
+    ReportPlanimetryConfigPersist readConfig = (ReportPlanimetryConfigPersist) metier;
     assertNotNull(readConfig.getReportPlanimetryExtraContainer());
     assertNotNull(readConfig.getVisuConfiguration());
-    assertNotNull(readConfig.getVisibility());
   }
 
   private ReportConfigSaver createSaver() {

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