Revision fe34a9eb
Added by Andreas Müller about 7 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java | ||
---|---|---|
63 | 63 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
64 | 64 |
import eu.etaxonomy.cdm.model.name.BotanicalName; |
65 | 65 |
import eu.etaxonomy.cdm.model.name.Rank; |
66 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
|
|
66 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
|
|
67 | 67 |
import eu.etaxonomy.cdm.model.reference.Reference; |
68 | 68 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
69 | 69 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
... | ... | |
299 | 299 |
|
300 | 300 |
for(String rndStr: uniqueRandomStrs){ |
301 | 301 |
|
302 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SERIES()), sec);
|
|
302 |
Taxon taxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SERIES()), sec);
|
|
303 | 303 |
taxon.setTitleCache("Tax" + rndStr, true); |
304 | 304 |
taxonService.save(taxon); |
305 | 305 |
|
... | ... | |
347 | 347 |
|
348 | 348 |
for(int i = 0; i < numOfTaxa; i++){ |
349 | 349 |
|
350 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null);
|
|
350 |
Taxon taxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(null), null);
|
|
351 | 351 |
taxon.setTitleCache("Taxon_" + i, true); |
352 | 352 |
taxonUuids[i] = taxon.getUuid(); |
353 | 353 |
taxonService.save(taxon); |
... | ... | |
392 | 392 |
|
393 | 393 |
for(int i = 0; i < numOfTaxa; i++){ |
394 | 394 |
|
395 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null);
|
|
395 |
Taxon taxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(null), null);
|
|
396 | 396 |
taxon.setTitleCache("Taxon_" + i, true); |
397 | 397 |
taxonUuids[i] = taxon.getUuid(); |
398 | 398 |
taxonService.save(taxon); |
... | ... | |
1278 | 1278 |
referenceService.save(sec); |
1279 | 1279 |
referenceService.save(sec_sensu); |
1280 | 1280 |
|
1281 |
BotanicalName n_abies = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
1281 |
BotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
1282 | 1282 |
n_abies.setNameCache("Abies", true); |
1283 | 1283 |
Taxon t_abies = Taxon.NewInstance(n_abies, sec); |
1284 | 1284 |
taxonService.save(t_abies); |
1285 | 1285 |
|
1286 |
BotanicalName n_abies_alba = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1286 |
BotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1287 | 1287 |
n_abies_alba.setNameCache("Abies alba", true); |
1288 | 1288 |
Taxon t_abies_alba = Taxon.NewInstance(n_abies_alba, sec); |
1289 | 1289 |
t_abies_alba.setUuid(UUID.fromString(ABIES_ALBA_UUID)); |
1290 | 1290 |
taxonService.save(t_abies_alba); |
1291 | 1291 |
|
1292 |
BotanicalName n_abies_subalpina = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1292 |
BotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1293 | 1293 |
n_abies_subalpina.setNameCache("Abies subalpina", true); |
1294 | 1294 |
Synonym s_abies_subalpina = Synonym.NewInstance(n_abies_subalpina, sec); |
1295 | 1295 |
taxonService.save(s_abies_subalpina); |
1296 | 1296 |
|
1297 |
BotanicalName n_abies_balsamea = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1297 |
BotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1298 | 1298 |
n_abies_balsamea.setNameCache("Abies balsamea", true); |
1299 | 1299 |
Taxon t_abies_balsamea = Taxon.NewInstance(n_abies_balsamea, sec); |
1300 | 1300 |
t_abies_balsamea.setUuid(UUID.fromString(ABIES_BALSAMEA_UUID)); |
1301 | 1301 |
t_abies_balsamea.addSynonym(s_abies_subalpina, SynonymType.SYNONYM_OF()); |
1302 | 1302 |
taxonService.save(t_abies_balsamea); |
1303 | 1303 |
|
1304 |
BotanicalName n_abies_grandis = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1304 |
BotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1305 | 1305 |
n_abies_grandis.setNameCache("Abies grandis", true); |
1306 | 1306 |
Taxon t_abies_grandis = Taxon.NewInstance(n_abies_grandis, sec); |
1307 | 1307 |
taxonService.save(t_abies_grandis); |
1308 | 1308 |
|
1309 |
BotanicalName n_abies_kawakamii = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1309 |
BotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1310 | 1310 |
n_abies_kawakamii.setNameCache("Abies kawakamii", true); |
1311 | 1311 |
Taxon t_abies_kawakamii = Taxon.NewInstance(n_abies_kawakamii, sec); |
1312 | 1312 |
t_abies_kawakamii.getTitleCache(); |
... | ... | |
1318 | 1318 |
t_abies_kawakamii_sensu_komarov.addTaxonRelation(t_abies_balsamea, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null); |
1319 | 1319 |
taxonService.saveOrUpdate(t_abies_kawakamii_sensu_komarov); |
1320 | 1320 |
|
1321 |
BotanicalName n_abies_lasiocarpa = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1321 |
BotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1322 | 1322 |
n_abies_lasiocarpa.setNameCache("Abies lasiocarpa", true); |
1323 | 1323 |
Taxon t_abies_lasiocarpa = Taxon.NewInstance(n_abies_lasiocarpa, sec); |
1324 | 1324 |
taxonService.save(t_abies_lasiocarpa); |
... | ... | |
1435 | 1435 |
String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10); |
1436 | 1436 |
String radomCommonName = RandomStringUtils.randomAlphabetic(10); |
1437 | 1437 |
|
1438 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1438 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1439 | 1439 |
name.setNameCache(radomName, true); |
1440 | 1440 |
Taxon taxon = Taxon.NewInstance(name, sec); |
1441 | 1441 |
taxonService.save(taxon); |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for botanical names