Revision fe34a9eb
Added by Andreas Müller about 7 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java | ||
---|---|---|
50 | 50 |
import eu.etaxonomy.cdm.model.name.NameRelationshipType; |
51 | 51 |
import eu.etaxonomy.cdm.model.name.Rank; |
52 | 52 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
53 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
53 | 54 |
import eu.etaxonomy.cdm.model.reference.Reference; |
54 | 55 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
55 | 56 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
... | ... | |
214 | 215 |
|
215 | 216 |
private void insertSomeData(CdmApplicationController appCtr) { |
216 | 217 |
Classification cl = Classification.NewInstance("myClass"); |
217 |
TaxonNode node1 = cl.addChildTaxon(Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(null), null), null, null);
|
|
218 |
TaxonNode node1 = cl.addChildTaxon(Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(null), null), null, null);
|
|
218 | 219 |
appCtr.getClassificationService().save(cl); |
219 | 220 |
|
220 | 221 |
Taxon t2 = Taxon.NewInstance(null, null); |
... | ... | |
292 | 293 |
CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds); |
293 | 294 |
Person agent = Person.NewInstance(); |
294 | 295 |
appCtr.getAgentService().save(agent); |
295 |
TaxonNameBase<?,?> tn = TaxonNameBase.NewBotanicalInstance(null);
|
|
296 |
TaxonNameBase<?,?> tn = TaxonNameFactory.NewBotanicalInstance(null);
|
|
296 | 297 |
appCtr.getNameService().save(tn); |
297 | 298 |
appCtr.close(); |
298 | 299 |
|
... | ... | |
312 | 313 |
CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds); |
313 | 314 |
Person agent = Person.NewInstance(); |
314 | 315 |
appCtr.getAgentService().save(agent); |
315 |
TaxonNameBase<?,?> tn = TaxonNameBase.NewBotanicalInstance(null);
|
|
316 |
TaxonNameBase<?,?> tn = TaxonNameFactory.NewBotanicalInstance(null);
|
|
316 | 317 |
appCtr.getNameService().save(tn); |
317 | 318 |
appCtr.close(); |
318 | 319 |
|
... | ... | |
352 | 353 |
|
353 | 354 |
boolean exists = appCtr.getUserService().userExists("admin"); |
354 | 355 |
try { |
355 |
BotanicalName name = TaxonNameBase.NewBotanicalInstance(null);
|
|
356 |
BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null);
|
|
356 | 357 |
String nameCache = "testName"; |
357 | 358 |
name.setNameCache(nameCache); |
358 | 359 |
name.setTitleCache(nameCache, true); |
... | ... | |
428 | 429 |
// CdmPersistentDataSource.NewInstance("localH2"); |
429 | 430 |
CdmApplicationController appCtr = CdmApplicationController.NewInstance(ds, validation); |
430 | 431 |
try { |
431 |
BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
432 |
BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
433 |
BotanicalName hybridName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
432 |
BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
433 |
BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
434 |
BotanicalName hybridName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
434 | 435 |
botName1.addRelationshipToName(botName2, NameRelationshipType.ORTHOGRAPHIC_VARIANT(), null); |
435 | 436 |
UUID uuid1 = botName1.getUuid(); |
436 | 437 |
UUID uuid2 = botName2.getUuid(); |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for botanical names