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

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

Revision: 8002
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8002&view=rev
Author:   deniger
Date:     2012-11-20 16:22:53 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-io/src/test/resources/projet/Etu3-0_1.1.2.zip
    trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java

Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/projet/Etu3-0_1.1.2.zip
===================================================================
(Binary files differ)

Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java	2012-11-20 16:10:26 UTC (rev 8001)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java	2012-11-20 16:22:53 UTC (rev 8002)
@@ -7,8 +7,6 @@
 import java.util.List;
 import org.fudaa.ctulu.CtuluLog;
 import org.fudaa.dodico.crue.io.ReadHelper;
-import org.fudaa.dodico.crue.io.CrueDCTest;
-import org.fudaa.dodico.crue.io.CrueDHTest;
 import org.fudaa.dodico.crue.common.io.CrueIOResu;
 import org.fudaa.dodico.crue.metier.emh.EMH;
 import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -27,7 +25,7 @@
   public void testValidationModele3() {
     final CtuluLog analyze = new CtuluLog();
     final CrueIOResu<CrueData> res = ReadHelper.readModele(analyze, FilesForTest.FICHIER_TEST_MODELE3_DC,
-                                                           FilesForTest.DH_M_30);
+            FilesForTest.DH_M_30);
     testAnalyser(analyze);
     final List<EMH> allEMH = res.getMetier().getAllSimpleEMH();
     allEMH.add(res.getMetier().getScenarioData());
@@ -35,8 +33,9 @@
     allEMH.add(res.getMetier().getSousModele());
     final CrueData data = res.getMetier();
     final List<CtuluLog> validate = ValidatorForValuesAndContents.validateValues(data.getScenarioData(),
-                                                                                 data.getCrueConfigMetier());
-
+            data.getCrueConfigMetier());
+    assertEquals(3, validate.size());
+    
   }
 
   /**
@@ -50,7 +49,7 @@
     allEMH.add(scenario);
     allEMH.add(scenario.getModeles().get(0));
     List<CtuluLog> validate = ValidatorForValuesAndContents.validateValues(scenario,
-                                                                           TestCoeurConfig.INSTANCE.getCrueConfigMetier());
+            TestCoeurConfig.INSTANCE.getCrueConfigMetier());
     for (final CtuluLog ctuluAnalyze : validate) {
       if (ctuluAnalyze.containsErrorOrSevereError()) {
         ctuluAnalyze.printResume();
@@ -58,6 +57,6 @@
       // ores not read
       assertFalse(ctuluAnalyze.containsErrorOrSevereError());
     }
-
+    
   }
 }

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