r1778 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/test/java/fr/ifremer src/test/java/fr/ifremer/isisfish src/test/java/fr/ifremer/isisfish/simulator src/test/resources src/test/resources/simulations - Isis-fish-commits

3 Feb 2009

Author: chatellier
Date: 2009-02-03 16:04:35 +0000 (Tue, 03 Feb 2009)
New Revision: 1778

Added:
   isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java
   isis-fish/trunk/src/test/resources/simulations/
   isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip
Removed:
   isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java
   isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationTest.zip
Modified:
   isis-fish/trunk/pom.xml
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
   isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java
   isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java
Log:
Fix test, modify surefire plugin configuration to make test to work !

Modified: isis-fish/trunk/pom.xml
===================================================================

--- isis-fish/trunk/pom.xml	2009-02-03 13:54:41 UTC (rev 1777)
+++ isis-fish/trunk/pom.xml	2009-02-03 16:04:35 UTC (rev 1778)
@@ -352,9 +352,6 @@
         <!--Main class in JAR -->
         <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>
 
-        <!-- Ignore failure test for now -->
-        <maven.test.testFailureIgnore>true</maven.test.testFailureIgnore>
-
         <!-- jnlp -->
         <keystorepath>../../../CodeLutinKeystore</keystorepath>
         <keystorealias>CodeLutin</keystorealias>
@@ -364,7 +361,16 @@
     <build>
         <plugins>
 
+            <!-- Sans le forkMode one, les classpath sont mauvais  -->
             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-surefire-plugin</artifactId>
+               <configuration>
+                 <forkMode>once</forkMode>
+               </configuration>
+            </plugin>
+
+            <plugin>
                 <groupId>org.codelutin</groupId>
                 <artifactId>maven-generator-plugin</artifactId>
                 <version>${generator.version}</version>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java	2009-02-03 13:54:41 UTC (rev 1777)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java	2009-02-03 16:04:35 UTC (rev 1778)
