Revision da39aca0
Added by Andreas Müller about 7 years ago
| cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java | ||
|---|---|---|
| 148 | 148 |
|
| 149 | 149 |
//nameRelations |
| 150 | 150 |
|
| 151 |
t1.getName().addRelationshipFromName(BotanicalName.NewInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
|
|
| 151 |
t1.getName().addRelationshipFromName(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
|
|
| 152 | 152 |
|
| 153 | 153 |
//taxonRelations |
| 154 |
t1.addTaxonRelation(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
|
|
| 155 |
Synonym synonym = Synonym.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
| 154 |
t1.addTaxonRelation(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
|
|
| 155 |
Synonym synonym = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
| 156 | 156 |
UUID uuidSynonym = taxonService.save(synonym).getUuid(); |
| 157 | 157 |
|
| 158 | 158 |
t1.addHomotypicSynonym(synonym); |
| ... | ... | |
| 239 | 239 |
polKeyService.save(polKey); |
| 240 | 240 |
|
| 241 | 241 |
//nameRelations |
| 242 |
t1.getName().addRelationshipFromName(BotanicalName.NewInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
|
|
| 242 |
t1.getName().addRelationshipFromName(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
|
|
| 243 | 243 |
TaxonNameBase<?,?> name1 = t1.getName(); |
| 244 | 244 |
UUID name1UUID = name1.getUuid(); |
| 245 | 245 |
//taxonRelations |
| 246 |
t1.addTaxonRelation(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
|
|
| 247 |
Synonym t1HomotypSynonym = Synonym.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
| 246 |
t1.addTaxonRelation(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
|
|
| 247 |
Synonym t1HomotypSynonym = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
| 248 | 248 |
|
| 249 | 249 |
t1.addHomotypicSynonym(t1HomotypSynonym); |
| 250 | 250 |
TaxonNameBase<?,?> nameT1 = t1.getName(); |
| ... | ... | |
| 376 | 376 |
node6 = taxonNodeService.load(node6Uuid); |
| 377 | 377 |
|
| 378 | 378 |
treeIndex = node6.treeIndex(); |
| 379 |
Taxon newTaxon= Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
| 379 |
Taxon newTaxon= Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
| 380 | 380 |
UUID taxonNewUuid = taxonService.save(newTaxon).getUuid(); |
| 381 | 381 |
|
| 382 | 382 |
node5.addChildTaxon(newTaxon, null, null); |
| ... | ... | |
| 401 | 401 |
node2 = taxonNodeService.load(rootNodeUuid); |
| 402 | 402 |
node1 = HibernateProxyHelper.deproxy(node1); |
| 403 | 403 |
|
| 404 |
TaxonNode newNode = node1.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), null, null);
|
|
| 404 |
TaxonNode newNode = node1.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), null, null);
|
|
| 405 | 405 |
UUID uuidNewNode = taxonNodeService.save(newNode).getUuid(); |
| 406 | 406 |
newNode = taxonNodeService.load(uuidNewNode); |
| 407 | 407 |
UUID taxUUID = newNode.getTaxon().getUuid(); |
| ... | ... | |
| 443 | 443 |
List<TaxonNode> nodesOfClassification2 = taxonNodeService.listAllNodesForClassification(classification2, null, null); |
| 444 | 444 |
UUID nodeUUID = nodesOfClassification2.get(0).getUuid(); |
| 445 | 445 |
assertEquals(nodeUUID, nodeClassification2.getUuid()); |
| 446 |
Taxon newTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
|
|
| 446 |
Taxon newTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
| 447 | 447 |
taxonService.save(newTaxon); |
| 448 | 448 |
TaxonNode newNode = node1.addChildTaxon(newTaxon,null, null); |
| 449 | 449 |
UUID uuidNewNode = taxonNodeService.save(newNode).getUuid(); |
| ... | ... | |
| 482 | 482 |
node2 = taxonNodeService.load(rootNodeUuid); |
| 483 | 483 |
node1 = HibernateProxyHelper.deproxy(node1); |
| 484 | 484 |
node2 = HibernateProxyHelper.deproxy(node2); |
| 485 |
TaxonNode newNode = node1.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), null, null);
|
|
| 485 |
TaxonNode newNode = node1.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), null, null);
|
|
| 486 | 486 |
UUID uuidNewNode = taxonNodeService.save(newNode).getUuid(); |
| 487 | 487 |
List<TaxonNode> treeNodes = new ArrayList<TaxonNode>(); |
| 488 | 488 |
treeNodes.add(node1); |
| ... | ... | |
| 510 | 510 |
// Set<TaxonNode> nodes = classification.getAllNodes(); |
| 511 | 511 |
List<TaxonNode> nodes = classification.getChildNodes(); |
| 512 | 512 |
System.out.println(nodes.size()); |
| 513 |
classification.addChildTaxon(Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null), nodes.size(), null, null);
|
|
| 513 |
classification.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null), nodes.size(), null, null);
|
|
| 514 | 514 |
nodes = classification.getChildNodes(); |
| 515 | 515 |
System.out.println(nodes.size()); |
| 516 | 516 |
|
| ... | ... | |
| 527 | 527 |
* `- Pinus pampa |
| 528 | 528 |
*/ |
| 529 | 529 |
Classification classification = Classification.NewInstance("Classification");
|
| 530 |
BotanicalName abiesName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 530 |
BotanicalName abiesName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 531 | 531 |
abiesName.setGenusOrUninomial("Abies");
|
| 532 | 532 |
Taxon abies = Taxon.NewInstance(abiesName, null); |
| 533 |
BotanicalName abiesAlbaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 533 |
BotanicalName abiesAlbaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 534 | 534 |
abiesAlbaName.setGenusOrUninomial("Abies");
|
| 535 | 535 |
abiesAlbaName.setSpecificEpithet("alba");
|
| 536 | 536 |
Taxon abiesAlba = Taxon.NewInstance(abiesAlbaName, null); |
| 537 |
BotanicalName pinusName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 537 |
BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 538 | 538 |
pinusName.setGenusOrUninomial("Pinus");
|
| 539 | 539 |
Taxon pinus = Taxon.NewInstance(pinusName, null); |
| 540 |
BotanicalName pinusPampaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 540 |
BotanicalName pinusPampaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 541 | 541 |
pinusPampaName.setGenusOrUninomial("Pinus");
|
| 542 | 542 |
pinusPampaName.setSpecificEpithet("pampa");
|
| 543 | 543 |
Taxon pinusPampa = Taxon.NewInstance(pinusPampaName, null); |
| 544 | 544 |
|
| 545 |
BotanicalName abiesBalsameaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 545 |
BotanicalName abiesBalsameaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 546 | 546 |
abiesBalsameaName.setGenusOrUninomial("Abies");
|
| 547 | 547 |
abiesBalsameaName.setSpecificEpithet("balsamea");
|
| 548 | 548 |
Taxon abiesBalsamea = Taxon.NewInstance(abiesBalsameaName, null); |
| ... | ... | |
| 597 | 597 |
// Classification checklist = Classification.NewInstance("Checklist");
|
| 598 | 598 |
// checklist.setUuid(classificationUuid); |
| 599 | 599 |
// |
| 600 |
// BotanicalName abiesName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 600 |
// BotanicalName abiesName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 601 | 601 |
// abiesName.setGenusOrUninomial("Abies");
|
| 602 | 602 |
// Taxon abies = Taxon.NewInstance(abiesName, null); |
| 603 | 603 |
// |
| 604 |
// BotanicalName abiesAlbaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 604 |
// BotanicalName abiesAlbaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 605 | 605 |
// abiesAlbaName.setGenusOrUninomial("Abies");
|
| 606 | 606 |
// abiesAlbaName.setSpecificEpithet("alba");
|
| 607 | 607 |
// Taxon abiesAlba = Taxon.NewInstance(abiesAlbaName, null); |
| 608 | 608 |
// |
| 609 |
// BotanicalName abiesAlbaSubBrotaName = BotanicalName.NewInstance(Rank.SUBSPECIES());
|
|
| 609 |
// BotanicalName abiesAlbaSubBrotaName = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 610 | 610 |
// abiesAlbaSubBrotaName.setGenusOrUninomial("Abies");
|
| 611 | 611 |
// abiesAlbaSubBrotaName.setSpecificEpithet("alba");
|
| 612 | 612 |
// abiesAlbaSubBrotaName.setInfraSpecificEpithet("brota");
|
| 613 | 613 |
// Taxon abiesAlbaSubBrota = Taxon.NewInstance(abiesAlbaSubBrotaName, null); |
| 614 | 614 |
// |
| 615 |
// BotanicalName abiesPalmaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 615 |
// BotanicalName abiesPalmaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 616 | 616 |
// abiesPalmaName.setGenusOrUninomial("Abies");
|
| 617 | 617 |
// abiesPalmaName.setSpecificEpithet("palma");
|
| 618 | 618 |
// Taxon abiesPalma = Taxon.NewInstance(abiesPalmaName, null); |
| 619 | 619 |
// |
| 620 |
// BotanicalName pinusName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 620 |
// BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 621 | 621 |
// pinusName.setGenusOrUninomial("Pinus");
|
| 622 | 622 |
// Taxon pinus = Taxon.NewInstance(pinusName, null); |
| 623 | 623 |
// |
| ... | ... | |
| 893 | 893 |
Classification checklist = Classification.NewInstance("Checklist");
|
| 894 | 894 |
checklist.setUuid(classificationUuid); |
| 895 | 895 |
|
| 896 |
BotanicalName abiesName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 896 |
BotanicalName abiesName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 897 | 897 |
abiesName.setGenusOrUninomial("Abies");
|
| 898 | 898 |
Taxon abies = Taxon.NewInstance(abiesName, null); |
| 899 | 899 |
abies.setUuid(abiesUuid); |
| 900 | 900 |
|
| 901 |
BotanicalName abiesAlbaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 901 |
BotanicalName abiesAlbaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 902 | 902 |
abiesAlbaName.setGenusOrUninomial("Abies");
|
| 903 | 903 |
abiesAlbaName.setSpecificEpithet("alba");
|
| 904 | 904 |
Taxon abiesAlba = Taxon.NewInstance(abiesAlbaName, null); |
| 905 | 905 |
abiesAlba.setUuid(abiesAlbaUuid); |
| 906 | 906 |
|
| 907 |
BotanicalName abiesAlbaSubBrotaName = BotanicalName.NewInstance(Rank.SUBSPECIES());
|
|
| 907 |
BotanicalName abiesAlbaSubBrotaName = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 908 | 908 |
abiesAlbaSubBrotaName.setGenusOrUninomial("Abies");
|
| 909 | 909 |
abiesAlbaSubBrotaName.setSpecificEpithet("alba");
|
| 910 | 910 |
abiesAlbaSubBrotaName.setInfraSpecificEpithet("brota");
|
| 911 | 911 |
Taxon abiesAlbaSubBrota = Taxon.NewInstance(abiesAlbaSubBrotaName, null); |
| 912 | 912 |
abiesAlbaSubBrota.setUuid(abiesAlbaSubBrotaUuid); |
| 913 | 913 |
|
| 914 |
BotanicalName abiesPalmaName = BotanicalName.NewInstance(Rank.SPECIES());
|
|
| 914 |
BotanicalName abiesPalmaName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 915 | 915 |
abiesPalmaName.setGenusOrUninomial("Abies");
|
| 916 | 916 |
abiesPalmaName.setSpecificEpithet("palma");
|
| 917 | 917 |
Taxon abiesPalma = Taxon.NewInstance(abiesPalmaName, null); |
| 918 | 918 |
abiesPalma.setUuid(abiesPalmaUuid); |
| 919 | 919 |
|
| 920 |
BotanicalName pinusName = BotanicalName.NewInstance(Rank.GENUS());
|
|
| 920 |
BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 921 | 921 |
pinusName.setGenusOrUninomial("Pinus");
|
| 922 | 922 |
Taxon pinus = Taxon.NewInstance(pinusName, null); |
| 923 | 923 |
pinus.setUuid(pinusUuid); |
Also available in: Unified diff
ref #6365 merge static methods from BotanicaName to TaxonNameBase