Project

General

Profile

« Previous | Next » 

Revision 891d65aa

Added by Andreas Müller almost 8 years ago

#5958 fix failing tests

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
1250 1250 
        }
1251 1251 

  		




  1252
  1252
  
    
        if(authorship == null) {


  		




  1253
  
  
    
            criteria.add(Restrictions.isEmpty("name.authorshipCache"));


  		




  
  1253
  
    
            criteria.add(Restrictions.eq("name.authorshipCache", ""));


  		




  1254
  1254
  
    
        } else if(!authorship.equals("*")) {


  		




  1255
  1255
  
    
            criteria.add(Restrictions.eq("name.authorshipCache", authorship));


  		




  1256
  1256
  
    
        }


  		












  

    
      cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
    
  





  699
  699
  
    
    @Test


  		




  700
  700
  
    
    @DataSet


  		




  701
  701
  
    
    public void testGetTaxonMatchingUninomial() {


  		




  702
  
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class, "Smerinthus", "*", "*", "*",null,null,null,null);


  		




  
  702
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class, "Smerinthus", "*", "*", "*","*",null,null,null);


  		




  703
  703
  
    

  		




  704
  704
  
    
        assertNotNull("findTaxaByName should return a List", result);


  		




  705
  705
  
    
        assertEquals("findTaxaByName should return two Taxa",2,result.size());


  		




  ......




  709
  709
  
    
    @Test


  		




  710
  710
  
    
    @DataSet


  		




  711
  711
  
    
    public void testGetTaxonMatchingSpeciesBinomial() {


  		




  712
  
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class, "Smerinthus", null, "kindermannii", null,null,null,null,null);


  		




  
  712
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class, "Smerinthus", null, "kindermannii", null,"*",null,null,null);


  		




  713
  713
  
    

  		




  714
  714
  
    
        assertNotNull("findTaxaByName should return a List", result);


  		




  715
  715
  
    
        assertEquals("findTaxaByName should return one Taxon",1,result.size());


  		




  ......




  719
  719
  
    
    @Test


  		




  720
  720
  
    
    @DataSet


  		




  721
  721
  
    
    public void testGetTaxonMatchingTrinomial() {


  		




  722
  
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class,"Cryptocoryne", null,"purpurea","borneoensis",null,null,null,null);


  		




  
  722
  
    
        List<TaxonBase> result = taxonDao.findTaxaByName(Taxon.class,"Cryptocoryne", null,"purpurea","borneoensis","*",null,null,null);


  		




  723
  723
  
    

  		




  724
  724
  
    
        assertNotNull("findTaxaByName should return a List", result);


  		




  725
  725
  
    
        assertEquals("findTaxaByName should return one Taxon",1,result.size());


  		












Also available in:  Unified diff