@@ -283,11 +283,14 @@
      * @throws VCSException 
      */
     static public void initVCS() throws VCSException {
+        
+        // init vcs
+        // even if UI in not launched
+        vcs = VCSFactory.createVCS(config);
+        
         if (config.isLaunchUI()) {
             // FIXME ajouter une option vcs.init
 
-            // init vcs
-            vcs = VCSFactory.createVCS(config);
             VCSActionAsker asker = new VCSActionAsker();
             vcs.addVetoableActionListener(asker);
 

Deleted: isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java	2009-02-03 13:54:41 UTC (rev 1777)
+++ isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java	2009-02-03 16:04:35 UTC (rev 1778)
@@ -1,806 +0,0 @@
-/* *##%
-* Copyright (C) 2002, 2003 Code Lutin, Cédric Pineau,
-Benjamin Poussin
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*##%*/
-
-/* *
-* Persistence.java
-*
-* Created: 3 août 2004
-*
-* @author Benjamin Poussin <poussin at codelutin.com>
-* @version $Revision$
-*
-* Mise a jour: $Date$
-* par : $Author$
-*/
-
-package fr.ifremer;
-
-import fr.ifremer.isisfish.IsisFishDAOHelper;
-import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.datastore.RegionStorage;
-import fr.ifremer.isisfish.entities.*;
-
-import junit.framework.TestCase;
-
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.util.FileUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.util.Collection;
-
-public class PersistenceTest extends TestCase {
-
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(PersistenceTest.class);
- // Persistence
-    TopiaContext context = null;
-    RegionStorage rs;
-    
-//    protected Properties getDerbyProperties() {
-//        Properties config = new Properties();
-//        
-//        config = IsisConfig.addDatabaseConfig(config, new File("/tmp/topiaderbytest"));            
-//        config = IsisConfig.addHibernateMapping(config);
-//    
-//        return config;
-//    }
-//    
-//    protected Properties getProperties() {
-//        return getDerbyProperties();
-//    }
-    
-    public void setUp() throws Exception {
-        File dir = FileUtil.createTempDirectory("isisdbtest", "");
-        System.setProperty("localDatabase",dir.getAbsolutePath());
-        IsisFish.init();
-
-        rs = RegionStorage.create("test");
-        context = rs.getStorage();
-    }
-
-    /* (non-Javadoc)
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        rs.delete(false);
-    }
-    
-    public void testInstanciate() throws Exception {
-        TopiaContext context = this.context.beginTransaction();
-
-//        {
-//            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
-//            AgeGroup o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-        {
-            FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context);
-            FisheryRegion o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-//        {
-//            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
-//            CompositeZone o = ps.create();
-//        }
-        {
-            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
-            EffortDescription o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-//        {
-//            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
-//            Emigration o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-//        {
-//            EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context);
-//            Equation o = ps.create();
-//        }
-        {
-            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
-            Gear o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-//        {
-//            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
-//            Immigration o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-//        {
-//            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
-//            LengthGroup o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-//        {
-//            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
-//            MappingZoneReproZoneRecru o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-        {
-            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
-            Cell o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
-            Species o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
-            Metier o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
-            MetierSeasonInfo o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-//        {
-//            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
-//            Migration o = ps.create();
-//            log.debug(o + " - " +o.getClass().getName());
-//        }
-        {
-//            try{
-                PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
-                PopulationGroup o = ps.create();
-                log.debug(o + " - " +o.getClass().getName());
-//                assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite
-//            }catch(TopiaException eee){
-//                assertTrue(true);
-//            }
-        }
-        {
-            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
-            Population o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
-            Port o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            ResultDAO ps = IsisFishDAOHelper.getResultDAO(context);
-            Result o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context);
-            Season o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
-            PopulationSeasonInfo o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
-            Selectivity o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
-            SetOfVessels o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-//        {
-//            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
-//            SimpleZone o = ps.create();
-//        }
-        {
-            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
-            StrategyMonthInfo o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
-            Strategy o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
-            TargetSpecies o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
-            TripType o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
-            VesselType o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-        {
-            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
-            Zone o = ps.create();
-            log.debug(o + " - " +o.getClass().getName());
-        }
-
-        context.rollbackTransaction();
-    }
-
-
-    public void testMakePersistence() throws Exception {
-        TopiaContext context = this.context.beginTransaction();
-//        {
-//            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
-//            AgeGroup o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-            FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context);
-            FisheryRegion o = ps.create();
-            o = ps.update(o);
-        }
-//        {
-//            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
-//            CompositeZone o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
-            EffortDescription o = ps.create();
-            o = ps.update(o);
-        }
-//        {
-//            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
-//            Emigration o = ps.create();
-//            o = ps.update(o);
-//        }
-//        {
-//            EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context);
-//            Equation o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
-            Gear o = ps.create();
-            o = ps.update(o);
-        }
-//        {
-//            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
-//            Immigration o = ps.create();
-//            o = ps.update(o);
-//        }
-//        {
-//            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
-//            LengthGroup o = ps.create();
-//            o = ps.update(o);
-//        }
-//        {
-//            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
-//            MappingZoneReproZoneRecru o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
-            Cell o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
-            Species o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
-            Metier o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
-            MetierSeasonInfo o = ps.create();
-            o = ps.update(o);
-        }
-//        {
-//            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
-//            Migration o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-//            try{
-                PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
-                PopulationGroup o = ps.create();
-                o = ps.update(o);
-//                assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite
-//            }catch(TopiaException eee){
-//                assertTrue(true);
-//            }
-       }
-        {
-            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
-            Population o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
-            Port o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            ResultDAO ps = IsisFishDAOHelper.getResultDAO(context);
-            Result o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
-            PopulationSeasonInfo o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
-            Selectivity o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
-            SetOfVessels o = ps.create();
-            o = ps.update(o);
-        }
-//        {
-//            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
-//            SimpleZone o = ps.create();
-//            o = ps.update(o);
-//        }
-        {
-            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
-            StrategyMonthInfo o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
-            Strategy o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
-            TargetSpecies o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
-            TripType o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
-            VesselType o = ps.create();
-            o = ps.update(o);
-        }
-        {
-            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
-            Zone o = ps.create();
-            o = ps.update(o);
-        }
-        context.rollbackTransaction();
-    }
-
-    public void testFindAll() throws Exception {
-        TopiaContext context = this.context.beginTransaction();
-//        {
-//            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
-//            Collection<AgeGroup> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-        {
-            FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context);
-            Collection<FisheryRegion> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-//        {
-//            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
-//            Collection list<CompositeZone> = ps.findAll();
-//        }
-        {
-            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
-            Collection<EffortDescription> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-//        {
-//            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
-//            Collection<Emigration> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-        {
-            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
-            Collection<Gear> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-//        {
-//            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
-//            Collection<Immigration> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-//        {
-//            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
-//            Collection<LengthGroup> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-//        {
-//            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
-//            Collection<MappingZoneReproZoneRecru> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-        {
-            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
-            Collection<Cell> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
-            Collection<Species> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
-            Collection<Metier> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
-            Collection<MetierSeasonInfo> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-//        {
-//            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
-//            Collection<Migration> list = ps.findAll();
-//            log.debug(list + " - " +ps.getClass().getName());
-//        }
-        {
-            PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
-            Collection<PopulationGroup> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
-            Collection<Population> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
-            Collection<Port> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            ResultDAO ps = IsisFishDAOHelper.getResultDAO(context);
-            Collection<Result> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
-            Collection<PopulationSeasonInfo> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
-            Collection<Selectivity> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
-            Collection<SetOfVessels> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-//        {
-//            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
-//            Collection<SimpleZone> list = ps.findAll();
-//        }
-        {
-            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
-            Collection<StrategyMonthInfo> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
-            Collection<Strategy> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
-            Collection<TargetSpecies> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
-            Collection<TripType> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
-            Collection<VesselType> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        {
-            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
-            Collection<Zone> list = ps.findAll();
-            log.debug(list + " - " +ps.getClass().getName());
-        }
-        context.rollbackTransaction();
-    }
-/*
-    public void testDelete() throws Exception {
-        TopiaContext context = this.context.beginTransaction();
-        {
-            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                AgeGroup o = (AgeGroup)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            RegionDAO ps = IsisFishDAOHelper.getRegionDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Region o = (Region)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                CompositeZone o = (CompositeZone)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                EffortDescription o = (EffortDescription)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Emigration o = (Emigration)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Equation o = (Equation)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Gear o = (Gear)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Immigration o = (Immigration)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                LengthGroup o = (LengthGroup)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                MappingZoneReproZoneRecru o = (MappingZoneReproZoneRecru)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Cell o = (Cell)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Species o = (Species)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
-            Metier o = ps.create();
-        }
-        {
-            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                MetierSeasonInfo o = (MetierSeasonInfo)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Migration o = (Migration)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            MonthDAO ps = IsisFishDAOHelper.getMonthDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Month o = (Month)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                PopulationGroup o = (PopulationGroup)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Population o = (Population)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Port o = (Port)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            ResultManagerDAO ps = IsisFishDAOHelper.getResultManagerDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                ResultStorage o = (ResultStorage)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Season o = (Season)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                PopulationSeasonInfo o = (PopulationSeasonInfo)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Selectivity o = (Selectivity)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                SetOfVessels o = (SetOfVessels)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                SimpleZone o = (SimpleZone)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                StrategyMonthInfo o = (StrategyMonthInfo)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Strategy o = (Strategy)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                TargetSpecies o = (TargetSpecies)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            TimeUnitDAO ps = IsisFishDAOHelper.getTimeUnitDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                TimeUnit o = (TimeUnit)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                TripType o = (TripType)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                VesselType o = (VesselType)i.next();
-                ps.delete(o);
-            }
-        }
-        {
-            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
-            Collection list = ps.findAll();
-            for(Iterator i=list.iterator(); i.hasNext();){
-                Zone o = (Zone)i.next();
-                ps.delete(o);
-            }
-        }
-        context.rollbackTransaction();
-    }
-    */
-} // Persistence
-

Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java	2009-02-03 13:54:41 UTC (rev 1777)
+++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java	2009-02-03 16:04:35 UTC (rev 1778)
@@ -2,6 +2,10 @@
 
 import java.io.File;
 
+import org.codelutin.util.FileUtil;
+
+import fr.ifremer.isisfish.IsisFish;
+
 /**
  * Une classe pour avoir des choses utiles pour tous les tests d'isis
  *
@@ -9,10 +13,12 @@
  */
 public abstract class TestUtils {
 
-    static File basedir;
+    protected static File basedir;
 
-    static File targetdir;
+    protected static File targetdir;
 
+    protected static File dirDatabase;
+    
     public static File getBasedir() {
         if (basedir == null) {
             String base = System.getProperty("basedir");
@@ -32,4 +38,31 @@
         }
         return targetdir;
     }
+    
+    /**
+     * Create a temp dir and init isis with that temp dir as database.
+     * 
+     * @throws Exception
+     */
+    public static void init() throws Exception {
+        
+        File mavenTestDir = new File(getTargetdir() + File.separator + "surefire-workdir");
+        dirDatabase = FileUtil.createTempDirectory("isisdbtest", "", mavenTestDir);
+        
+        System.setProperty("database.directory", dirDatabase.getAbsolutePath());
+        System.setProperty("launch.ui", "false");
+
+        IsisFish.init();
+        IsisFish.initVCS();
+    }
+    
+    /**
+     * Delete created temp directory.
+     */
+    public static void clean() {
+        if(dirDatabase != null) {
+            FileUtil.deleteRecursively(dirDatabase);
+            dirDatabase = null;
+        }
+    }
 }

Copied: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java (from rev 1773, isis-fish/trunk/src/test/java/fr/ifremer/PersistenceTest.java)
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java	                        (rev 0)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java	2009-02-03 16:04:35 UTC (rev 1778)
@@ -0,0 +1,770 @@
+/* *##%
+* Copyright (C) 2002, 2009 Code Lutin, Cédric Pineau, Benjamin Poussin
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*##%*/
+
+package fr.ifremer.isisfish;
+
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codelutin.topia.TopiaContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import fr.ifremer.TestUtils;
+import fr.ifremer.isisfish.datastore.RegionStorage;
+import fr.ifremer.isisfish.entities.Cell;
+import fr.ifremer.isisfish.entities.CellDAO;
+import fr.ifremer.isisfish.entities.EffortDescription;
+import fr.ifremer.isisfish.entities.EffortDescriptionDAO;
+import fr.ifremer.isisfish.entities.FisheryRegion;
+import fr.ifremer.isisfish.entities.FisheryRegionDAO;
+import fr.ifremer.isisfish.entities.Gear;
+import fr.ifremer.isisfish.entities.GearDAO;
+import fr.ifremer.isisfish.entities.Metier;
+import fr.ifremer.isisfish.entities.MetierDAO;
+import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+import fr.ifremer.isisfish.entities.MetierSeasonInfoDAO;
+import fr.ifremer.isisfish.entities.Population;
+import fr.ifremer.isisfish.entities.PopulationDAO;
+import fr.ifremer.isisfish.entities.PopulationGroup;
+import fr.ifremer.isisfish.entities.PopulationGroupDAO;
+import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
+import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO;
+import fr.ifremer.isisfish.entities.Port;
+import fr.ifremer.isisfish.entities.PortDAO;
+import fr.ifremer.isisfish.entities.Result;
+import fr.ifremer.isisfish.entities.ResultDAO;
+import fr.ifremer.isisfish.entities.Season;
+import fr.ifremer.isisfish.entities.SeasonDAO;
+import fr.ifremer.isisfish.entities.Selectivity;
+import fr.ifremer.isisfish.entities.SelectivityDAO;
+import fr.ifremer.isisfish.entities.SetOfVessels;
+import fr.ifremer.isisfish.entities.SetOfVesselsDAO;
+import fr.ifremer.isisfish.entities.Species;
+import fr.ifremer.isisfish.entities.SpeciesDAO;
+import fr.ifremer.isisfish.entities.Strategy;
+import fr.ifremer.isisfish.entities.StrategyDAO;
+import fr.ifremer.isisfish.entities.StrategyMonthInfo;
+import fr.ifremer.isisfish.entities.StrategyMonthInfoDAO;
+import fr.ifremer.isisfish.entities.TargetSpecies;
+import fr.ifremer.isisfish.entities.TargetSpeciesDAO;
+import fr.ifremer.isisfish.entities.TripType;
+import fr.ifremer.isisfish.entities.TripTypeDAO;
+import fr.ifremer.isisfish.entities.VesselType;
+import fr.ifremer.isisfish.entities.VesselTypeDAO;
+import fr.ifremer.isisfish.entities.Zone;
+import fr.ifremer.isisfish.entities.ZoneDAO;
+
+/**
+ * PersistenceTest.
+ *
+ * Created: 3 août 2004
+ *
+ * @author Benjamin Poussin <poussin at codelutin.com>
+ * @version $Revision$
+ *
+ * Mise a jour: $Date$
+ * par : $Author$
+ */
+public class PersistenceTest {
+
+    /**
+     * Logger for this class
+     */
+    private static final Log log = LogFactory.getLog(PersistenceTest.class);
+    
+    // Persistence
+    protected TopiaContext context = null;
+    protected RegionStorage rs;
+    
+    @BeforeClass
+    public static void init() throws Exception {
+        TestUtils.init();
+    }
+    
+    @AfterClass
+    public static void clean() {
+        TestUtils.clean();
+    }
+    
+    @Before
+    public void setUp() throws Exception {
+        rs = RegionStorage.create("test");
+        context = rs.getStorage();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        rs.delete(false);
+    }
+    
+    @Test
+    public void testInstanciate() throws Exception {
+        TopiaContext context = this.context.beginTransaction();
+
+        FisheryRegionDAO fisheryRegionDAO = IsisFishDAOHelper.getFisheryRegionDAO(context);
+        FisheryRegion fisheryRegion = fisheryRegionDAO.create();
+        log.debug(fisheryRegion + " - " + fisheryRegion.getClass().getName());
+        
+        EffortDescriptionDAO effortDescriptionDAO = IsisFishDAOHelper.getEffortDescriptionDAO(context);
+        EffortDescription effortDescription = effortDescriptionDAO.create();
+        log.debug(effortDescription + " - " + effortDescription.getClass().getName());
+        
+        GearDAO gearDAO = IsisFishDAOHelper.getGearDAO(context);
+        Gear gear = gearDAO.create();
+        log.debug(gear + " - " + gear.getClass().getName());
+
+        CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(context);
+        Cell cell = cellDAO.create();
+        log.debug(cell + " - " + cell.getClass().getName());
+        
+        SpeciesDAO speciesDAO = IsisFishDAOHelper.getSpeciesDAO(context);
+        Species species = speciesDAO.create();
+        log.debug(species + " - " + species.getClass().getName());
+
+        MetierDAO metierDAO = IsisFishDAOHelper.getMetierDAO(context);
+        Metier metier = metierDAO.create();
+        log.debug(metier + " - " + metier.getClass().getName());
+
+        MetierSeasonInfoDAO metierSeasonInfoDAO = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
+        MetierSeasonInfo metierSeasonInfo = metierSeasonInfoDAO.create();
+        log.debug(metierSeasonInfo + " - " +metierSeasonInfo.getClass().getName());
+        
+        PopulationGroupDAO populationGroupDAO = IsisFishDAOHelper.getPopulationGroupDAO(context);
+        PopulationGroup populationGroup = populationGroupDAO.create();
+        log.debug(populationGroup + " - " + populationGroup.getClass().getName());
+
+        PopulationDAO populationDAO = IsisFishDAOHelper.getPopulationDAO(context);
+        Population population = populationDAO.create();
+        log.debug(population + " - " + population.getClass().getName());
+
+        PortDAO portDAO = IsisFishDAOHelper.getPortDAO(context);
+        Port port = portDAO.create();
+        log.debug(port + " - " + port.getClass().getName());
+
+        ResultDAO resultDAO = IsisFishDAOHelper.getResultDAO(context);
+        Result result = resultDAO.create();
+        log.debug(result + " - " + result.getClass().getName());
+
+        SeasonDAO seasonDAO = IsisFishDAOHelper.getSeasonDAO(context);
+        Season season = seasonDAO.create();
+        log.debug(season + " - " + season.getClass().getName());
+
+        PopulationSeasonInfoDAO PopulationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
+        PopulationSeasonInfo PopulationSeasonInfo = PopulationSeasonInfoDAO.create();
+        log.debug(PopulationSeasonInfo + " - " + PopulationSeasonInfo.getClass().getName());
+
+        SelectivityDAO selectivityDAO = IsisFishDAOHelper.getSelectivityDAO(context);
+        Selectivity selectivity = selectivityDAO.create();
+        log.debug(selectivity + " - " + selectivity.getClass().getName());
+
+        SetOfVesselsDAO setOfVesselsDAO = IsisFishDAOHelper.getSetOfVesselsDAO(context);
+        SetOfVessels setOfVessels = setOfVesselsDAO.create();
+        log.debug(setOfVessels + " - " + setOfVessels.getClass().getName());
+
+        StrategyMonthInfoDAO strategyMonthInfoDAO = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
+        StrategyMonthInfo strategyMonthInfo = strategyMonthInfoDAO.create();
+        log.debug(strategyMonthInfo + " - " + strategyMonthInfo.getClass().getName());
+
+        StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(context);
+        Strategy strategy = strategyDAO.create();
+        log.debug(strategy + " - " + strategy.getClass().getName());
+
+        TargetSpeciesDAO targetSpeciesDAO = IsisFishDAOHelper.getTargetSpeciesDAO(context);
+        TargetSpecies targetSpecies = targetSpeciesDAO.create();
+        log.debug(targetSpecies + " - " + targetSpecies.getClass().getName());
+
+        TripTypeDAO tripTypeDAO = IsisFishDAOHelper.getTripTypeDAO(context);
+        TripType tripType = tripTypeDAO.create();
+        log.debug(tripType + " - " + tripType.getClass().getName());
+
+        VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(context);
+        VesselType vesselType = vesselTypeDAO.create();
+        log.debug(vesselType + " - " + vesselType.getClass().getName());
+
+        ZoneDAO zoneDAO = IsisFishDAOHelper.getZoneDAO(context);
+        Zone zone = zoneDAO.create();
+        log.debug(zone + " - " + zone.getClass().getName());
+
+        context.rollbackTransaction();
+    }
+
+
+    @Test
+    public void testMakePersistence() throws Exception {
+        TopiaContext context = this.context.beginTransaction();
+//        {
+//            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
+//            AgeGroup o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+            FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context);
+            FisheryRegion o = ps.create();
+            o = ps.update(o);
+        }
+//        {
+//            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
+//            CompositeZone o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
+            EffortDescription o = ps.create();
+            o = ps.update(o);
+        }
+//        {
+//            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
+//            Emigration o = ps.create();
+//            o = ps.update(o);
+//        }
+//        {
+//            EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context);
+//            Equation o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
+            Gear o = ps.create();
+            o = ps.update(o);
+        }
+//        {
+//            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
+//            Immigration o = ps.create();
+//            o = ps.update(o);
+//        }
+//        {
+//            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
+//            LengthGroup o = ps.create();
+//            o = ps.update(o);
+//        }
+//        {
+//            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
+//            MappingZoneReproZoneRecru o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
+            Cell o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
+            Species o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
+            Metier o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
+            MetierSeasonInfo o = ps.create();
+            o = ps.update(o);
+        }
+//        {
+//            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
+//            Migration o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+//            try{
+                PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
+                PopulationGroup o = ps.create();
+                o = ps.update(o);
+//                assertTrue(false); // normalement on a pas le droit d'instancier une entity abstraite
+//            }catch(TopiaException eee){
+//                assertTrue(true);
+//            }
+       }
+        {
+            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
+            Population o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
+            Port o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            ResultDAO ps = IsisFishDAOHelper.getResultDAO(context);
+            Result o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
+            PopulationSeasonInfo o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
+            Selectivity o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
+            SetOfVessels o = ps.create();
+            o = ps.update(o);
+        }
+//        {
+//            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
+//            SimpleZone o = ps.create();
+//            o = ps.update(o);
+//        }
+        {
+            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
+            StrategyMonthInfo o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
+            Strategy o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
+            TargetSpecies o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
+            TripType o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
+            VesselType o = ps.create();
+            o = ps.update(o);
+        }
+        {
+            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
+            Zone o = ps.create();
+            o = ps.update(o);
+        }
+        context.rollbackTransaction();
+    }
+
+    @Test
+    public void testFindAll() throws Exception {
+        TopiaContext context = this.context.beginTransaction();
+//        {
+//            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
+//            Collection<AgeGroup> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+        {
+            FisheryRegionDAO ps = IsisFishDAOHelper.getFisheryRegionDAO(context);
+            Collection<FisheryRegion> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+//        {
+//            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
+//            Collection list<CompositeZone> = ps.findAll();
+//        }
+        {
+            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
+            Collection<EffortDescription> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+//        {
+//            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
+//            Collection<Emigration> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+        {
+            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
+            Collection<Gear> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+//        {
+//            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
+//            Collection<Immigration> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+//        {
+//            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
+//            Collection<LengthGroup> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+//        {
+//            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
+//            Collection<MappingZoneReproZoneRecru> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+        {
+            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
+            Collection<Cell> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
+            Collection<Species> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
+            Collection<Metier> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
+            Collection<MetierSeasonInfo> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+//        {
+//            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
+//            Collection<Migration> list = ps.findAll();
+//            log.debug(list + " - " +ps.getClass().getName());
+//        }
+        {
+            PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
+            Collection<PopulationGroup> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
+            Collection<Population> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
+            Collection<Port> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            ResultDAO ps = IsisFishDAOHelper.getResultDAO(context);
+            Collection<Result> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
+            Collection<PopulationSeasonInfo> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
+            Collection<Selectivity> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
+            Collection<SetOfVessels> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+//        {
+//            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
+//            Collection<SimpleZone> list = ps.findAll();
+//        }
+        {
+            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
+            Collection<StrategyMonthInfo> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
+            Collection<Strategy> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
+            Collection<TargetSpecies> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
+            Collection<TripType> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
+            Collection<VesselType> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        {
+            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
+            Collection<Zone> list = ps.findAll();
+            log.debug(list + " - " +ps.getClass().getName());
+        }
+        context.rollbackTransaction();
+    }
+/*
+    public void testDelete() throws Exception {
+        TopiaContext context = this.context.beginTransaction();
+        {
+            AgeGroupDAO ps = IsisFishDAOHelper.getAgeGroupDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                AgeGroup o = (AgeGroup)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            RegionDAO ps = IsisFishDAOHelper.getRegionDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Region o = (Region)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            CompositeZoneDAO ps = IsisFishDAOHelper.getCompositeZoneDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                CompositeZone o = (CompositeZone)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            EffortDescriptionDAO ps = IsisFishDAOHelper.getEffortDescriptionDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                EffortDescription o = (EffortDescription)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            EmigrationDAO ps = IsisFishDAOHelper.getEmigrationDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Emigration o = (Emigration)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            EquationDAO ps = IsisFishDAOHelper.getEquationDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Equation o = (Equation)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            GearDAO ps = IsisFishDAOHelper.getGearDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Gear o = (Gear)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            ImmigrationDAO ps = IsisFishDAOHelper.getImmigrationDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Immigration o = (Immigration)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            LengthGroupDAO ps = IsisFishDAOHelper.getLengthGroupDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                LengthGroup o = (LengthGroup)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            MappingZoneReproZoneRecruDAO ps = IsisFishDAOHelper.getMappingZoneReproZoneRecruDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                MappingZoneReproZoneRecru o = (MappingZoneReproZoneRecru)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            CellDAO ps = IsisFishDAOHelper.getCellDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Cell o = (Cell)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            SpeciesDAO ps = IsisFishDAOHelper.getSpeciesDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Species o = (Species)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            MetierDAO ps = IsisFishDAOHelper.getMetierDAO(context);
+            Metier o = ps.create();
+        }
+        {
+            MetierSeasonInfoDAO ps = IsisFishDAOHelper.getMetierSeasonInfoDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                MetierSeasonInfo o = (MetierSeasonInfo)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            MigrationDAO ps = IsisFishDAOHelper.getMigrationDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Migration o = (Migration)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            MonthDAO ps = IsisFishDAOHelper.getMonthDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Month o = (Month)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            PopulationGroupDAO ps = IsisFishDAOHelper.getPopulationGroupDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                PopulationGroup o = (PopulationGroup)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            PopulationDAO ps = IsisFishDAOHelper.getPopulationDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Population o = (Population)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            PortDAO ps = IsisFishDAOHelper.getPortDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Port o = (Port)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            ResultManagerDAO ps = IsisFishDAOHelper.getResultManagerDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                ResultStorage o = (ResultStorage)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            SeasonDAO ps = IsisFishDAOHelper.getSeasonDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Season o = (Season)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            PopulationSeasonInfoDAO ps = IsisFishDAOHelper.getPopulationSeasonInfoDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                PopulationSeasonInfo o = (PopulationSeasonInfo)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            SelectivityDAO ps = IsisFishDAOHelper.getSelectivityDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Selectivity o = (Selectivity)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            SetOfVesselsDAO ps = IsisFishDAOHelper.getSetOfVesselsDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                SetOfVessels o = (SetOfVessels)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            SimpleZoneDAO ps = IsisFishDAOHelper.getSimpleZoneDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                SimpleZone o = (SimpleZone)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            StrategyMonthInfoDAO ps = IsisFishDAOHelper.getStrategyMonthInfoDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                StrategyMonthInfo o = (StrategyMonthInfo)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            StrategyDAO ps = IsisFishDAOHelper.getStrategyDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Strategy o = (Strategy)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            TargetSpeciesDAO ps = IsisFishDAOHelper.getTargetSpeciesDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                TargetSpecies o = (TargetSpecies)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            TimeUnitDAO ps = IsisFishDAOHelper.getTimeUnitDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                TimeUnit o = (TimeUnit)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            TripTypeDAO ps = IsisFishDAOHelper.getTripTypeDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                TripType o = (TripType)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            VesselTypeDAO ps = IsisFishDAOHelper.getVesselTypeDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                VesselType o = (VesselType)i.next();
+                ps.delete(o);
+            }
+        }
+        {
+            ZoneDAO ps = IsisFishDAOHelper.getZoneDAO(context);
+            Collection list = ps.findAll();
+            for(Iterator i=list.iterator(); i.hasNext();){
+                Zone o = (Zone)i.next();
+                ps.delete(o);
+            }
+        }
+        context.rollbackTransaction();
+    }
+    */
+} // Persistence
+


Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/PersistenceTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java
===================================================================
--- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java	2009-02-03 13:54:41 UTC (rev 1777)
+++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java	2009-02-03 16:04:35 UTC (rev 1778)
@@ -1,5 +1,5 @@
 /* *##%
- * Copyright (C) 2007
+ * Copyright (C) 2007, 2009
  *     Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin
  *
  * This program is free software; you can redistribute it and/or
@@ -17,53 +17,57 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *##%*/
 
-/* *
- * TestSimulatorResult.java
- *
- * Created: 4 janv. 07 12:06:18
- *
- * @author poussin
- * @version $Revision$
- *
- * Last update: $Date$
- * by : $Author$
- */
-
 package fr.ifremer.isisfish.simulator;
 
-import fr.ifremer.TestUtils;
-import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.datastore.ResultStorage;
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.entities.Result;
-import fr.ifremer.isisfish.types.Date;
-import junit.framework.TestCase;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
+import java.io.File;
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codelutin.math.matrix.DoubleBigVector;
 import org.codelutin.math.matrix.MatrixFactory;
 import org.codelutin.topia.TopiaContext;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
-import java.io.File;
-import java.util.Enumeration;
-import java.util.List;
+import fr.ifremer.TestUtils;
+import fr.ifremer.isisfish.datastore.ResultStorage;
+import fr.ifremer.isisfish.datastore.SimulationStorage;
+import fr.ifremer.isisfish.entities.Result;
+import fr.ifremer.isisfish.types.Date;
 
 
-/** @author poussin */
+/**
+ * SimulationHelperTest.
+ *
+ * Created: 4 janv. 07 12:06:18
+ *
+ * @author poussin
+ * @version $Revision$
+ *
+ * Last update: $Date$
+ * by : $Author$
+ */
+public class SimulationHelperTest {
 
-public class SimulationHelperTest extends TestCase {
-
     private static final Log log = LogFactory.getLog(SimulationHelperTest.class);
 
     final static private String[] SIMULATION_ZIP_FILE = new String[]{
-            //TC - 20090113 : remove the asrc to src when the zip file will be in correct db version, otherwise there is a ui asking to migrate
-            // or just desactivate the migration service ?
-            "asrc" + File.separator + "test" + File.separator + "java" + File.separator + "fr" + File.separator + "ifremer" + File.separator + "isisfish" + File.separator + "simulator" + File.separator + "SimulationTest.zip",
+            "src" + File.separator + "test" + File.separator + "resources" + File.separator + "simulations" + File.separator + "test-nonregression-20090203.zip",
             // put here other zip simulation test
     };
+    
+    @BeforeClass
+    public static void init() throws Exception {
+        TestUtils.init();
+    }
+    
+    @AfterClass
+    public static void clean() {
+        TestUtils.clean();
+    }
 
 //    public void testVerifResult() throws Exception {
 //        try {
@@ -126,11 +130,12 @@
     10000000000;20000000000;30000000000;40000000000;50000000000;60000000000;70000000000;80000000000;90000000000;
     */
 
+    @Test
     public void testSimulate() throws Exception {
+        
         try {
             // par defaut on utilise des doubles pour les matrices
             MatrixFactory.setDefaultVectorClass(DoubleBigVector.class);
-            IsisFish.init();
 
             for (String zipName : SIMULATION_ZIP_FILE) {
                 // recuperation du fichier zip de la simulation de test
@@ -139,7 +144,7 @@
                 // import de cette simulation
                 String name = "simulation-test-" + System.currentTimeMillis();
                 SimulationStorage simRef = SimulationStorage.importAndRenameZip(zip, name + "-ref");
-
+                
                 // import de la simulation avec un autre nom
                 SimulationStorage sim = SimulationStorage.importAndRenameZip(zip, name);
 
@@ -148,7 +153,8 @@
                     TopiaContext tx = sim.getStorage().beginTransaction();
                     tx.execute("DELETE from " + Result.class.getName());
                     tx.commitTransaction();
-
+                    tx.closeContext();
+                    
                     // lancement de la simulation
                     // FIXME a remplacer avec SimulationService
 //                    SimulationHelper.simulate(null, sim);
@@ -158,7 +164,7 @@
                     ResultStorage result = sim.getResultStorage();
 
                     List<String> resultNames = resultRef.getResultName();
-                    assertEquals(resultNames, result.getResultName());
+                    Assert.assertEquals(resultNames, result.getResultName());
 
                     Date lastDate = resultRef.getLastDate();
 
@@ -166,7 +172,7 @@
                     for (Date date = new Date(0); date.before(lastDate); date = date.next()) {
                         for (String resultName : resultNames) {
                             log.debug("Check result " + date + " " + resultName);
-                            assertEquals("Date " + date.getDate() + " result " + resultName,
+                            Assert.assertEquals("Date " + date.getDate() + " result " + resultName,
                                     resultRef.getMatrix(date, resultName),
                                     result.getMatrix(date, resultName));
                         }
@@ -187,27 +193,4 @@
             throw eee;
         }
     }
-
-    public static void main(String[] args) {
-        TestSuite suite = new TestSuite(SimulationHelperTest.class);
-        TestResult result = new TestResult();
-        suite.run(result);
-        if (result.wasSuccessful()) {
-            System.out.println("Test Ok");
-        } else {
-            System.out.println("Test Faild");
-            System.out.println("Failures");
-            for (Enumeration e = result.failures(); e.hasMoreElements();) {
-                System.out.println(e.nextElement().toString());
-            }
-            System.out.println("Errors");
-            for (Enumeration e = result.errors(); e.hasMoreElements();) {
-                TestFailure eee = (TestFailure) e.nextElement();
-                System.out.println(eee.toString());
-                eee.thrownException().printStackTrace();
-            }
-        }
-    }
 }
-
-

Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationTest.zip
===================================================================
(Binary files differ)

Added: isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip
===================================================================
(Binary files differ)


Property changes on: isis-fish/trunk/src/test/resources/simulations/test-nonregression-20090203.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

    

r1778 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/test/java/fr/ifremer src/test/java/fr/ifremer/isisfish src/test/java/fr/ifremer/isisfish/simulator src/test/resources src/test/resources/simulations

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)