This is an automated email from the git hooks/post-receive script. New commit to branch feature/7719-2 in repository observe. See http://git.codelutin.com/observe.git commit d568cc86e2b8dbf78f406cf316aac7f141121fe2 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 13 16:04:33 2015 +0100 fix test --- .../referentiel/LengthWeightParemetersTest.java | 43 ++++++++++++---------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java index 256c431..431551b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java @@ -23,6 +23,7 @@ package fr.ird.observe.entities.referentiel; import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; +import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceStatus; @@ -57,44 +58,44 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { return "referentiel"; } + private ObserveTopiaPersistenceContext persistenceContext; + @Override public void setUp() throws Exception { super.setUp(); - ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); + persistenceContext = dataSourceResource.newPersistenceContext(); SpeciesTopiaDao speciesDAO = persistenceContext.getSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindAny(); + Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindUnique(); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); - Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindAny(); + Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindUnique(); Assert.assertTrue("Could not find sex with code 0 (Undetermined)", optionalUndeterminedSex.isPresent()); - Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindAny(); + Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindUnique(); Assert.assertTrue("Could not find sex with code 1 (male)", optionalMaleSex.isPresent()); - Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindAny(); + Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindUnique(); Assert.assertTrue("Could not find sex with code 2 (female)", optionalFemaleSex.isPresent()); Date firstStartDate = DateUtil.createDate(1, 1, 2010); Date firstEndDate = DateUtil.createDate(31, 12, 2010); Date secondStartDate = DateUtil.createDate(1, 1, 2011); - Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindAny(); + Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindUnique(); Assert.assertNotNull("Could not find ocean with code 1 (Atlantic)", optionalAtlanticOcean.isPresent()); - Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindAny(); + Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindUnique(); Assert.assertNotNull("Could not find ocean with code 2 (Indian)", optionalIndianOcean.isPresent()); LengthWeightParameterTopiaDao lengthWeightParameterDao = persistenceContext.getLengthWeightParameterDao(); Species species = optionalSpecies.get(); - Sex undeterminedSex = optionalUndeterminedSex.get(); Sex maleSex = optionalMaleSex.get(); - Sex femaleSex = optionalFemaleSex.get(); Ocean atlanticOcean = optionalAtlanticOcean.get(); Ocean indianOcean = optionalIndianOcean.get(); @@ -107,8 +108,11 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { // Ajout parametrage Male / Indien (Après 2010) createLengthWeightParameter(lengthWeightParameterDao, species, indianOcean, maleSex, secondStartDate, null); - persistenceContext.commit(); + } + @After + public final void tearDown() { + persistenceContext.close(); } protected static void createLengthWeightParameter(LengthWeightParameterTopiaDao lengthWeightParameterDao, @@ -129,8 +133,9 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { entity.setCoefficients("a=3.8E-5:b=2.78"); entity.setLengthWeightFormula("a * Math.pow(L, b)"); entity.setWeightLengthFormula("Math.pow(P/a, 1/b)"); - lengthWeightParameterDao.create(entity); + entity.setLastUpdate(new Date()); + lengthWeightParameterDao.create(entity); } @@ -141,22 +146,20 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { @Test public void testGetCorrectLengthWeightParameter() { - ObserveTopiaPersistenceContext persistenceContext = dataSourceResource.newPersistenceContext(); - SpeciesTopiaDao speciesDAO = persistenceContext.getSpeciesDao(); OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindAny(); + Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindUnique(); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); - Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindAny(); + Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindUnique(); Assert.assertTrue("Could not find sex with code 0 (Undetermined)", optionalUndeterminedSex.isPresent()); - Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindAny(); + Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindUnique(); Assert.assertTrue("Could not find sex with code 1 (male)", optionalMaleSex.isPresent()); - Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindAny(); + Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindUnique(); Assert.assertTrue("Could not find sex with code 2 (female)", optionalFemaleSex.isPresent()); Date date1970 = DateUtil.createDate(1, 1, 1970); @@ -164,13 +167,13 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { Date date2010 = DateUtil.createDate(1, 1, 2010); Date date2011 = DateUtil.createDate(1, 1, 2011); - Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindAny(); + Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindUnique(); Assert.assertNotNull("Could not find ocean with code 1 (Atlantic)", optionalAtlanticOcean.isPresent()); - Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindAny(); + Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindUnique(); Assert.assertNotNull("Could not find ocean with code 2 (Indian)", optionalIndianOcean.isPresent()); - Optional<Ocean> optionalPacificOcean = oceanDAO.forCodeEquals("3").tryFindAny(); + Optional<Ocean> optionalPacificOcean = oceanDAO.forCodeEquals("3").tryFindUnique(); Assert.assertNotNull("Could not find ocean with code 3 (Pacific)", optionalPacificOcean.isPresent()); Species species = optionalSpecies.get(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.