[Fudaa-svn-commit] SF.net SVN: fudaa:[8552] trunk/soft/fudaa-crue/crue-compare/src/test/java/ org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java

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

Revision: 8552
          http://sourceforge.net/p/fudaa/svn/8552
Author:   deniger
Date:     2013-12-15 13:42:38 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
ajout annotations

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java

Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java	2013-12-15 13:04:32 UTC (rev 8551)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnTest.java	2013-12-15 13:42:38 UTC (rev 8552)
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import junit.framework.TestCase;
+import org.apache.commons.jxpath.JXPathContext;
 import org.fudaa.dodico.crue.common.BusinessMessages;
 import org.fudaa.dodico.crue.common.PropertyUtilsCache;
 import org.fudaa.dodico.crue.comparaison.config.ConfSelection;
@@ -31,13 +32,15 @@
  */
 public class ConvertSelectOnTest extends TestCase {
 
+  
+
   public void testSelectionSimple() {
 
     final ConfSelection sel = new ConfSelection();
     final ConfSelectionItemMerge merge = createMergeBrancheRequete();
     sel.getItems().add(merge);
-    final EMHSousModele m1 = createModele("titi", "tata");
-    final EMHSousModele m2 = createModele("tata", "titi");
+    final EMHSousModele m1 = createSousModele("br1", "br2");
+    final EMHSousModele m2 = createSousModele("br2", "br1");
     final ConvertSelectOn builder = new ConvertSelectOn();
     builder.setA(m1);
     builder.setB(m2);
@@ -48,7 +51,9 @@
       final ComparaisonNodeFinal mp = res.get(0);
       assertEquals(m1, mp.objetA);
       assertEquals(m2, mp.objetB);
+      //m1 a 2 branches
       assertEquals(2, mp.listObjectA.size());
+      //m2 a 2 branches
       assertEquals(2, mp.listObjectB.size());
 
     } catch (final Exception e) {
@@ -99,8 +104,8 @@
   }
 
   public void testComparaisonIn() {
-    final EMHSousModele sm1 = createModele("1", "2");
-    final EMHSousModele sm2 = createModele("1", "2");
+    final EMHSousModele sm1 = createSousModele("1", "2");
+    final EMHSousModele sm2 = createSousModele("1", "2");
     EqualsTesterIsIncludeCollection include = new EqualsTesterIsIncludeCollection("nom", true);
     TesterContext contexte = new TesterContextImpl(null);
     try {
@@ -140,7 +145,7 @@
     return merge;
   }
 
-  private static EMHSousModele createModele(final String n1, final String n2) {
+  private static EMHSousModele createSousModele(final String n1, final String n2) {
     final EMHSousModele sm1 = new EMHSousModele();
     addBranche(n1, n2, sm1);
     return sm1;

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