[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux TestCorEleBth.java,1.3,1.4 TestDunes.java,1.4,1.5 TestINP.java,1.2,1.3

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv3989/test/reflux

Modified Files:
	TestCorEleBth.java TestDunes.java TestINP.java 
Log Message:
Mis a jour des fichiers de lecture de telemac
Les classes dico sont mises dans un package dediee.
package dico : contient les classes necessaires pour gerer un fichier dico
package h2d: permet de stocker les classes communes reflux/telemac



Index: TestCorEleBth.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestCorEleBth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestCorEleBth.java	17 Apr 2003 17:26:23 -0000	1.3
--- TestCorEleBth.java	19 May 2003 13:54:02 -0000	1.4
***************
*** 26,30 ****
  import org.fudaa.dodico.reflux.io.CorEleBthWriter;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.tr.TrFileReadView;
  
  /**
--- 26,30 ----
  import org.fudaa.dodico.reflux.io.CorEleBthWriter;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.h2d.H2dFileReadView;
  
  /**
***************
*** 43,47 ****
  
  
!   public void _interfaceTest(TrFileReadView _t)
    {
      assertNotNull(_t);
--- 43,47 ----
  
  
!   public void _interfaceTest(H2dFileReadView _t)
    {
      assertNotNull(_t);

Index: TestDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestDunes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestDunes.java	17 Apr 2003 17:26:23 -0000	1.4
--- TestDunes.java	19 May 2003 13:54:03 -0000	1.5
***************
*** 24,28 ****
  import org.fudaa.dodico.dunes.io.DunesWriter;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.tr.TrFileReadView;
  
  import com.memoire.bu.BuTask;
--- 24,28 ----
  import org.fudaa.dodico.dunes.io.DunesWriter;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.h2d.H2dFileReadView;
  
  import com.memoire.bu.BuTask;
***************
*** 41,45 ****
    }  
  
!   public synchronized void _interfaceTest(TrFileReadView _t)
    {
      assertNotNull(_t);
--- 41,45 ----
    }  
  
!   public synchronized void _interfaceTest(H2dFileReadView _t)
    {
      assertNotNull(_t);

Index: TestINP.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/reflux/TestINP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestINP.java	17 Apr 2003 17:26:23 -0000	1.2
--- TestINP.java	19 May 2003 13:54:03 -0000	1.3
***************
*** 30,35 ****
  import org.fudaa.dodico.reflux.io.INPReader;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.tr.TrFileReadView;
! import org.fudaa.dodico.tr.TrProjetH2d;
  
  import com.memoire.bu.BuTask;
--- 30,35 ----
  import org.fudaa.dodico.reflux.io.INPReader;
  import org.fudaa.dodico.test.TestIO;
! import org.fudaa.dodico.h2d.H2dFileReadView;
! import org.fudaa.dodico.h2d.H2dParametres;
  
  import com.memoire.bu.BuTask;
***************
*** 51,55 ****
     * @see org.fudaa.dodico.test.TestIO#_interfaceTest(TrFileReadView)
     */
!   public void _interfaceTest(TrFileReadView _r)
    {
      INPInterface t=(INPInterface)_r.getSource();
--- 51,55 ----
     * @see org.fudaa.dodico.test.TestIO#_interfaceTest(TrFileReadView)
     */
!   public void _interfaceTest(H2dFileReadView _r)
    {
      INPInterface t=(INPInterface)_r.getSource();
***************
*** 78,89 ****
      
      STrConditionLimite cl=getForIndex(tabCl, 818);
!     assertEquals(cl.uCode, TrProjetH2d.CODE_PERMANENT);
      assertEquals(cl.u,0,eps_);
      
      cl=getForIndex(tabCl, 1790);
!     assertEquals(cl.vCode, TrProjetH2d.CODE_PERMANENT);
      assertEquals(cl.v,0,eps_);
      assertEquals(cl.normale, 0,eps_);
!     assertEquals(cl.hCode, TrProjetH2d.CODE_PERMANENT);
      assertEquals(cl.h,13.3,eps_);
      
--- 78,89 ----
      
      STrConditionLimite cl=getForIndex(tabCl, 818);
!     assertEquals(cl.uCode, H2dParametres.CODE_PERMANENT);
      assertEquals(cl.u,0,eps_);
      
      cl=getForIndex(tabCl, 1790);
!     assertEquals(cl.vCode, H2dParametres.CODE_PERMANENT);
      assertEquals(cl.v,0,eps_);
      assertEquals(cl.normale, 0,eps_);
!     assertEquals(cl.hCode, H2dParametres.CODE_PERMANENT);
      assertEquals(cl.h,13.3,eps_);
      
***************
*** 92,96 ****
      
      cl=getForIndex(tabCl, 0);
!     assertEquals(cl.hCode, TrProjetH2d.CODE_PERMANENT);
      assertEquals(cl.h,16.325,eps_);
      
--- 92,96 ----
      
      cl=getForIndex(tabCl, 0);
!     assertEquals(cl.hCode, H2dParametres.CODE_PERMANENT);
      assertEquals(cl.h,16.325,eps_);
      
***************
*** 101,105 ****
        cl=getForIndex(tabCl, itemp[i]);
        assertEquals(LTrTypeBord.SOLIDE,cl.typeBord);
!       assertEquals(TrProjetH2d.CODE_PERMANENT,cl.stricklerCode);
        assertEquals(1d/3d,cl.strickler ,eps_);
        
--- 101,105 ----
        cl=getForIndex(tabCl, itemp[i]);
        assertEquals(LTrTypeBord.SOLIDE,cl.typeBord);
!       assertEquals(H2dParametres.CODE_PERMANENT,cl.stricklerCode);
        assertEquals(1d/3d,cl.strickler ,eps_);