Revision fe34a9eb
Added by Andreas Müller about 7 years ago
| cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/ipni/IpniService.java | ||
|---|---|---|
| 47 | 47 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; |
| 48 | 48 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
| 49 | 49 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 50 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 50 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 51 | 51 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; |
| 52 | 52 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 53 | 53 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 465 | 465 |
valueMap.put(parameterMap.get(i), splits[i]); |
| 466 | 466 |
} |
| 467 | 467 |
|
| 468 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 468 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 469 | 469 |
|
| 470 | 470 |
//caches |
| 471 | 471 |
name.setNameCache(valueMap.get(FULL_NAME_WITHOUT_FAMILY_AND_AUTHORS), true); |
| ... | ... | |
| 514 | 514 |
name.addAnnotation(annotation); |
| 515 | 515 |
|
| 516 | 516 |
//basionym |
| 517 |
BotanicalName basionym = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 517 |
BotanicalName basionym = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 518 | 518 |
basionym.setTitleCache(valueMap.get(BASIONYM), true); |
| 519 | 519 |
name.addBasionym(basionym); |
| 520 | 520 |
|
| 521 | 521 |
//replaced synonym |
| 522 |
BotanicalName replacedSynoynm = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 522 |
BotanicalName replacedSynoynm = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 523 | 523 |
replacedSynoynm.setTitleCache(valueMap.get(REPLACED_SYNONYM), true); |
| 524 | 524 |
name.addReplacedSynonym(replacedSynoynm, null, null, null); |
| 525 | 525 |
|
| cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifJsonOccurrenceParser.java | ||
|---|---|---|
| 250 | 250 |
if (string.equals(NomenclaturalCode.ICZN.getTitleCache())){
|
| 251 | 251 |
name = TaxonNameFactory.NewZoologicalInstance(rank); |
| 252 | 252 |
} else if (string.equals(NomenclaturalCode.ICNAFP.getTitleCache())) {
|
| 253 |
name = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 253 |
name = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 254 | 254 |
} else if (string.equals(NomenclaturalCode.ICNB.getTitleCache())){
|
| 255 | 255 |
name = TaxonNameFactory.NewBacterialInstance(rank); |
| 256 | 256 |
} else if (string.equals(NomenclaturalCode.ICNCP.getTitleCache())){
|
| ... | ... | |
| 262 | 262 |
}else {
|
| 263 | 263 |
if (record.has(KINGDOM)){
|
| 264 | 264 |
if (record.getString(KINGDOM).equals(PLANTAE)){
|
| 265 |
name = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 265 |
name = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 266 | 266 |
} else if (record.getString(KINGDOM).equals(ANIMALIA)){
|
| 267 | 267 |
name = TaxonNameFactory.NewZoologicalInstance(rank); |
| 268 | 268 |
} else if (record.getString(KINGDOM).equals(FUNGI)){
|
| 269 |
name = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 269 |
name = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 270 | 270 |
} else if (record.getString(KINGDOM).equals(BACTERIA)){
|
| 271 | 271 |
name = TaxonNameFactory.NewBacterialInstance(rank); |
| 272 | 272 |
} else{
|
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java | ||
|---|---|---|
| 504 | 504 |
if (nc.isKindOf(NomenclaturalCode.ICZN)){
|
| 505 | 505 |
name = TaxonNameFactory.NewZoologicalInstance(taxonBase.getName().getRank()); |
| 506 | 506 |
}else if (nc.isKindOf(NomenclaturalCode.ICNAFP)){
|
| 507 |
name = TaxonNameBase.NewBotanicalInstance(taxonBase.getName().getRank());
|
|
| 507 |
name = TaxonNameFactory.NewBotanicalInstance(taxonBase.getName().getRank());
|
|
| 508 | 508 |
} else{
|
| 509 | 509 |
name = TaxonNameFactory.NewNonViralInstance(taxonBase.getName().getRank()); |
| 510 | 510 |
} |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java | ||
|---|---|---|
| 160 | 160 |
//create new taxon name |
| 161 | 161 |
|
| 162 | 162 |
if (state.getDataHolder().getNomenclatureCode().equals(NomenclaturalCode.ICNAFP)){
|
| 163 |
taxonName = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 163 |
taxonName = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 164 | 164 |
}else if (state.getDataHolder().getNomenclatureCode().equals(NomenclaturalCode.ICZN)){
|
| 165 | 165 |
taxonName = TaxonNameFactory.NewZoologicalInstance(rank); |
| 166 | 166 |
}else{
|
| ... | ... | |
| 347 | 347 |
return taxonName; |
| 348 | 348 |
} |
| 349 | 349 |
else{
|
| 350 |
taxonName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 350 |
taxonName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 351 | 351 |
} |
| 352 | 352 |
taxonName.setFullTitleCache(fullName, true); |
| 353 | 353 |
taxonName.setGenusOrUninomial(NB(getFromMap(atomisedMap, "Genus"))); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenCdmExcelImport.java | ||
|---|---|---|
| 539 | 539 |
if (StringUtils.isNotBlank(commonDetermination.determinedBy)){
|
| 540 | 540 |
sec = ReferenceFactory.newGeneric(); |
| 541 | 541 |
TeamOrPersonBase<?> determinedBy; |
| 542 |
BotanicalName dummyName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 542 |
BotanicalName dummyName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 543 | 543 |
try {
|
| 544 | 544 |
parser.parseAuthors(dummyName, commonDetermination.determinedBy); |
| 545 | 545 |
determinedBy = dummyName.getCombinationAuthorship(); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java | ||
|---|---|---|
| 188 | 188 |
|
| 189 | 189 |
private Taxon getTaxon(TaxonXImportConfigurator config){
|
| 190 | 190 |
Taxon result; |
| 191 |
// result = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null);
|
|
| 191 |
// result = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(null), null);
|
|
| 192 | 192 |
ICommonService commonService = getCommonService(); |
| 193 | 193 |
|
| 194 | 194 |
String originalSourceId = config.getOriginalSourceId(); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java | ||
|---|---|---|
| 133 | 133 |
|
| 134 | 134 |
private Taxon getTaxon(TaxonXImportConfigurator config){
|
| 135 | 135 |
Taxon result; |
| 136 |
// result = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null);
|
|
| 136 |
// result = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(null), null);
|
|
| 137 | 137 |
//ICommonService commonService =config.getCdmAppController().getCommonService(); |
| 138 | 138 |
ICommonService commonService = getCommonService(); |
| 139 | 139 |
String originalSourceId = config.getOriginalSourceId(); |
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx2013/TaxonXTreatmentExtractor.java | ||
|---|---|---|
| 1972 | 1972 |
fullname = getFullReference(name,nameTBF.getParsingProblems()); |
| 1973 | 1973 |
} |
| 1974 | 1974 |
if (nomenclaturalCode.equals(NomenclaturalCode.ICNAFP)){
|
| 1975 |
nameTBF = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 1975 |
nameTBF = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 1976 | 1976 |
} |
| 1977 | 1977 |
if (nomenclaturalCode.equals(NomenclaturalCode.ICZN)){
|
| 1978 | 1978 |
nameTBF = ZoologicalName.NewInstance(null); |
| ... | ... | |
| 2305 | 2305 |
|
| 2306 | 2306 |
TaxonNameBase<?,?> nameToBeFilled = null; |
| 2307 | 2307 |
if (nomenclaturalCode.equals(NomenclaturalCode.ICNAFP)){
|
| 2308 |
nameToBeFilled = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 2308 |
nameToBeFilled = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 2309 | 2309 |
} |
| 2310 | 2310 |
if (nomenclaturalCode.equals(NomenclaturalCode.ICZN)){
|
| 2311 | 2311 |
nameToBeFilled = ZoologicalName.NewInstance(null); |
| cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/dwca/in/DatabaseMappingTest.java | ||
|---|---|---|
| 22 | 22 |
import eu.etaxonomy.cdm.database.ICdmDataSource; |
| 23 | 23 |
import eu.etaxonomy.cdm.io.dwca.in.IImportMapping.CdmKey; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 26 | 26 |
|
| 27 | 27 |
/** |
| 28 | 28 |
* @author a.mueller |
| ... | ... | |
| 77 | 77 |
ICdmDataSource datasource = mapping.getDatabase(); |
| 78 | 78 |
Assert.assertNotNull("Datasource should not be null", datasource);
|
| 79 | 79 |
|
| 80 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 80 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 81 | 81 |
int id = 23; |
| 82 | 82 |
botName1.setId(id); |
| 83 | 83 |
String sourceNS = "sourceNS"; |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java | ||
|---|---|---|
| 138 | 138 |
|
| 139 | 139 |
switch (this){
|
| 140 | 140 |
case ICNAFP: |
| 141 |
result = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 141 |
result = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 142 | 142 |
break; |
| 143 | 143 |
case ICZN: |
| 144 | 144 |
result = TaxonNameFactory.NewZoologicalInstance(rank); |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java | ||
|---|---|---|
| 509 | 509 |
|
| 510 | 510 |
// *************** FACTORY METHODS ********************************/ |
| 511 | 511 |
|
| 512 |
|
|
| 513 |
|
|
| 514 |
/** |
|
| 515 |
* Creates a new botanical taxon name instance |
|
| 516 |
* only containing its {@link Rank rank} and
|
|
| 517 |
* the {@link eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy default cache strategy}.
|
|
| 518 |
* |
|
| 519 |
* @param rank the rank to be assigned to <i>this</i> botanical taxon name |
|
| 520 |
* @see #BotanicalName(Rank, HomotypicalGroup) |
|
| 521 |
* @see #NewInstance(Rank, HomotypicalGroup) |
|
| 522 |
* @see #NewBotanicalInstance(Rank, String, String, String, String, TeamOrPersonBase, INomenclaturalReference, String, HomotypicalGroup) |
|
| 523 |
* @see eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy |
|
| 524 |
*/ |
|
| 525 |
public static BotanicalName NewBotanicalInstance(Rank rank){
|
|
| 526 |
return new BotanicalName(rank, null); |
|
| 527 |
} |
|
| 528 |
/** |
|
| 529 |
* Creates a new botanical taxon name instance |
|
| 530 |
* only containing its {@link Rank rank},
|
|
| 531 |
* its {@link HomotypicalGroup homotypical group} and
|
|
| 532 |
* the {@link eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy default cache strategy}.
|
|
| 533 |
* The new botanical taxon name instance will be also added to the set of |
|
| 534 |
* botanical taxon names belonging to this homotypical group. |
|
| 535 |
* |
|
| 536 |
* @param rank the rank to be assigned to <i>this</i> botanical taxon name |
|
| 537 |
* @param homotypicalGroup the homotypical group to which <i>this</i> botanical taxon name belongs |
|
| 538 |
* @see #NewInstance(Rank) |
|
| 539 |
* @see #NewBotanicalInstance(Rank, String, String, String, String, TeamOrPersonBase, INomenclaturalReference, String, HomotypicalGroup) |
|
| 540 |
* @see #BotanicalName(Rank, HomotypicalGroup) |
|
| 541 |
* @see eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy |
|
| 542 |
*/ |
|
| 543 |
public static BotanicalName NewBotanicalInstance(Rank rank, HomotypicalGroup homotypicalGroup){
|
|
| 544 |
return new BotanicalName(rank, homotypicalGroup); |
|
| 545 |
} |
|
| 546 |
/** |
|
| 547 |
* Creates a new botanical taxon name instance |
|
| 548 |
* containing its {@link Rank rank},
|
|
| 549 |
* its {@link HomotypicalGroup homotypical group},
|
|
| 550 |
* its scientific name components, its {@link eu.etaxonomy.cdm.model.agent.TeamOrPersonBase author(team)},
|
|
| 551 |
* its {@link eu.etaxonomy.cdm.model.reference.INomenclaturalReference nomenclatural reference} and
|
|
| 552 |
* the {@link eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy default cache strategy}.
|
|
| 553 |
* The new botanical taxon name instance will be also added to the set of |
|
| 554 |
* botanical taxon names belonging to this homotypical group. |
|
| 555 |
* |
|
| 556 |
* @param rank the rank to be assigned to <i>this</i> botanical taxon name |
|
| 557 |
* @param genusOrUninomial the string for <i>this</i> botanical taxon name |
|
| 558 |
* if its rank is genus or higher or for the genus part |
|
| 559 |
* if its rank is lower than genus |
|
| 560 |
* @param infraGenericEpithet the string for the first epithet of |
|
| 561 |
* <i>this</i> botanical taxon name if its rank is lower than genus |
|
| 562 |
* and higher than species aggregate |
|
| 563 |
* @param specificEpithet the string for the first epithet of |
|
| 564 |
* <i>this</i> botanical taxon name if its rank is species aggregate or lower |
|
| 565 |
* @param infraSpecificEpithet the string for the second epithet of |
|
| 566 |
* <i>this</i> botanical taxon name if its rank is lower than species |
|
| 567 |
* @param combinationAuthorship the author or the team who published <i>this</i> botanical taxon name |
|
| 568 |
* @param nomenclaturalReference the nomenclatural reference where <i>this</i> botanical taxon name was published |
|
| 569 |
* @param nomenclMicroRef the string with the details for precise location within the nomenclatural reference |
|
| 570 |
* @param homotypicalGroup the homotypical group to which <i>this</i> botanical taxon name belongs |
|
| 571 |
* @see #NewInstance(Rank) |
|
| 572 |
* @see #NewInstance(Rank, HomotypicalGroup) |
|
| 573 |
* @see ZoologicalName#ZoologicalName(Rank, String, String, String, String, TeamOrPersonBase, INomenclaturalReference, String, HomotypicalGroup) |
|
| 574 |
* @see eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy |
|
| 575 |
*/ |
|
| 576 |
public static BotanicalName NewBotanicalInstance(Rank rank, String genusOrUninomial, String infraGenericEpithet, String specificEpithet, String infraSpecificEpithet, TeamOrPersonBase combinationAuthorship, INomenclaturalReference nomenclaturalReference, String nomenclMicroRef, HomotypicalGroup homotypicalGroup) {
|
|
| 577 |
return new BotanicalName(rank, genusOrUninomial, infraGenericEpithet, specificEpithet, infraSpecificEpithet, combinationAuthorship, nomenclaturalReference, nomenclMicroRef, homotypicalGroup); |
|
| 578 |
} |
|
| 579 |
|
|
| 512 |
//see TaxonNameFactory |
|
| 580 | 513 |
|
| 581 | 514 |
// *********************** PARSER STATIC *******************************/ |
| 582 | 515 |
|
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java | ||
|---|---|---|
| 98 | 98 |
boolean isCultivatedPlantName = false; |
| 99 | 99 |
if ( (isBotanicalName || isCultivatedPlantName) && ! isZoologicalName && !isBacteriologicalName){
|
| 100 | 100 |
if (isBotanicalName){
|
| 101 |
result = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 101 |
result = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 102 | 102 |
}else{
|
| 103 | 103 |
result = TaxonNameFactory.NewCultivarInstance(rank); |
| 104 | 104 |
} |
| ... | ... | |
| 112 | 112 |
} else {
|
| 113 | 113 |
switch (code) {
|
| 114 | 114 |
case ICNAFP: |
| 115 |
result = TaxonNameBase.NewBotanicalInstance(rank);
|
|
| 115 |
result = TaxonNameFactory.NewBotanicalInstance(rank);
|
|
| 116 | 116 |
break; |
| 117 | 117 |
case ICZN: |
| 118 | 118 |
result = TaxonNameFactory.NewZoologicalInstance(rank); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java | ||
|---|---|---|
| 55 | 55 |
|
| 56 | 56 |
@Test |
| 57 | 57 |
public void testPropertyChangeBoolean() {
|
| 58 |
BotanicalName b = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 58 |
BotanicalName b = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 59 | 59 |
b.addPropertyChangeListener(this); |
| 60 | 60 |
b.setAnamorphic(true); |
| 61 | 61 |
assertEquals(b.isAnamorphic(), lastPropValue); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.model.description.TextData; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| ... | ... | |
| 44 | 44 |
citationRef.setTitleCache("Sp. lunarum", true);
|
| 45 | 45 |
|
| 46 | 46 |
//genus taxon with Name, combinationAuthor, |
| 47 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 47 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 48 | 48 |
botName.setTitleCache("Hieracium L.", true);
|
| 49 | 49 |
botName.setGenusOrUninomial("Hieracium");
|
| 50 | 50 |
botName.setCombinationAuthorship(Person.NewInstance()); |
| ... | ... | |
| 52 | 52 |
Taxon genusTaxon = Taxon.NewInstance(botName, sec); |
| 53 | 53 |
|
| 54 | 54 |
//a name that is the basionym of genusTaxon's name |
| 55 |
BotanicalName basionym = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 55 |
BotanicalName basionym = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 56 | 56 |
basionym.setTitleCache("Hieracilla DC.", true);
|
| 57 | 57 |
basionym.setGenusOrUninomial("Hieracilla");
|
| 58 | 58 |
basionym.setCombinationAuthorship(deCandolle); |
| 59 | 59 |
botName.addBasionym(basionym, null, null, "216"); |
| 60 | 60 |
|
| 61 | 61 |
//species taxon that is the child of genus taxon |
| 62 |
BotanicalName botSpecies = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 62 |
BotanicalName botSpecies = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 63 | 63 |
botSpecies.setTitleCache("Hieracium asturianum Pau", true);
|
| 64 | 64 |
botSpecies.setGenusOrUninomial("Hieracium");
|
| 65 | 65 |
botSpecies.setSpecificEpithet("asturianum");
|
| ... | ... | |
| 68 | 68 |
Taxon childTaxon = Taxon.NewInstance(botSpecies, sec); |
| 69 | 69 |
|
| 70 | 70 |
//homotypic synonym of childTaxon1 |
| 71 |
BotanicalName botSpecies4= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 71 |
BotanicalName botSpecies4= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 72 | 72 |
botSpecies4.setTitleCache("Hieracium gueri DC.", true);
|
| 73 | 73 |
botSpecies4.setGenusOrUninomial("Hieracium");
|
| 74 | 74 |
botSpecies4.setSpecificEpithet("gueri");
|
| ... | ... | |
| 78 | 78 |
|
| 79 | 79 |
|
| 80 | 80 |
//2nd child species taxon that is the child of genus taxon |
| 81 |
BotanicalName botSpecies2= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 81 |
BotanicalName botSpecies2= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 82 | 82 |
botSpecies2.setTitleCache("Hieracium wolffii Zahn", true);
|
| 83 | 83 |
botSpecies2.setGenusOrUninomial("Hieracium");
|
| 84 | 84 |
botSpecies2.setSpecificEpithet("wolffii");
|
| ... | ... | |
| 87 | 87 |
Taxon childTaxon2 = Taxon.NewInstance(botSpecies2, sec); |
| 88 | 88 |
|
| 89 | 89 |
//heterotypic synonym of childTaxon2 |
| 90 |
BotanicalName botSpecies3= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 90 |
BotanicalName botSpecies3= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 91 | 91 |
botSpecies3.setTitleCache("Hieracium lupium DC.", true);
|
| 92 | 92 |
botSpecies3.setGenusOrUninomial("Hieracium");
|
| 93 | 93 |
botSpecies3.setSpecificEpithet("lupium");
|
| ... | ... | |
| 96 | 96 |
childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF()); |
| 97 | 97 |
|
| 98 | 98 |
//missaplied Name for childTaxon2 |
| 99 |
BotanicalName missName= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 99 |
BotanicalName missName= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 100 | 100 |
missName.setTitleCache("Hieracium lupium DC.", true);
|
| 101 | 101 |
missName.setGenusOrUninomial("Hieracium");
|
| 102 | 102 |
missName.setSpecificEpithet("lupium");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java | ||
|---|---|---|
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 21 | 21 |
//import eu.etaxonomy.cdm.model.reference.Journal; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.reference.IJournal; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| ... | ... | |
| 39 | 39 |
public static Integer insertTaxon(String speciesname){
|
| 40 | 40 |
logger.info("Populate database with a taxon");
|
| 41 | 41 |
IJournal sec = ReferenceFactory.newJournal(); |
| 42 |
INonViralName nvName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 42 |
INonViralName nvName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 43 | 43 |
Taxon tax = Taxon.NewInstance(nvName, (Reference)sec); |
| 44 | 44 |
nvName.setNameCache(speciesname); |
| 45 | 45 |
nvName.setTitleCache(speciesname, true); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
import eu.etaxonomy.cdm.model.agent.Person; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 29 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 29 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 30 | 30 |
import eu.etaxonomy.cdm.test.unit.EntityTestBase; |
| 31 | 31 |
|
| 32 | 32 |
/** |
| ... | ... | |
| 69 | 69 |
commentator.setTitleCache("automatic importer", true);
|
| 70 | 70 |
annotation1 = Annotation.NewInstance("anno1", Language.DEFAULT());
|
| 71 | 71 |
annotation1.setCommentator(commentator); |
| 72 |
annotatedObject = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 72 |
annotatedObject = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 73 | 73 |
annotatedObject.addAnnotation(annotation1); |
| 74 | 74 |
linkbackUri = new URI("http://www.abc.de");
|
| 75 | 75 |
annotation1.setLinkbackUri(linkbackUri); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java | ||
|---|---|---|
| 198 | 198 |
assertEquals(compareResult, equalsResult); |
| 199 | 199 |
|
| 200 | 200 |
//Abies alba x Pinus beta < Abies alba xinus |
| 201 |
BotanicalName abiesAlbaXinus = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 201 |
BotanicalName abiesAlbaXinus = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 202 | 202 |
abiesAlbaXinus.setGenusOrUninomial("Abies");
|
| 203 | 203 |
abiesAlbaXinus.setSpecificEpithet("alba");
|
| 204 | 204 |
abiesAlbaXinus.setInfraSpecificEpithet("xinus");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTest.java | ||
|---|---|---|
| 24 | 24 |
import org.junit.Test; |
| 25 | 25 |
|
| 26 | 26 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 28 | 28 |
import eu.etaxonomy.cdm.test.unit.EntityTestBase; |
| 29 | 29 |
|
| 30 | 30 |
/** |
| ... | ... | |
| 63 | 63 |
flag1 = true; |
| 64 | 64 |
markerType1 = MarkerType.TO_BE_CHECKED(); |
| 65 | 65 |
marker1 = Marker.NewInstance(markerType1 , flag1); |
| 66 |
annotatedObject1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 66 |
annotatedObject1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 67 | 67 |
annotatedObject1.addMarker(marker1); |
| 68 | 68 |
} |
| 69 | 69 |
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/DescriptionElementTest.java | ||
|---|---|---|
| 31 | 31 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.media.Media; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 34 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 34 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 35 | 35 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 36 | 36 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 37 | 37 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 96 | 96 |
statisticalValue.setValue((float) 23.8); |
| 97 | 97 |
|
| 98 | 98 |
quantData.addStatisticalValue(statisticalValue); |
| 99 |
taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(), "Abies", null, "alba", null, null, null, null, null), null);
|
|
| 99 |
taxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES(), "Abies", null, "alba", null, null, null, null, null), null);
|
|
| 100 | 100 |
taxonInteraction = TaxonInteraction.NewInstance(); |
| 101 | 101 |
taxonInteraction.setTaxon2(taxon); |
| 102 | 102 |
langString = LanguageString.NewInstance("TestTaxonInteraction", Language.ENGLISH());
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java | ||
|---|---|---|
| 68 | 68 |
@Test |
| 69 | 69 |
public final void testBotanicalNameRank() {
|
| 70 | 70 |
Rank genus = Rank.GENUS(); |
| 71 |
BotanicalName rankName = TaxonNameBase.NewBotanicalInstance(genus);
|
|
| 71 |
BotanicalName rankName = TaxonNameFactory.NewBotanicalInstance(genus);
|
|
| 72 | 72 |
assertNotNull(rankName); |
| 73 | 73 |
assertSame(genus, rankName.getRank()); |
| 74 | 74 |
assertTrue(rankName.getRank().isGenus()); |
| 75 |
BotanicalName nullRankName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 75 |
BotanicalName nullRankName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 76 | 76 |
assertNotNull(nullRankName); |
| 77 | 77 |
assertNull(nullRankName.getRank()); |
| 78 | 78 |
} |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java | ||
|---|---|---|
| 59 | 59 |
*/ |
| 60 | 60 |
@Before |
| 61 | 61 |
public void setUp() throws Exception {
|
| 62 |
name1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 63 |
name2 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 64 |
name3 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 65 |
name4 = TaxonNameBase.NewBotanicalInstance(Rank.VARIETY());
|
|
| 62 |
name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 63 |
name2 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 64 |
name3 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 65 |
name4 = TaxonNameFactory.NewBotanicalInstance(Rank.VARIETY());
|
|
| 66 | 66 |
} |
| 67 | 67 |
|
| 68 | 68 |
/** |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java | ||
|---|---|---|
| 283 | 283 |
NonViralName<?> nonViralName1 = new NonViralName(); |
| 284 | 284 |
assertEquals(0, nonViralName1.getHybridParentRelations().size()); |
| 285 | 285 |
assertEquals(0, nonViralName1.getHybridChildRelations().size()); |
| 286 |
BotanicalName femaleParent = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 286 |
BotanicalName femaleParent = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 287 | 287 |
HybridRelationship hybridRelationship = new HybridRelationship(nonViralName1, femaleParent, HybridRelationshipType.FEMALE_PARENT(), null ); |
| 288 | 288 |
assertEquals(1, nonViralName1.getHybridChildRelations().size()); |
| 289 | 289 |
assertEquals(hybridRelationship, nonViralName1.getHybridChildRelations().iterator().next()); |
| ... | ... | |
| 295 | 295 |
NonViralName<?> nonViralName1 = new NonViralName(); |
| 296 | 296 |
assertEquals(0, nonViralName1.getHybridParentRelations().size()); |
| 297 | 297 |
assertEquals(0, nonViralName1.getHybridChildRelations().size()); |
| 298 |
BotanicalName femaleParent = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 299 |
BotanicalName maleParent = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 298 |
BotanicalName femaleParent = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 299 |
BotanicalName maleParent = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 300 | 300 |
|
| 301 | 301 |
nonViralName1.addHybridParent(femaleParent, HybridRelationshipType.MALE_PARENT(), null); |
| 302 | 302 |
nonViralName1.addHybridParent(maleParent, HybridRelationshipType.MALE_PARENT(), null); |
| ... | ... | |
| 324 | 324 |
NonViralName<?> botanicalName1 = new NonViralName(); |
| 325 | 325 |
assertEquals(0, botanicalName1.getHybridParentRelations().size()); |
| 326 | 326 |
assertEquals(0, botanicalName1.getHybridChildRelations().size()); |
| 327 |
BotanicalName femaleParent = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 327 |
BotanicalName femaleParent = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 328 | 328 |
NonViralName<?> maleParent = TaxonNameFactory.NewNonViralInstance(null); |
| 329 | 329 |
ZoologicalName child = TaxonNameFactory.NewZoologicalInstance(null); |
| 330 | 330 |
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java | ||
|---|---|---|
| 259 | 259 |
*/ |
| 260 | 260 |
@Test |
| 261 | 261 |
public void testGetBasionym() {
|
| 262 |
TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 263 |
TaxonNameBase basionym1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 264 |
TaxonNameBase basionym2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 262 |
TaxonNameBase name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 263 |
TaxonNameBase basionym1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 264 |
TaxonNameBase basionym2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 265 | 265 |
|
| 266 | 266 |
assertEquals(null, name1.getBasionym()); |
| 267 | 267 |
name1.addBasionym(basionym1); |
| ... | ... | |
| 316 | 316 |
*/ |
| 317 | 317 |
@Test |
| 318 | 318 |
public void testGetRank() {
|
| 319 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 319 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 320 | 320 |
assertNull("Rank shall be null", name1.getRank());
|
| 321 | 321 |
name1.setRank(Rank.SPECIES()); |
| 322 | 322 |
assertNotNull("Rank shall not be null", name1.getRank());
|
| ... | ... | |
| 342 | 342 |
*/ |
| 343 | 343 |
@Test |
| 344 | 344 |
public void testGetAppendedPhrase() {
|
| 345 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 345 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 346 | 346 |
String appPhrase = "appPhrase"; |
| 347 | 347 |
assertNull(name1.getAppendedPhrase()); |
| 348 | 348 |
name1.setAppendedPhrase(appPhrase); |
| ... | ... | |
| 356 | 356 |
*/ |
| 357 | 357 |
@Test |
| 358 | 358 |
public void testGetSetNomenclaturalMicroReference() {
|
| 359 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 359 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 360 | 360 |
String microRef = "micro"; |
| 361 | 361 |
assertNull(name1.getNomenclaturalMicroReference()); |
| 362 | 362 |
name1.setNomenclaturalMicroReference(microRef); |
| ... | ... | |
| 370 | 370 |
*/ |
| 371 | 371 |
@Test |
| 372 | 372 |
public void testGetSetHasProblem() {
|
| 373 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 373 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 374 | 374 |
name1.setParsingProblem(0); |
| 375 | 375 |
assertFalse(name1.hasProblem()); |
| 376 | 376 |
name1.setParsingProblem(1); |
| ... | ... | |
| 551 | 551 |
|
| 552 | 552 |
@Test |
| 553 | 553 |
public void testMergeHomotypicGroups() {
|
| 554 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 555 |
TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 556 |
TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 557 |
TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 554 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 555 |
TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 556 |
TaxonNameBase<?,?> name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 557 |
TaxonNameBase<?,?> name4 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 558 | 558 |
|
| 559 | 559 |
assertFalse(name1.getHomotypicalGroup().equals(name2.getHomotypicalGroup())); |
| 560 | 560 |
int numberOfTypifiedNames = name1.getHomotypicalGroup().getTypifiedNames().size(); |
| ... | ... | |
| 592 | 592 |
|
| 593 | 593 |
@Test |
| 594 | 594 |
public void testIsBasionymFor() {
|
| 595 |
TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 596 |
TaxonNameBase name2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 597 |
TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 598 |
TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 595 |
TaxonNameBase name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 596 |
TaxonNameBase name2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 597 |
TaxonNameBase<?,?> name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 598 |
TaxonNameBase<?,?> name4 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 599 | 599 |
|
| 600 | 600 |
assertFalse(name2.isBasionymFor(name1)); |
| 601 | 601 |
assertFalse(name1.isBasionymFor(name2)); |
| ... | ... | |
| 609 | 609 |
*/ |
| 610 | 610 |
@Test |
| 611 | 611 |
public void testIsHomotypic() {
|
| 612 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 613 |
TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 614 |
TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 615 |
TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 612 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 613 |
TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 614 |
TaxonNameBase<?,?> name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 615 |
TaxonNameBase<?,?> name4 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 616 | 616 |
name1.mergeHomotypicGroups(name2); |
| 617 | 617 |
name2.mergeHomotypicGroups(name4); |
| 618 | 618 |
|
| ... | ... | |
| 626 | 626 |
|
| 627 | 627 |
@Test |
| 628 | 628 |
public void testMakeGroupsBasionym(){
|
| 629 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 630 |
TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 631 |
TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 632 |
TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 629 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 630 |
TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 631 |
TaxonNameBase<?,?> name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 632 |
TaxonNameBase<?,?> name4 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 633 | 633 |
|
| 634 | 634 |
name1.mergeHomotypicGroups(name2); |
| 635 | 635 |
name1.mergeHomotypicGroups(name3); |
| ... | ... | |
| 646 | 646 |
|
| 647 | 647 |
@Test |
| 648 | 648 |
public void testIsGroupsBasionym(){
|
| 649 |
TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 650 |
TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 651 |
TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 652 |
TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 649 |
TaxonNameBase<?,?> name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 650 |
TaxonNameBase<?,?> name2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 651 |
TaxonNameBase<?,?> name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 652 |
TaxonNameBase<?,?> name4 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 653 | 653 |
|
| 654 | 654 |
assertFalse(name1.isGroupsBasionym()); |
| 655 | 655 |
|
| ... | ... | |
| 668 | 668 |
|
| 669 | 669 |
@Test |
| 670 | 670 |
public void testRemoveBasionyms(){
|
| 671 |
TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 672 |
TaxonNameBase basionym = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 673 |
TaxonNameBase name3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 671 |
TaxonNameBase name1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 672 |
TaxonNameBase basionym = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 673 |
TaxonNameBase name3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 674 | 674 |
|
| 675 | 675 |
name1.addBasionym(basionym); |
| 676 | 676 |
assertEquals(1, name1.getBasionyms().size()); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java | ||
|---|---|---|
| 44 | 44 |
import eu.etaxonomy.cdm.model.media.Media; |
| 45 | 45 |
import eu.etaxonomy.cdm.model.media.Rights; |
| 46 | 46 |
import eu.etaxonomy.cdm.model.molecular.DnaSample; |
| 47 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
|
| 48 | 47 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 49 | 48 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 50 | 49 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 50 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 51 | 51 |
|
| 52 | 52 |
/** |
| 53 | 53 |
* @author a.mueller |
| ... | ... | |
| 239 | 239 |
PreservationMethod preservation = PreservationMethod.NewInstance(); |
| 240 | 240 |
boolean protectedTitleCache = true; |
| 241 | 241 |
DefinedTerm sex = DefinedTerm.SEX_FEMALE(); |
| 242 |
TaxonNameBase<?, ?> storedUnder = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 242 |
TaxonNameBase<?, ?> storedUnder = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 243 | 243 |
String titleCache = "title"; |
| 244 | 244 |
Calendar updated = Calendar.getInstance(); |
| 245 | 245 |
Person updatedBy = Person.NewTitledInstance("updatedPerson");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/ClassificationTest.java | ||
|---|---|---|
| 99 | 99 |
treeName1 = "Greuther, 1993"; |
| 100 | 100 |
//refFactory = ReferenceFactory.newInstance(); |
| 101 | 101 |
classification1 = Classification.NewInstance(treeName1); |
| 102 |
taxonName12 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 103 |
taxonName121 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 104 |
taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 102 |
taxonName12 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 103 |
taxonName121 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 104 |
taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 105 | 105 |
taxonName2 = TaxonNameFactory.NewZoologicalInstance(Rank.GENUS()); |
| 106 |
taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 106 |
taxonName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 107 | 107 |
ref1 = ReferenceFactory.newJournal(); |
| 108 | 108 |
ref2 = ReferenceFactory.newJournal(); |
| 109 | 109 |
ref3 = ReferenceFactory.newJournal(); |
| ... | ... | |
| 130 | 130 |
*/ |
| 131 | 131 |
@Test |
| 132 | 132 |
public void testAddRoot() {
|
| 133 |
TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 133 |
TaxonNameBase<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 134 | 134 |
Synonym synonym = Synonym.NewInstance(synonymName, ref1); |
| 135 | 135 |
TaxonNode taxonNode1 = classification1.addChildTaxon(taxon1, null, null); |
| 136 | 136 |
taxonNode1.setSynonymToBeUsed(synonym); |
| ... | ... | |
| 231 | 231 |
@Test |
| 232 | 232 |
public void testAddParentChild() {
|
| 233 | 233 |
|
| 234 |
TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 234 |
TaxonNameBase<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 235 | 235 |
Synonym synonym = Synonym.NewInstance(synonymName, ref1); |
| 236 | 236 |
TaxonNode rootNode = classification1.addChildTaxon(taxon1, null, null); |
| 237 | 237 |
rootNode.setSynonymToBeUsed(synonym); |
| ... | ... | |
| 347 | 347 |
//genericDao.getCdmBasesByFieldAndClass(clazz, field.getName(), value); |
| 348 | 348 |
|
| 349 | 349 |
|
| 350 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 350 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 351 | 351 |
name.setTitleCache("A dummy name", true);
|
| 352 | 352 |
result.add(name); |
| 353 | 353 |
Reference ref = ReferenceFactory.newBook(); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java | ||
|---|---|---|
| 29 | 29 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 33 | 33 |
//import eu.etaxonomy.cdm.model.reference.Book; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 88 | 88 |
ref2.setDatePublished(TimePeriod.NewInstance(cal2)); |
| 89 | 89 |
ref3.setDatePublished(TimePeriod.NewInstance(cal3)); |
| 90 | 90 |
|
| 91 |
botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 92 |
botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 93 |
botName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 94 |
botName4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 95 |
botName5 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 91 |
botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 92 |
botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 93 |
botName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 94 |
botName4 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 95 |
botName5 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 96 | 96 |
|
| 97 | 97 |
setNameParts(botName1, "Aaa", "aaa"); |
| 98 | 98 |
setNameParts(botName2, "Bbb", "bbb"); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java | ||
|---|---|---|
| 62 | 62 |
sec.setTitleCache("Schoenes saftiges Allg�u", true);
|
| 63 | 63 |
name1 = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES(),"Panthera",null,"onca",null,null,null,"p.1467", null); |
| 64 | 64 |
HomotypicalGroup homotypicalGroup = HomotypicalGroup.NewInstance(); |
| 65 |
name2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(),"Abies",null,"alba",null,null,null,"p.317", homotypicalGroup);
|
|
| 65 |
name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES(),"Abies",null,"alba",null,null,null,"p.317", homotypicalGroup);
|
|
| 66 | 66 |
// taxa |
| 67 | 67 |
taxon1 = Taxon.NewInstance(name1,sec); |
| 68 | 68 |
synonym1 = Synonym.NewInstance(name2,sec); |
| ... | ... | |
| 145 | 145 |
|
| 146 | 146 |
public final void testClone(){
|
| 147 | 147 |
|
| 148 |
BotanicalName test = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 148 |
BotanicalName test = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 149 | 149 |
String genus = "test"; |
| 150 | 150 |
String infraGenericEpithet = "test"; |
| 151 | 151 |
test.setGenusOrUninomial(genus); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java | ||
|---|---|---|
| 67 | 67 |
// ref2.setDatePublished(TimePeriod.NewInstance(cal2)); |
| 68 | 68 |
ref3.setDatePublished(TimePeriod.NewInstance(cal3)); |
| 69 | 69 |
|
| 70 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 71 |
BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 72 |
BotanicalName botName3 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 70 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 71 |
BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 72 |
BotanicalName botName3 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 73 | 73 |
ZoologicalName zooName1 = TaxonNameFactory.NewZoologicalInstance(null); |
| 74 | 74 |
|
| 75 | 75 |
botName1.setNomenclaturalReference(ref1); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeByNameComparatorTest.java | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 22 | 22 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 24 | 24 |
|
| ... | ... | |
| 43 | 43 |
|
| 44 | 44 |
Reference sec = ReferenceFactory.newBook(); |
| 45 | 45 |
|
| 46 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 46 |
BotanicalName botname_1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 47 | 47 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
| 48 | 48 |
botname_1.setNameCache(nameCache_1, true); |
| 49 | 49 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
| 50 | 50 |
|
| 51 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 51 |
BotanicalName botname_2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 52 | 52 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
| 53 | 53 |
botname_2.setNameCache(nameCache_2, true); |
| 54 | 54 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
| 55 | 55 |
|
| 56 |
BotanicalName botname_3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 56 |
BotanicalName botname_3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 57 | 57 |
String nameCache_3 = "Epilobium lamyi"; |
| 58 | 58 |
botname_3.setNameCache(nameCache_3, true); |
| 59 | 59 |
Taxon taxon_3 = Taxon.NewInstance(botname_3, sec); |
| 60 | 60 |
|
| 61 |
BotanicalName botname_4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 61 |
BotanicalName botname_4 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 62 | 62 |
String nameCache_4 = "Epilobium tournefortii"; |
| 63 | 63 |
botname_4.setNameCache(nameCache_4, true); |
| 64 | 64 |
Taxon taxon_4 = Taxon.NewInstance(botname_4, sec); |
| ... | ... | |
| 111 | 111 |
|
| 112 | 112 |
Reference sec = ReferenceFactory.newBook(); |
| 113 | 113 |
|
| 114 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 114 |
BotanicalName botname_1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 115 | 115 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
| 116 | 116 |
botname_1.setNameCache(nameCache_1, true); |
| 117 | 117 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
| 118 | 118 |
|
| 119 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 119 |
BotanicalName botname_2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 120 | 120 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
| 121 | 121 |
botname_2.setNameCache(nameCache_2, true); |
| 122 | 122 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
| ... | ... | |
| 150 | 150 |
|
| 151 | 151 |
Reference sec = ReferenceFactory.newBook(); |
| 152 | 152 |
|
| 153 |
BotanicalName botname_1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 153 |
BotanicalName botname_1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 154 | 154 |
String nameCache_1 = "Epilobium \u00D7aschersonianum Hausskn."; |
| 155 | 155 |
botname_1.setNameCache(nameCache_1, true); |
| 156 | 156 |
Taxon taxon_1 = Taxon.NewInstance(botname_1, sec); |
| 157 | 157 |
|
| 158 |
BotanicalName botname_2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 158 |
BotanicalName botname_2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 159 | 159 |
String nameCache_2 = "\u00D7Epilobium \u00D7angustifolium"; |
| 160 | 160 |
botname_2.setNameCache(nameCache_2, true); |
| 161 | 161 |
Taxon taxon_2 = Taxon.NewInstance(botname_2, sec); |
| 162 | 162 |
|
| 163 |
BotanicalName botname_3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 163 |
BotanicalName botname_3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 164 | 164 |
String nameCache_3 = "Epilobium lamyi"; |
| 165 | 165 |
botname_3.setNameCache(nameCache_3, true); |
| 166 | 166 |
Taxon taxon_3 = Taxon.NewInstance(botname_3, sec); |
| 167 | 167 |
|
| 168 |
BotanicalName botname_4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 168 |
BotanicalName botname_4 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 169 | 169 |
String nameCache_4 = "Epilobium tournefortii"; |
| 170 | 170 |
botname_4.setNameCache(nameCache_4, true); |
| 171 | 171 |
Taxon taxon_4 = Taxon.NewInstance(botname_4, sec); |
| 172 | 172 |
|
| 173 |
BotanicalName botname_5 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 173 |
BotanicalName botname_5 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 174 | 174 |
String nameCache_5= "Epilobium hirsutum L."; |
| 175 | 175 |
botname_5.setNameCache(nameCache_5, true); |
| 176 | 176 |
Taxon taxon_5 = Taxon.NewInstance(botname_5, sec); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeTest.java | ||
|---|---|---|
| 29 | 29 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 32 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 32 | 33 |
//import eu.etaxonomy.cdm.model.reference.Book; |
| 33 | 34 |
//import eu.etaxonomy.cdm.model.reference.Journal; |
| 34 | 35 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| ... | ... | |
| 77 | 78 |
viewName1 = "Greuther, 1993"; |
| 78 | 79 |
classification1 = Classification.NewInstance(viewName1); |
| 79 | 80 |
classification2 = Classification.NewInstance("Test View 2");
|
| 80 |
taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 81 |
taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 82 |
taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 81 |
taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 82 |
taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
|
|
| 83 |
taxonName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 83 | 84 |
ref1 = ReferenceFactory.newJournal(); |
| 84 | 85 |
ref2 = ReferenceFactory.newBook(); |
| 85 | 86 |
ref3 = ReferenceFactory.newGeneric(); |
| ... | ... | |
| 315 | 316 |
assertEquals("Number of all nodes should be 2", 2, allNodes.size());
|
| 316 | 317 |
assertTrue("Taxonomic view should include child", allNodes.contains(child));
|
| 317 | 318 |
} |
| 318 |
|
|
| 319 | 319 |
|
| 320 |
|
|
| 320 |
|
|
| 321 |
|
|
| 321 | 322 |
@Test |
| 322 | 323 |
public void testGetAncestors(){
|
| 323 | 324 |
/* |
| ... | ... | |
| 327 | 328 |
* `- Pinus pampa subsp. persicifolia |
| 328 | 329 |
*/ |
| 329 | 330 |
Classification classification = Classification.NewInstance("Classification");
|
| 330 |
BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 331 |
BotanicalName pinusName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 331 | 332 |
pinusName.setGenusOrUninomial("Pinus");
|
| 332 | 333 |
Taxon pinus = Taxon.NewInstance(pinusName, null); |
| 333 |
BotanicalName pinusPampaName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 334 |
BotanicalName pinusPampaName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 334 | 335 |
pinusPampaName.setGenusOrUninomial("Pinus");
|
| 335 | 336 |
pinusPampaName.setSpecificEpithet("pampa");
|
| 336 | 337 |
Taxon pinusPampa = Taxon.NewInstance(pinusPampaName, null); |
| 337 |
BotanicalName pinusPampaSubName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 338 |
BotanicalName pinusPampaSubName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 338 | 339 |
pinusPampaSubName.setGenusOrUninomial("Pinus");
|
| 339 | 340 |
pinusPampaSubName.setSpecificEpithet("pampa");
|
| 340 | 341 |
pinusPampaSubName.setInfraSpecificEpithet("persicifolia");
|
| ... | ... | |
| 344 | 345 |
TaxonNode pinusPampaNode = classification.addParentChild(pinus, pinusPampa, null, null); |
| 345 | 346 |
TaxonNode pinusPampaSubNode = classification.addParentChild(pinusPampa, pinusPampaSub, null, null); |
| 346 | 347 |
TaxonNode rootNode = classification.getRootNode(); |
| 347 |
|
|
| 348 |
|
|
| 348 | 349 |
Set<TaxonNode> ancestors = pinusPampaSubNode.getAncestors(); |
| 349 | 350 |
assertEquals(3, ancestors.size()); |
| 350 | 351 |
assertTrue(ancestors.contains(pinusPampaNode)); |
| 351 | 352 |
assertTrue(ancestors.contains(pinusNode)); |
| 352 | 353 |
assertTrue(ancestors.contains(rootNode)); |
| 353 |
|
|
| 354 |
|
|
| 354 | 355 |
Set<TaxonNode> rootAncestors = rootNode.getAncestors(); |
| 355 | 356 |
assertTrue(rootAncestors.isEmpty()); |
| 356 |
|
|
| 357 |
|
|
| 357 | 358 |
} |
| 358 | 359 |
|
| 359 | 360 |
@Test |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java | ||
|---|---|---|
| 73 | 73 |
misSec.setTitleCache("Stupid book", true);
|
| 74 | 74 |
|
| 75 | 75 |
name1 = TaxonNameFactory.NewZoologicalInstance(Rank.SPECIES(),"Panthera",null,"onca",null,linne,null,"p.1467", null); |
| 76 |
name2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(),"Abies",null,"alba",null,linne,null,"p.317", null);
|
|
| 77 |
name3 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES(),"Polygala",null,"vulgaris","alpina",linne,null,"p.191", null);
|
|
| 78 |
name4 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(),"Cichoria",null,"carminata",null,linne,null,"p.14", null);
|
|
| 76 |
name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES(),"Abies",null,"alba",null,linne,null,"p.317", null);
|
|
| 77 |
name3 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES(),"Polygala",null,"vulgaris","alpina",linne,null,"p.191", null);
|
|
| 78 |
name4 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES(),"Cichoria",null,"carminata",null,linne,null,"p.14", null);
|
|
| 79 | 79 |
rootT = Taxon.NewInstance(name1,sec); |
| 80 | 80 |
freeT = Taxon.NewInstance(name4,sec); |
| 81 | 81 |
// taxonomic children |
| ... | ... | |
| 187 | 187 |
|
| 188 | 188 |
@Test |
| 189 | 189 |
public void testAddHomotypicSynonymName(){
|
| 190 |
TaxonNameBase<?,?> taxonName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 190 |
TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 191 | 191 |
Taxon taxon = Taxon.NewInstance(taxonName, null); |
| 192 |
TaxonNameBase<?,?> synonymName1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 192 |
TaxonNameBase<?,?> synonymName1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 193 | 193 |
// add a synonym to the taxon |
| 194 | 194 |
Synonym synonym1 = taxon.addHomotypicSynonymName(synonymName1); |
| 195 | 195 |
// get the homotypic group of that synonym |
| ... | ... | |
| 200 | 200 |
} |
| 201 | 201 |
@Test |
| 202 | 202 |
public void testAddHomotypicSynonym(){
|
| 203 |
TaxonNameBase<?,?> taxonName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 203 |
TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 204 | 204 |
Taxon taxon = Taxon.NewInstance(taxonName, null); |
| 205 |
TaxonNameBase<?,?> synonymName1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 205 |
TaxonNameBase<?,?> synonymName1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 206 | 206 |
Synonym synonym = Synonym.NewInstance(synonymName1, null); |
| 207 | 207 |
// add a synonym to the taxon |
| 208 | 208 |
taxon.addHomotypicSynonym(synonym); |
| ... | ... | |
| 217 | 217 |
|
| 218 | 218 |
@Test |
| 219 | 219 |
public void testAddRemoveSynonymInSameGroup(){
|
| 220 |
TaxonNameBase<?,?> taxonName = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 220 |
TaxonNameBase<?,?> taxonName = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 221 | 221 |
Taxon taxon = Taxon.NewInstance(taxonName, null); |
| 222 |
TaxonNameBase<?,?> synonymName1 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 223 |
TaxonNameBase<?,?> synonymName2 = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 222 |
TaxonNameBase<?,?> synonymName1 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 223 |
TaxonNameBase<?,?> synonymName2 = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 224 | 224 |
|
| 225 | 225 |
// add a synonym to the taxon |
| 226 | 226 |
Synonym synonym1 = taxon.addHeterotypicSynonymName(synonymName1); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/description/TaxonDescriptionDefaultCacheStrategyTest.java | ||
|---|---|---|
| 17 | 17 |
import eu.etaxonomy.cdm.model.description.TaxonDescription; |
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 20 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 41 | 41 |
@Test |
| 42 | 42 |
public void testGetTitleCache(){
|
| 43 | 43 |
|
| 44 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 44 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 45 | 45 |
botName.setGenusOrUninomial("Genus");
|
| 46 | 46 |
botName.setSpecificEpithet("species");
|
| 47 | 47 |
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java | ||
|---|---|---|
| 31 | 31 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 32 | 32 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 33 | 33 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 34 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
| 34 | 35 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 35 | 36 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 36 | 37 |
|
| ... | ... | |
| 83 | 84 |
familyName = TaxonNameBase.PARSED_BOTANICAL(familyNameString, Rank.FAMILY()); |
| 84 | 85 |
genusName = TaxonNameBase.PARSED_BOTANICAL(genusNameString, Rank.GENUS()); |
| 85 | 86 |
|
| 86 |
subGenusName = TaxonNameBase.NewBotanicalInstance(Rank.SUBGENUS());
|
|
| 87 |
subGenusName = TaxonNameFactory.NewBotanicalInstance(Rank.SUBGENUS());
|
|
| 87 | 88 |
subGenusName.setGenusOrUninomial("Genus");
|
| 88 | 89 |
subGenusName.setInfraGenericEpithet("InfraGenericPart");
|
| 89 | 90 |
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java | ||
|---|---|---|
| 88 | 88 |
familyName = TaxonNameBase.PARSED_BOTANICAL(familyNameString, Rank.FAMILY()); |
| 89 | 89 |
genusName = TaxonNameBase.PARSED_BOTANICAL(genusNameString, Rank.GENUS()); |
| 90 | 90 |
|
| 91 |
subGenusName = TaxonNameBase.NewBotanicalInstance(Rank.SUBGENUS());
|
|
| 91 |
subGenusName = TaxonNameFactory.NewBotanicalInstance(Rank.SUBGENUS());
|
|
| 92 | 92 |
subGenusName.setGenusOrUninomial("Genus");
|
| 93 | 93 |
subGenusName.setInfraGenericEpithet("InfraGenericPart");
|
| 94 | 94 |
|
| ... | ... | |
| 132 | 132 |
|
| 133 | 133 |
@Test |
| 134 | 134 |
public void testGattungsAutonyme() {
|
| 135 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.SECTION_BOTANY());
|
|
| 135 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.SECTION_BOTANY());
|
|
| 136 | 136 |
String strTaraxacum = "Traxacum"; |
| 137 | 137 |
botName.setGenusOrUninomial(strTaraxacum); |
| 138 | 138 |
botName.setInfraGenericEpithet(strTaraxacum); |
| ... | ... | |
| 154 | 154 |
assertEquals("Species Name should be Any species", "Any species", speciesName.getNameCache());
|
| 155 | 155 |
assertEquals("Species Name should be Any species", "Any species", speciesName.getTitleCache());
|
| 156 | 156 |
assertEquals("subSpeciesNameString should be correct", subSpeciesNameString, subSpeciesName.getNameCache());
|
| 157 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.VARIETY());
|
|
| 157 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.VARIETY());
|
|
| 158 | 158 |
botName.setGenusOrUninomial("Lepidocaryum");
|
| 159 | 159 |
botName.setSpecificEpithet("tenue");
|
| 160 | 160 |
botName.setInfraSpecificEpithet("tenue");
|
| 161 | 161 |
assertEquals("", "Lepidocaryum tenue var. tenue", botName.getNameCache());
|
| 162 |
BotanicalName specName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 162 |
BotanicalName specName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 163 | 163 |
specName.setGenusOrUninomial("Genus");
|
| 164 | 164 |
specName.setSpecificEpithet("");
|
| 165 | 165 |
assertEquals("Empty species string must not result in trailing whitespace", "Genus", specName.getNameCache());
|
| 166 | 166 |
|
| 167 | 167 |
//unranked taxa |
| 168 | 168 |
String unrankedCache; |
| 169 |
BotanicalName unrankedName = TaxonNameBase.NewBotanicalInstance(Rank.INFRASPECIFICTAXON());
|
|
| 169 |
BotanicalName unrankedName = TaxonNameFactory.NewBotanicalInstance(Rank.INFRASPECIFICTAXON());
|
|
| 170 | 170 |
unrankedName.setGenusOrUninomial("Genus");
|
| 171 | 171 |
NonViralNameDefaultCacheStrategy<BotanicalName> strategy = NonViralNameDefaultCacheStrategy.NewInstance(); |
| 172 | 172 |
//infraspecific |
| ... | ... | |
| 185 | 185 |
Assert.assertEquals("Correct unranked cache expected", "Genus [unranked] Infrageneric", unrankedCache);
|
| 186 | 186 |
|
| 187 | 187 |
//bot. specific ranks |
| 188 |
botName = TaxonNameBase.NewBotanicalInstance(Rank.SECTION_BOTANY());
|
|
| 188 |
botName = TaxonNameFactory.NewBotanicalInstance(Rank.SECTION_BOTANY());
|
|
| 189 | 189 |
botName.setGenusOrUninomial("Genus");
|
| 190 | 190 |
botName.setInfraGenericEpithet("Infragenus");
|
| 191 | 191 |
Assert.assertEquals("", "Genus sect. Infragenus", botName.getNameCache());
|
| ... | ... | |
| 210 | 210 |
speciesName.setInfraGenericEpithet("Infraabies");
|
| 211 | 211 |
assertEquals("Species Name should be Abies (Infraabies) alba", "Abies (Infraabies) alba", speciesName.getNameCache());
|
| 212 | 212 |
|
| 213 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.VARIETY());
|
|
| 213 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.VARIETY());
|
|
| 214 | 214 |
botName.setGenusOrUninomial("Lepidocaryum");
|
| 215 | 215 |
botName.setInfraGenericEpithet("Infralepi");
|
| 216 | 216 |
botName.setSpecificEpithet("tenue");
|
| ... | ... | |
| 584 | 584 |
*/ |
| 585 | 585 |
@Test |
| 586 | 586 |
public void testGetTaggedNameSpeciesAggregate() {
|
| 587 |
BotanicalName speciesAggregate = TaxonNameBase.NewBotanicalInstance(Rank.SPECIESAGGREGATE());
|
|
| 587 |
BotanicalName speciesAggregate = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIESAGGREGATE());
|
|
| 588 | 588 |
speciesAggregate.setGenusOrUninomial("Mygenus");
|
| 589 | 589 |
speciesAggregate.setSpecificEpithet("myspecies");
|
| 590 | 590 |
List<TaggedText> taggedName = strategy.getTaggedName(speciesAggregate); |
| ... | ... | |
| 622 | 622 |
|
| 623 | 623 |
@Test //#2888 |
| 624 | 624 |
public void testAutonymWithExAuthor(){
|
| 625 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.FORM());
|
|
| 625 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.FORM());
|
|
| 626 | 626 |
name.setGenusOrUninomial("Euphorbia");
|
| 627 | 627 |
name.setSpecificEpithet("atropurpurea");
|
| 628 | 628 |
name.setInfraSpecificEpithet("atropurpurea");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java | ||
|---|---|---|
| 25 | 25 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 28 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 28 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 29 | 29 |
//import eu.etaxonomy.cdm.model.reference.Book; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 68 | 68 |
*/ |
| 69 | 69 |
@Before |
| 70 | 70 |
public void setUp() throws Exception {
|
| 71 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 71 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 72 | 72 |
name.setGenusOrUninomial("Abies");
|
| 73 | 73 |
name.setSpecificEpithet("alba");
|
| 74 | 74 |
Person combinationAuthor = Person.NewInstance(); |
| ... | ... | |
| 168 | 168 |
System.out.println(taxonBase.generateTitle()); |
| 169 | 169 |
assertEquals("Abies alba (L.) Mill. \u0026 L. sec. Sp.Pl.", taxonBase.generateTitle());
|
| 170 | 170 |
|
| 171 |
name = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 171 |
name = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 172 | 172 |
NonViralNameParserImpl.NewInstance().parseFullName(name, "Cichorium glandulosum Boiss. \u0026 A. Huet", null, true); |
| 173 | 173 |
Taxon taxon = Taxon.NewInstance(name, sec); |
| 174 | 174 |
assertEquals("Cichorium glandulosum Boiss. \u0026 A. Huet sec. Sp.Pl.", taxon.getTitleCache());
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonShortSecCacheStrategyTest.java | ||
|---|---|---|
| 22 | 22 |
import eu.etaxonomy.cdm.model.agent.Team; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 26 | 26 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| ... | ... | |
| 59 | 59 |
*/ |
| 60 | 60 |
@Before |
| 61 | 61 |
public void setUp() throws Exception {
|
| 62 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 62 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 63 | 63 |
name.setGenusOrUninomial("Abies");
|
| 64 | 64 |
name.setSpecificEpithet("alba");
|
| 65 | 65 |
Person combinationAuthor = Person.NewInstance(); |
| ... | ... | |
| 114 | 114 |
System.out.println(taxonBase.generateTitle()); |
| 115 | 115 |
assertEquals("Abies alba (L.) Mill. \u0026 L. sec. Sp.Pl.", taxonBase.generateTitle());
|
| 116 | 116 |
|
| 117 |
name = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 117 |
name = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 118 | 118 |
NonViralNameParserImpl.NewInstance().parseFullName(name, "Cichorium glandulosum Boiss. \u0026 A. Huet", null, true); |
| 119 | 119 |
Taxon taxon = Taxon.NewInstance(name, sec); |
| 120 | 120 |
assertEquals("Cichorium glandulosum Boiss. \u0026 A. Huet sec. Sp.Pl.", taxon.getTitleCache());
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java | ||
|---|---|---|
| 33 | 33 |
import eu.etaxonomy.cdm.model.location.ReferenceSystem; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 35 | 35 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 36 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 36 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 37 | 37 |
import eu.etaxonomy.cdm.model.reference.IBook; |
| 38 | 38 |
import eu.etaxonomy.cdm.model.reference.IBookSection; |
| 39 | 39 |
import eu.etaxonomy.cdm.model.reference.IPrintSeries; |
| ... | ... | |
| 216 | 216 |
Assert.assertTrue("Cached book with a defined and a null edition should match", matchStrategy.invoke(book1, bookClone));
|
| 217 | 217 |
|
| 218 | 218 |
matchStrategy = DefaultMatchStrategy.NewInstance(BotanicalName.class); |
| 219 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 220 |
BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
| 219 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 220 |
BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
| 221 | 221 |
Assert.assertNotNull("Rank should not be null", botName1.getRank());
|
| 222 | 222 |
|
| 223 | 223 |
botName1.setGenusOrUninomial("Genus1");
|
| ... | ... | |
| 345 | 345 |
public void testInvokeTaxonNames() throws MatchException {
|
| 346 | 346 |
matchStrategy = DefaultMatchStrategy.NewInstance(BotanicalName.class); |
| 347 | 347 |
|
| 348 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 349 |
BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 350 |
BotanicalName botName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 348 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 349 |
BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 350 |
BotanicalName botName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 351 | 351 |
|
| 352 | 352 |
Assert.assertFalse("Names without title should not match", matchStrategy.invoke(botName1, botName2));
|
| 353 | 353 |
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java | ||
|---|---|---|
| 42 | 42 |
import eu.etaxonomy.cdm.model.name.NameRelationshipType; |
| 43 | 43 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 44 | 44 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; |
| 45 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 45 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 46 | 46 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 47 | 47 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 48 | 48 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| ... | ... | |
| 318 | 318 |
//@Ignore |
| 319 | 319 |
public void testInvokeTxonNames() throws MergeException {
|
| 320 | 320 |
IMergeStrategy botNameMergeStrategy = DefaultMergeStrategy.NewInstance(BotanicalName.class); |
| 321 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 322 |
BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 323 |
BotanicalName botName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 321 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 322 |
BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 323 |
BotanicalName botName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 324 | 324 |
|
| 325 | 325 |
botName1.setGenusOrUninomial("Genus1");
|
| 326 | 326 |
botName1.setSpecificEpithet("species1");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java | ||
|---|---|---|
| 1724 | 1724 |
|
| 1725 | 1725 |
@Test |
| 1726 | 1726 |
public final void testNomenclaturalStatus() {
|
| 1727 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.FAMILY(), "Acanthopale", null, null, null, null, null, null, null);
|
|
| 1727 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY(), "Acanthopale", null, null, null, null, null, null, null);
|
|
| 1728 | 1728 |
name.addStatus(NomenclaturalStatus.NewInstance(NomenclaturalStatusType.ALTERNATIVE())); |
| 1729 |
BotanicalName name2 = TaxonNameBase.NewBotanicalInstance(Rank.FAMILY());
|
|
| 1729 |
BotanicalName name2 = TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY());
|
|
| 1730 | 1730 |
parser.parseReferencedName(name2, name.getFullTitleCache(), name2.getRank(), true); |
| 1731 | 1731 |
parser.parseReferencedName(name2, name.getFullTitleCache(), name2.getRank(), true); |
| 1732 | 1732 |
Assert.assertEquals("Title cache should be same. No duplication of nom. status should take place", name.getFullTitleCache(), name2.getFullTitleCache());
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestFullReferenceParser.java | ||
|---|---|---|
| 13 | 13 |
|
| 14 | 14 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 15 | 15 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 16 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 16 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 17 | 17 |
import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser; |
| 18 | 18 |
import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; |
| 19 | 19 |
|
| ... | ... | |
| 27 | 27 |
|
| 28 | 28 |
private boolean test(){
|
| 29 | 29 |
INonViralNameParser parser = NonViralNameParserImpl.NewInstance(); |
| 30 |
BotanicalName nameToBeFilled = TaxonNameBase.NewBotanicalInstance(null);
|
|
| 30 |
BotanicalName nameToBeFilled = TaxonNameFactory.NewBotanicalInstance(null);
|
|
| 31 | 31 |
String fullReference = "Abies alba Mill., Sp. Pl. 4: 455. 1987."; |
| 32 | 32 |
boolean makeEmpty = false; |
| 33 | 33 |
Rank rank = null; |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/BasionymsMustShareEpithetsAndAuthorsTest.java | ||
|---|---|---|
| 57 | 57 |
public void setUp() {
|
| 58 | 58 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 59 | 59 |
vocabularyStore.initialize(); |
| 60 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 60 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 61 | 61 |
name.setGenusOrUninomial("Aus");
|
| 62 | 62 |
name.setSpecificEpithet("aus");
|
| 63 | 63 |
author1 = Person.NewTitledInstance("Person");
|
| 64 | 64 |
name.setBasionymAuthorship(author1); |
| 65 | 65 |
|
| 66 | 66 |
author2 = Person.NewTitledInstance("Person2");
|
| 67 |
basionymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 67 |
basionymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 68 | 68 |
basionymName.setGenusOrUninomial("Aus");
|
| 69 | 69 |
basionymName.setSpecificEpithet("aus");
|
| 70 | 70 |
basionymName.setCombinationAuthorship(author1); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/CorrectEpithetsForRankTest.java | ||
|---|---|---|
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 28 | 28 |
import eu.etaxonomy.cdm.validation.constraint.CorrectEpithetsForRankValidator; |
| 29 | 29 |
|
| 30 | 30 |
|
| ... | ... | |
| 49 | 49 |
public void setUp() {
|
| 50 | 50 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 51 | 51 |
vocabularyStore.initialize(); |
| 52 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 52 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 53 | 53 |
name.setNameCache("Aus aus");
|
| 54 | 54 |
name.setAuthorshipCache("L.");
|
| 55 | 55 |
name.setFullTitleCache("Aus aus L.");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/MustHaveAuthorityTest.java | ||
|---|---|---|
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer; |
| 25 | 25 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 26 | 26 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 27 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 28 | 28 |
|
| 29 | 29 |
|
| 30 | 30 |
|
| ... | ... | |
| 47 | 47 |
public void setUp() {
|
| 48 | 48 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 49 | 49 |
vocabularyStore.initialize(); |
| 50 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 50 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 51 | 51 |
name.setNameCache("Aus aus");
|
| 52 | 52 |
name.setGenusOrUninomial("Aus");
|
| 53 | 53 |
name.setSpecificEpithet("aus");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/NameValidCharactersTest.java | ||
|---|---|---|
| 27 | 27 |
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 29 | 29 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 30 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 30 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 31 | 31 |
|
| 32 | 32 |
|
| 33 | 33 |
/** |
| ... | ... | |
| 49 | 49 |
public void setUp() {
|
| 50 | 50 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 51 | 51 |
vocabularyStore.initialize(); |
| 52 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 52 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 53 | 53 |
name.setGenusOrUninomial("Abies");
|
| 54 | 54 |
name.setSpecificEpithet("balsamea");
|
| 55 | 55 |
name.setNameCache("Abies balsamea");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAcceptedAndSynonymTest.java | ||
|---|---|---|
| 22 | 22 |
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
| 24 | 24 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 26 | 26 |
import eu.etaxonomy.cdm.model.reference.Reference; |
| 27 | 27 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
| 28 | 28 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| ... | ... | |
| 55 | 55 |
public void setUp() {
|
| 56 | 56 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 57 | 57 |
vocabularyStore.initialize(); |
| 58 |
name1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 59 |
name2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 60 |
name3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 58 |
name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 59 |
name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 60 |
name3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 61 | 61 |
|
| 62 | 62 |
sec1 = ReferenceFactory.newGeneric(); |
| 63 | 63 |
sec2 = ReferenceFactory.newGeneric(); |
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTaxonomicYearTest.java | ||
|---|---|---|
| 55 | 55 |
DefaultTermInitializer vocabularyStore = new DefaultTermInitializer(); |
| 56 | 56 |
vocabularyStore.initialize(); |
| 57 | 57 |
|
| 58 |
name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 58 |
name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 59 | 59 |
name.setNameCache("Aus aus");
|
| 60 | 60 |
name.setAuthorshipCache("L.");
|
| 61 | 61 |
name.setFullTitleCache("Aus aus L.");
|
| cdmlib-model/src/test/java/eu/etaxonomy/cdm/validation/ValidTypeDesignationTest.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.NameTypeDesignation; |
| 19 | 19 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 20 | 20 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
| 22 | 22 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; |
| 24 | 24 |
import eu.etaxonomy.cdm.validation.constraint.TypeDesignationValidator; |
| ... | ... | |
| 56 | 56 |
|
| 57 | 57 |
|
| 58 | 58 |
|
| 59 |
name1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 59 |
name1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 60 | 60 |
name1.setNameCache("Aus aus");
|
| 61 | 61 |
|
| 62 |
name2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
| 62 |
name2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
| 63 | 63 |
name2.setNameCache("Aus bus");
|
| 64 | 64 |
|
| 65 | 65 |
specimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen); |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for botanical names