Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java
31 31
import eu.etaxonomy.cdm.model.location.Country;
32 32
import eu.etaxonomy.cdm.model.location.Point;
33 33
import eu.etaxonomy.cdm.model.location.ReferenceSystem;
34
import eu.etaxonomy.cdm.model.name.BotanicalName;
35 34
import eu.etaxonomy.cdm.model.name.IBotanicalName;
36 35
import eu.etaxonomy.cdm.model.name.Rank;
36
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
37 37
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
38 38
import eu.etaxonomy.cdm.model.reference.IBook;
39 39
import eu.etaxonomy.cdm.model.reference.IBookSection;
......
215 215
		bookClone.setEdition(null);
216 216
		Assert.assertTrue("Cached book with a defined and a null edition should match", matchStrategy.invoke(book1, bookClone));
217 217

  
218
		matchStrategy = DefaultMatchStrategy.NewInstance(BotanicalName.class);
218
		matchStrategy = DefaultMatchStrategy.NewInstance(TaxonNameBase.class);
219 219
		IBotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
220 220
		IBotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
221 221
		Assert.assertNotNull("Rank should not be null", botName1.getRank());
......
343 343
	 */
344 344
	@Test
345 345
	public void testInvokeTaxonNames() throws MatchException {
346
		matchStrategy = DefaultMatchStrategy.NewInstance(BotanicalName.class);
346
		matchStrategy = DefaultMatchStrategy.NewInstance(TaxonNameBase.class);
347 347

  
348
		BotanicalName botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
349
		BotanicalName botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
348
		TaxonNameBase botName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
349
		TaxonNameBase botName2 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
350 350
		IBotanicalName botName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
351 351

  
352 352
		Assert.assertFalse("Names without title should not match", matchStrategy.invoke(botName1, botName2));

Also available in: Unified diff