Project

General

Profile

« Previous | Next » 

Revision da39aca0

Added by Andreas Müller over 7 years ago

ref #6365 merge static methods from BotanicaName to TaxonNameBase

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
31 31
import eu.etaxonomy.cdm.api.service.dto.GroupedTaxonDTO;
32 32
import eu.etaxonomy.cdm.model.name.BotanicalName;
33 33
import eu.etaxonomy.cdm.model.name.Rank;
34
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
34 35
import eu.etaxonomy.cdm.model.reference.Reference;
35 36
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
36 37
import eu.etaxonomy.cdm.model.taxon.Classification;
......
436 437
        sec.setTitleCache("Sp. Pl.", true);
437 438
        referenceDao.save(sec);
438 439

  
439
        BotanicalName acacia_n = BotanicalName.NewInstance(Rank.GENUS(), "Acacia", null, null, null, null, sec, null, null);
440
        BotanicalName acacia_n = TaxonNameBase.NewBotanicalInstance(Rank.GENUS(), "Acacia", null, null, null, null, sec, null, null);
440 441
        acacia_n.setAuthorshipCache("N.Jacobsen, Bastm. & Yuji Sasaki", true);
441 442
        Taxon acacia_t = Taxon.NewInstance(acacia_n, sec);
442 443
        acacia_t.setUuid(UUID.fromString("2fc779ee-7a9d-4586-92ba-1cd774ac77f0"));
443 444

  
444
        BotanicalName acacia_subg_aculeiferum_n = BotanicalName.NewInstance(Rank.SUBGENUS(), "Acacia", "Aculeiferum", null, null, null, sec, null, null);
445
        BotanicalName acacia_subg_aculeiferum_n = TaxonNameBase.NewBotanicalInstance(Rank.SUBGENUS(), "Acacia", "Aculeiferum", null, null, null, sec, null, null);
445 446
        acacia_subg_aculeiferum_n.setAuthorshipCache("Pedley", true);
446 447
        Taxon acacia_subg_aculeiferum_t = Taxon.NewInstance(acacia_subg_aculeiferum_n, sec);
447 448
        acacia_subg_aculeiferum_t.setUuid(UUID.fromString("169fea08-6b7a-4315-b111-a774c7fafe30"));
448 449

  
449
        BotanicalName acacia_subg_phyllodineae_n = BotanicalName.NewInstance(Rank.SUBGENUS(), "Acacia", "Phyllodineae", null, null, null, sec, null, null);
450
        BotanicalName acacia_subg_phyllodineae_n = TaxonNameBase.NewBotanicalInstance(Rank.SUBGENUS(), "Acacia", "Phyllodineae", null, null, null, sec, null, null);
450 451
        acacia_subg_phyllodineae_n.setAuthorshipCache("N.Jacobsen, Bastm. & Yuji Sasaki", true);
451 452
        Taxon acacia_subg_phyllodineae_t = Taxon.NewInstance(acacia_subg_phyllodineae_n, sec);
452 453
        acacia_subg_phyllodineae_t.setUuid(UUID.fromString("a9da5d43-517e-4ca5-a490-b6a5cd637e9e"));
453 454

  
454
        BotanicalName acacia_setc_botrycephalae_n = BotanicalName.NewInstance(Rank.SECTION_BOTANY(), "Acacia", "Botrycephalae", null, null, null, sec, null, null);
455
        BotanicalName acacia_setc_botrycephalae_n = TaxonNameBase.NewBotanicalInstance(Rank.SECTION_BOTANY(), "Acacia", "Botrycephalae", null, null, null, sec, null, null);
455 456
        acacia_setc_botrycephalae_n.setAuthorshipCache("Yuji Sasaki", true);
456 457
        Taxon acacia_sect_botrycephalae_t = Taxon.NewInstance(acacia_setc_botrycephalae_n, sec);
457 458
        acacia_sect_botrycephalae_t.setUuid(acacia_sect_botrycephalae_uuid);
458 459

  
459
        BotanicalName acacia_cuspidifolia_n = BotanicalName.NewInstance(Rank.SPECIES(), "Acacia", null,"cuspidifolia", null, null, sec, null, null);
460
        BotanicalName acacia_cuspidifolia_n = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(), "Acacia", null,"cuspidifolia", null, null, sec, null, null);
460 461
        acacia_cuspidifolia_n.setAuthorshipCache("Maslin", true);
461 462
        Taxon acacia_cuspidifolia_t = Taxon.NewInstance(acacia_cuspidifolia_n, sec);
462 463
        acacia_cuspidifolia_t.setUuid(acacia_cuspidifolia_uuid);
463 464

  
464
        BotanicalName acacia_mearnsii_n = BotanicalName.NewInstance(Rank.SPECIES(), "Acacia", null,"mearnsii", null, null, sec, null, null);
465
        BotanicalName acacia_mearnsii_n = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(), "Acacia", null,"mearnsii", null, null, sec, null, null);
465 466
        acacia_mearnsii_n.setAuthorshipCache("Benth", true);
466 467
        Taxon acacia_mearnsii_t = Taxon.NewInstance(acacia_mearnsii_n, sec);
467 468
        acacia_mearnsii_t.setUuid(UUID.fromString("2e55dc01-71f5-4d42-9bb0-a2448e46dd18"));
468 469

  
469
        BotanicalName acacia_acicularis_n = BotanicalName.NewInstance(Rank.SPECIES(), "Acacia", null,"acicularis", null, null, sec, null, null);
470
        BotanicalName acacia_acicularis_n = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES(), "Acacia", null,"acicularis", null, null, sec, null, null);
470 471
        acacia_acicularis_n.setAuthorshipCache("Willd.", true);
471 472
        Taxon acacia_acicularis_t = Taxon.NewInstance(acacia_acicularis_n, sec);
472 473
        acacia_acicularis_t.setUuid(acacia_acicularis_uuid);
473 474

  
474
        BotanicalName xacacia_acicularis_n = BotanicalName.NewInstance(Rank.SUBSPECIES(), "Acacia", null,"acicularis", "acicularis", null, sec, null, null);
475
        BotanicalName xacacia_acicularis_n = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES(), "Acacia", null,"acicularis", "acicularis", null, sec, null, null);
475 476
        xacacia_acicularis_n.setAuthorshipCache("Willd.", true);
476 477
        xacacia_acicularis_n.setMonomHybrid(true);
477 478
        System.out.println(xacacia_acicularis_n.getTitleCache());

Also available in: Unified diff