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

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

Revision: 7730
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7730&view=rev
Author:   deniger
Date:     2012-10-09 21:54:37 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
correction tests unitaires

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSection.java
    trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java
    trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/edition/TestEditionCreateEMH.java

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSection.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSection.java	2012-10-09 19:32:28 UTC (rev 7729)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSection.java	2012-10-09 21:54:37 UTC (rev 7730)
@@ -689,6 +689,9 @@
   }
 
   private boolean isEmptyDonFrt(final DonFrt frot) {
+    if (frot == null || frot.getLoi() == null || frot.getLoi().getEvolutionFF() == null) {
+      return true;
+    }
     final List<PtEvolutionFF> ptEvolutionFF = frot.getLoi().getEvolutionFF().getPtEvolutionFF();
     if (ptEvolutionFF.size() > 1) {
       return false;

Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java	2012-10-09 19:32:28 UTC (rev 7729)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationPatternHelper.java	2012-10-09 21:54:37 UTC (rev 7730)
@@ -16,6 +16,7 @@
 public class ValidationPatternHelper {
 
   private static Pattern namePattern;
+  private static Pattern filenamePattern;
   private static Pattern nameEMHSimplePattern;
 
   public static Pattern getNameContainerPattern() {
@@ -25,6 +26,13 @@
     return namePattern;
   }
 
+  public static Pattern getFilenamePattern() {
+    if (filenamePattern == null) {
+      filenamePattern = Pattern.compile("[a-zA-Z]{1}([\\w\\-\\_])*");
+    }
+    return filenamePattern;
+  }
+
   public static Pattern getNameEmhSimplePattern() {
     if (nameEMHSimplePattern == null) {
       nameEMHSimplePattern = Pattern.compile("([\\w\\-\\_]|\\.)*");
@@ -121,7 +129,7 @@
       return false;
     }
     final String removeEnd = StringUtils.removeEnd(name, "." + type.getExtension());
-    boolean res = getNameContainerPattern().matcher(removeEnd).matches();
+    boolean res = getFilenamePattern().matcher(removeEnd).matches();
     return res;
   }
 

Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/edition/TestEditionCreateEMH.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/edition/TestEditionCreateEMH.java	2012-10-09 19:32:28 UTC (rev 7729)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/edition/TestEditionCreateEMH.java	2012-10-09 21:54:37 UTC (rev 7730)
@@ -26,10 +26,10 @@
  * @author deniger ( genesis)
  */
 public class TestEditionCreateEMH {
-  
+
   public TestEditionCreateEMH() {
   }
-  
+
   @Test
   public void testCreateBranche() {
     CreationDefaultValue defaultValues = new CreationDefaultValue();
@@ -50,7 +50,6 @@
     assertEquals("Nd_0004", branche.getNoeudAval().getNom());
     EMHSectionProfil sectionProfil = (EMHSectionProfil) branche.getSectionAmont().getEmh();
     DonPrtGeoProfilSection dptg = EMHHelper.selectFirstOfClass(sectionProfil.getInfosEMH(), DonPrtGeoProfilSection.class);
-//    assertEquals(1, dptg.getLitNumerote().size());
     assertEquals(5, dptg.getLitNumerote().size());//modification temporaire
     LitNumerote mineur = dptg.getLitNumerote().get(2);
     assertTrue(mineur.getIsLitMineur());
@@ -60,7 +59,7 @@
     assertFalse(maj.getIsLitMineur());
     assertTrue(maj.getIsLitActif());
     assertNotNull(maj.getFrot());
-    assertEquals("Fk_DefautMaj", maj.getFrot().getNom());
+    assertEquals("FkSto_0", maj.getFrot().getNom());
 
     //on teste la suppression:
     EditionDelete.delete(Arrays.<EMH>asList(branche), scenario, true);

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