Project

General

Profile

« Previous | Next » 

Revision 42f99e54

Added by Andreas Müller about 7 years ago

ref #6362 and ref #6365 remove some NVN and Bot/Zoo name occurrences in TaxEditor

View differences:

eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
20 20
import eu.etaxonomy.cdm.model.description.TaxonDescription;
21 21
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
22 22
import eu.etaxonomy.cdm.model.name.NonViralName;
23
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
23 24
import eu.etaxonomy.cdm.model.taxon.Synonym;
24 25
import eu.etaxonomy.cdm.model.taxon.SynonymType;
25 26
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
71 72
		(new DefaultTermInitializer()).initialize();
72 73

  
73 74
		// Create the original accepted taxon
74
		oldTaxonName = NonViralName.NewInstance(null);
75
		oldTaxonName = TaxonNameBase.NewNonViralInstance(null);
75 76
		taxon = Taxon.NewInstance(oldTaxonName, null);
76 77

  
77 78
//		// Create its parent taxon
78
//		parentTaxon = Taxon.NewInstance(NonViralName.NewInstance(null), null);
79
//		parentTaxon = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
79 80
//		parentTaxon.addTaxonomicChild(taxon, null, null);
80 81
//
81 82
//		// Give it a child taxon
82
//		childTaxon = Taxon.NewInstance(NonViralName.NewInstance(null), null);
83
//		childTaxon = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
83 84
//		childTaxon.setTaxonomicParent(taxon, null, null);
84 85

  
85 86
		// Create a homotypic synonym for the accepted taxon
86
		taxon.addHomotypicSynonymName(NonViralName.NewInstance(null));
87
//		homotypicSynonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
87
		taxon.addHomotypicSynonymName(TaxonNameBase.NewNonViralInstance(null));
88
//		homotypicSynonym = Synonym.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
88 89
//		HomotypicalGroup acceptedHomotypicalGroup = HomotypicalGroup.NewInstance();
89 90
//		acceptedHomotypicalGroup.addTypifiedName(oldTaxon.getName());
90 91
//		acceptedHomotypicalGroup.addTypifiedName(homotypicSynonym.getName());
91 92

  
92 93
		// Create a heterotypic synonym that will be used to create the new accepted taxon
93
		oldSynonymName = NonViralName.NewInstance(null);
94
		oldSynonymName = TaxonNameBase.NewNonViralInstance(null);
94 95
		oldHeterotypicSynonym = Synonym.NewInstance(oldSynonymName, null);
95 96
//		oldTaxon.addS .addHeterotypicSynonym(oldHeterotypicSynonym, null, null);
96 97
		heteroypicalGroup = HomotypicalGroup.NewInstance();
......
98 99
		taxon.addSynonym(oldHeterotypicSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
99 100

  
100 101
		// Create a misapplication
101
		misapplication = Taxon.NewInstance(NonViralName.NewInstance(null), null);
102
		misapplication = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
102 103
		taxon.addMisappliedName(misapplication, null, null);
103 104

  
104 105
		// Create a concept relation
105
		concept = Taxon.NewInstance(NonViralName.NewInstance(null), null);
106
		concept = Taxon.NewInstance(TaxonNameBase.NewNonViralInstance(null), null);
106 107
		conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO();
107 108
		concept.addTaxonRelation(taxon, conceptRelationshipType, null, null);
108 109

  

Also available in: Unified diff