Project

General

Profile

« Previous | Next » 

Revision da39aca0

Added by Andreas Müller about 7 years ago

ref #6365 merge static methods from BotanicaName to TaxonNameBase

View differences:

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 46
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
46 47
import eu.etaxonomy.cdm.model.reference.Reference;
47 48
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
......
223 224
	 */
224 225
	@Test
225 226
	public void testInvokeReferences() throws MergeException {
226
		INomenclaturalReferenceCacheStrategy cacheStrategy1 = (INomenclaturalReferenceCacheStrategy)book1.getCacheStrategy();
227
		INomenclaturalReferenceCacheStrategy cacheStrategy1 = book1.getCacheStrategy();
227 228
		int id = book1.getId();
228 229
		UUID uuid = book1.getUuid();
229 230
		try {
......
317 318
	//@Ignore
318 319
	public void testInvokeTxonNames() throws MergeException {
319 320
		IMergeStrategy botNameMergeStrategy = DefaultMergeStrategy.NewInstance(BotanicalName.class);
320
		BotanicalName botName1 = BotanicalName.NewInstance(Rank.SPECIES());
321
		BotanicalName botName2 = BotanicalName.NewInstance(Rank.SPECIES());
322
		BotanicalName botName3 = BotanicalName.NewInstance(Rank.SPECIES());
321
		BotanicalName botName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
322
		BotanicalName botName2 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
323
		BotanicalName botName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
323 324

  
324 325
		botName1.setGenusOrUninomial("Genus1");
325 326
		botName1.setSpecificEpithet("species1");

Also available in: Unified diff