Project

General

Profile

« Previous | Next » 

Revision c4f7a205

Added by Katja Luther over 7 years ago

fix #6296: fix problems for simple search

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
258 258 
    @DataSet (loadStrategy=CleanSweepInsertLoadStrategy.class, value="TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml")
259 259 
    public void testGetTaxaByNameVariants(){
260 260 
        List<TaxonBase> results = taxonDao.getTaxaByName(false, false, false, true, false, "c*", null, MatchMode.BEGINNING, null, null, null, null, null);
261 
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());
261 
        Assert.assertEquals("There should be 2 Taxa",2, results.size());
262 262 

  		




  263
  263
  
    
        results = taxonDao.getTaxaByName(false, false, true, true, false, "R*", null, MatchMode.BEGINNING, null, null, null, null, null);


  		




  264
  264
  
    
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());


  		




  ......




  267
  267
  
    
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());


  		




  268
  268
  
    

  		




  269
  269
  
    
        results = taxonDao.getTaxaByName(false, true, false, true, false, "c*", null, MatchMode.BEGINNING, null, null, null, null, null);


  		




  270
  
  
    
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());


  		




  
  270
  
    
        Assert.assertEquals("There should be 2 Taxa", 2, results.size());


  		




  271
  271
  
    

  		




  272
  272
  
    
        results = taxonDao.getTaxaByName(true, false, false, true, false, "c*", null, MatchMode.BEGINNING, null, null, null, null, null);


  		




  
  273
  
    
        Assert.assertEquals("There should be 2 Taxa", 2, results.size());


  		




  
  274
  
    
        Classification classification = classificationDao.load(classificationUuid);


  		




  
  275
  
    
        results = taxonDao.getTaxaByName(false, false, false, true, false, "c*", classification, MatchMode.BEGINNING, null, null, null, null, null);


  		




  
  276
  
    
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());


  		




  
  277
  
    
        Set<NamedArea> namedAreas = new HashSet<>();


  		




  
  278
  
    
        namedAreas.add((NamedArea)definedTermDao.load(southernAmericaUuid));


  		




  
  279
  
    
        results = taxonDao.getTaxaByName(false, false, false, true, false, "c*", null, MatchMode.BEGINNING, namedAreas, null, null, null, null);


  		




  273
  280
  
    
        Assert.assertEquals("There should be 1 Taxa", 1, results.size());


  		




  274
  
  
    

  		




  275
  281
  
    
    }


  		




  276
  282
  
    

  		




  277
  283
  
    
    /**


  		




  ......




  353
  359
  
    
        assertNotNull("getTaxaByName should return a List", results);


  		




  354
  360
  
    
        assertTrue("expected to find two taxa but found "+results.size(), results.size() == 2);


  		




  355
  361
  
    

  		




  
  362
  
    
        results = taxonDao.getTaxaByName(false,false, false, true, false,"com*", null, MatchMode.BEGINNING, namedAreas,


  		




  
  363
  
    
                null, null, null, null);


  		




  
  364
  
    
            assertNotNull("getTaxaByName should return a List", results);


  		




  
  365
  
    
            assertTrue("expected to find one taxon but found "+results.size(), results.size() == 1);


  		




  
  366
  
    

  		




  356
  367
  
    
        // 2. searching for a taxon (Rethera) contained in a specific classification


  		




  357
  368
  
    
        results = taxonDao.getTaxaByName(true, false, false, false, false,"Rethera", taxonmicTree, MatchMode.BEGINNING, namedAreas,


  		




  358
  369
  
    
            null, null, null, null);


  		




  ......




  1113
  1124
  
    

  		




  1114
  1125
  
    
        assertNotNull("getTaxaByCommonName should return a list", commonNameResults);


  		




  1115
  1126
  
    
        assertFalse("the list should not be empty", commonNameResults.isEmpty());


  		




  1116
  
  
    
        assertEquals("There should be one Taxon with common name", 1,commonNameResults.size());


  		




  1117
  
  
    
        assertEquals(" sec. ???", ((TaxonBase)commonNameResults.get(0)).getTitleCache());


  		




  
  1127
  
    
        assertEquals("There should be two taxa with common name", 2,commonNameResults.size());


  		




  1118
  1128
  
    

  		




  1119
  1129
  
    
        List<UuidAndTitleCache<IdentifiableEntity>> list = taxonDao.getTaxaByCommonNameForEditor("common%", null, MatchMode.BEGINNING, null);


  		




  1120
  1130
  
    

  		




  1121
  1131
  
    
        assertNotNull("getTaxaByCommonName should return a list", commonNameResults);


  		




  1122
  1132
  
    
        assertFalse("the list should not be empty", commonNameResults.isEmpty());


  		




  1123
  
  
    
        assertEquals("There should be one Taxon with common name", 1,commonNameResults.size());


  		




  1124
  
  
    
        assertEquals(" sec. ???", ((TaxonBase)commonNameResults.get(0)).getTitleCache());


  		




  
  1133
  
    
        assertEquals("There should be two Taxon with common name", 2,commonNameResults.size());


  		




  
  1134
  
    

  		




  1125
  1135
  
    
    }


  		




  1126
  1136
  
    

  		




  1127
  1137
  
    
    @Test


  		












Also available in:  Unified diff