Revision ad3ad9e0
Added by Andreas Kohlbecker over 12 years ago
- ID ad3ad9e0f0560d0bb782836297c4ffe39b2625c8
- Parent 55d84577
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java | ||
---|---|---|
20 | 20 |
import java.io.FileOutputStream; |
21 | 21 |
import java.util.ArrayList; |
22 | 22 |
import java.util.HashSet; |
23 |
import java.util.Iterator; |
|
23 | 24 |
import java.util.List; |
24 | 25 |
import java.util.Set; |
25 | 26 |
import java.util.UUID; |
... | ... | |
45 | 46 |
import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; |
46 | 47 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
47 | 48 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
49 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
|
48 | 50 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; |
49 | 51 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
50 | 52 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
... | ... | |
224 | 226 |
results = taxonDao.getTaxaByName("A*", MatchMode.BEGINNING, |
225 | 227 |
true, null, null); |
226 | 228 |
assertNotNull("getTaxaByName should return a List", results); |
227 |
assertTrue(results.size() == 9); |
|
228 |
|
|
229 |
assertTrue(results.size() == 12); |
|
230 |
|
|
231 |
|
|
232 |
//System.err.println("Species group: " + Rank.SPECIESGROUP().getId() + "Species: " + Rank.SPECIES().getId() + "Section Botany: "+ Rank.SECTION_BOTANY()); |
|
233 |
|
|
229 | 234 |
if (logger.isDebugEnabled()) { |
230 | 235 |
for (int i = 0; i < results.size(); i++) { |
231 | 236 |
String nameCache = ""; |
... | ... | |
244 | 249 |
|
245 | 250 |
results = taxonDao.getTaxaByName("A", MatchMode.BEGINNING, true, null, null); |
246 | 251 |
assertNotNull("getTaxaByName should return a List", results); |
247 |
assertTrue(results.size() == 9);
|
|
252 |
assertTrue(results.size() == 12);
|
|
248 | 253 |
|
249 | 254 |
results = taxonDao.getTaxaByName("Aus", MatchMode.EXACT, true, null, null); |
250 | 255 |
assertNotNull("getTaxaByName should return a List", results); |
... | ... | |
268 | 273 |
|
269 | 274 |
results = taxonDao.getTaxaByNameForEditor(TaxonBase.class,"A*",null, MatchMode.BEGINNING, null); |
270 | 275 |
assertNotNull("getTaxaByName should return a List", results); |
271 |
assertTrue(results.size() == 12);
|
|
276 |
assertTrue(results.size() == 15);
|
|
272 | 277 |
|
273 | 278 |
|
274 | 279 |
results = taxonDao.getTaxaByNameForEditor(Taxon.class,"A", null,MatchMode.BEGINNING, null); |
275 | 280 |
assertNotNull("getTaxaByName should return a List", results); |
276 |
assertTrue(results.size() == 9);
|
|
281 |
assertTrue(results.size() == 12);
|
|
277 | 282 |
assertEquals(results.get(0).getType(), Taxon.class); |
278 | 283 |
|
279 | 284 |
results = taxonDao.getTaxaByNameForEditor(Synonym.class,"A", null,MatchMode.BEGINNING, null); |
... | ... | |
413 | 418 |
assertNotNull("getTaxaByName should return a List", results); |
414 | 419 |
assertTrue("expected to find 8 taxa but found "+results.size(), results.size() == 8); |
415 | 420 |
} |
421 |
|
|
422 |
@Test |
|
423 |
@DataSet("TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml") |
|
424 |
public void testTaxonNameInTwoClassifications(){ |
|
425 |
int numberOfClassifications = classificationDao.count(); |
|
426 |
List<String> propertyPaths = new ArrayList<String>(); |
|
427 |
propertyPaths.add("taxonNodes"); |
|
428 |
List<TaxonBase> taxa = taxonDao.getTaxaByName(TaxonBase.class, "P*", null, MatchMode.BEGINNING, null, null, null, null); |
|
429 |
Taxon taxon = (Taxon)taxa.get(0); |
|
430 |
Set<TaxonNode> nodes = taxon.getTaxonNodes(); |
|
431 |
assertTrue(nodes.size() == 1); |
|
432 |
//assertNotNull(taxa); |
|
433 |
//assertTrue(taxa.size() > 0); |
|
434 |
} |
|
416 | 435 |
|
417 | 436 |
|
418 | 437 |
@Test |
... | ... | |
449 | 468 |
@DataSet |
450 | 469 |
public void testCountTaxaByName() { |
451 | 470 |
long numberOfTaxa = taxonDao.countTaxaByName(Taxon.class, "A*", null, MatchMode.BEGINNING, null); |
452 |
assertEquals(numberOfTaxa, 9);
|
|
471 |
assertEquals(numberOfTaxa, 12);
|
|
453 | 472 |
numberOfTaxa = taxonDao.countTaxaByName(Taxon.class, "A*", null, MatchMode.BEGINNING, null); |
454 |
assertEquals(numberOfTaxa, 9);
|
|
473 |
assertEquals(numberOfTaxa, 12);
|
|
455 | 474 |
numberOfTaxa = taxonDao.countTaxaByName(Synonym.class, "A*", null, MatchMode.BEGINNING, null); |
456 | 475 |
assertEquals(numberOfTaxa, 3); |
457 | 476 |
numberOfTaxa = taxonDao.countTaxaByName(TaxonBase.class, "A*", null, MatchMode.BEGINNING, null); |
458 |
assertEquals(numberOfTaxa, 12);
|
|
477 |
assertEquals(numberOfTaxa, 15);
|
|
459 | 478 |
numberOfTaxa = taxonDao.countTaxaByName(TaxonBase.class, "Aasfwerfwf fffe", null, MatchMode.BEGINNING, null); |
460 | 479 |
assertEquals(numberOfTaxa, 0); |
461 | 480 |
// FIXME implement test for search in specific classification |
... | ... | |
622 | 641 |
@DataSet |
623 | 642 |
public void testCountAllTaxa() { |
624 | 643 |
int numberOfTaxa = taxonDao.count(Taxon.class); |
625 |
assertEquals("count should return 33 taxa",33, numberOfTaxa);
|
|
644 |
assertEquals("count should return 36 taxa",36, numberOfTaxa);
|
|
626 | 645 |
} |
627 | 646 |
|
628 | 647 |
@Test |
... | ... | |
630 | 649 |
public void testListAllTaxa() { |
631 | 650 |
List<TaxonBase> taxa = taxonDao.list(Taxon.class,100, 0); |
632 | 651 |
assertNotNull("list should return a List",taxa); |
633 |
assertEquals("list should return 33 taxa",33, taxa.size());
|
|
652 |
assertEquals("list should return 36 taxa",36, taxa.size());
|
|
634 | 653 |
} |
635 | 654 |
|
636 | 655 |
@Test |
Also available in: Unified diff
Merging r13295 through r13325 from trunk