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/model/name/TaxonNameBaseTest.java
261 261
	 */
262 262
	@Test
263 263
	public void testGetBasionym() {
264
		TaxonNameBase name1 = BotanicalName.NewInstance(null);
265
		TaxonNameBase basionym1 = BotanicalName.NewInstance(null);
266
		TaxonNameBase basionym2 = BotanicalName.NewInstance(null);
264
		TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
265
		TaxonNameBase basionym1 = TaxonNameBase.NewBotanicalInstance(null);
266
		TaxonNameBase basionym2 = TaxonNameBase.NewBotanicalInstance(null);
267 267

  
268 268
		assertEquals(null, name1.getBasionym());
269 269
		name1.addBasionym(basionym1);
......
318 318
	 */
319 319
	@Test
320 320
	public void testGetRank() {
321
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
321
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
322 322
		assertNull("Rank shall be null", name1.getRank());
323 323
		name1.setRank(Rank.SPECIES());
324 324
		assertNotNull("Rank shall not be null", name1.getRank());
......
344 344
	 */
345 345
	@Test
346 346
	public void testGetAppendedPhrase() {
347
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
347
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
348 348
		String appPhrase = "appPhrase";
349 349
		assertNull(name1.getAppendedPhrase());
350 350
		name1.setAppendedPhrase(appPhrase);
......
358 358
	 */
359 359
	@Test
360 360
	public void testGetSetNomenclaturalMicroReference() {
361
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
361
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
362 362
		String microRef = "micro";
363 363
		assertNull(name1.getNomenclaturalMicroReference());
364 364
		name1.setNomenclaturalMicroReference(microRef);
......
372 372
	 */
373 373
	@Test
374 374
	public void testGetSetHasProblem() {
375
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
375
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
376 376
		name1.setParsingProblem(0);
377 377
		assertFalse(name1.hasProblem());
378 378
		name1.setParsingProblem(1);
......
553 553

  
554 554
	@Test
555 555
	public void testMergeHomotypicGroups() {
556
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
557
		TaxonNameBase<?,?> name2 = BotanicalName.NewInstance(null);
558
		TaxonNameBase<?,?> name3 = BotanicalName.NewInstance(null);
559
		TaxonNameBase<?,?> name4 = BotanicalName.NewInstance(null);
556
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
557
		TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
558
		TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
559
		TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
560 560

  
561 561
		assertFalse(name1.getHomotypicalGroup().equals(name2.getHomotypicalGroup()));
562 562
		int numberOfTypifiedNames = name1.getHomotypicalGroup().getTypifiedNames().size();
......
594 594

  
595 595
	@Test
596 596
	public void testIsBasionymFor() {
597
		TaxonNameBase name1 = BotanicalName.NewInstance(null);
598
		TaxonNameBase name2 = BotanicalName.NewInstance(null);
599
		TaxonNameBase<?,?> name3 = BotanicalName.NewInstance(null);
600
		TaxonNameBase<?,?> name4 = BotanicalName.NewInstance(null);
597
		TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
598
		TaxonNameBase name2 = TaxonNameBase.NewBotanicalInstance(null);
599
		TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
600
		TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
601 601

  
602 602
		assertFalse(name2.isBasionymFor(name1));
603 603
		assertFalse(name1.isBasionymFor(name2));
......
611 611
	 */
612 612
	@Test
613 613
	public void testIsHomotypic() {
614
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
615
		TaxonNameBase<?,?> name2 = BotanicalName.NewInstance(null);
616
		TaxonNameBase<?,?> name3 = BotanicalName.NewInstance(null);
617
		TaxonNameBase<?,?> name4 = BotanicalName.NewInstance(null);
614
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
615
		TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
616
		TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
617
		TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
618 618
		name1.mergeHomotypicGroups(name2);
619 619
		name2.mergeHomotypicGroups(name4);
620 620

  
......
628 628

  
629 629
	@Test
630 630
	public void testMakeGroupsBasionym(){
631
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
632
		TaxonNameBase<?,?> name2 = BotanicalName.NewInstance(null);
633
		TaxonNameBase<?,?> name3 = BotanicalName.NewInstance(null);
634
		TaxonNameBase<?,?> name4 = BotanicalName.NewInstance(null);
631
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
632
		TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
633
		TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
634
		TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
635 635

  
636 636
		name1.mergeHomotypicGroups(name2);
637 637
		name1.mergeHomotypicGroups(name3);
......
648 648

  
649 649
	@Test
650 650
	public void testIsGroupsBasionym(){
651
		TaxonNameBase<?,?> name1 = BotanicalName.NewInstance(null);
652
		TaxonNameBase<?,?> name2 = BotanicalName.NewInstance(null);
653
		TaxonNameBase<?,?> name3 = BotanicalName.NewInstance(null);
654
		TaxonNameBase<?,?> name4 = BotanicalName.NewInstance(null);
651
		TaxonNameBase<?,?> name1 = TaxonNameBase.NewBotanicalInstance(null);
652
		TaxonNameBase<?,?> name2 = TaxonNameBase.NewBotanicalInstance(null);
653
		TaxonNameBase<?,?> name3 = TaxonNameBase.NewBotanicalInstance(null);
654
		TaxonNameBase<?,?> name4 = TaxonNameBase.NewBotanicalInstance(null);
655 655

  
656 656
		assertFalse(name1.isGroupsBasionym());
657 657

  
......
670 670

  
671 671
	@Test
672 672
	public void testRemoveBasionyms(){
673
		TaxonNameBase name1 = BotanicalName.NewInstance(null);
674
		TaxonNameBase basionym = BotanicalName.NewInstance(null);
675
		TaxonNameBase name3 = BotanicalName.NewInstance(null);
673
		TaxonNameBase name1 = TaxonNameBase.NewBotanicalInstance(null);
674
		TaxonNameBase basionym = TaxonNameBase.NewBotanicalInstance(null);
675
		TaxonNameBase name3 = TaxonNameBase.NewBotanicalInstance(null);
676 676

  
677 677
		name1.addBasionym(basionym);
678 678
		assertEquals(1, name1.getBasionyms().size());

Also available in: Unified diff