Project

General

Profile

« Previous | Next » 

Revision 9dc896c9

Added by Andreas Müller almost 7 years ago

fix #6368 rename table and class TaxonNameBase

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplBusinessTest.java
27 27
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
28 28
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
29 29
import eu.etaxonomy.cdm.model.name.INonViralName;
30
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
30
import eu.etaxonomy.cdm.model.name.TaxonName;
31 31
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
32 32
import eu.etaxonomy.cdm.model.reference.Reference;
33 33
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
......
63 63
	private INonViralName s1n;
64 64
	private INonViralName t2n;
65 65
	private INonViralName t1n;
66
	private TaxonNameBase<?,?> s2n;
66
	private TaxonName s2n;
67 67

  
68 68
	/**
69 69
	 * @throws java.lang.Exception
......
148 148
	@Test
149 149
	public final void testChangeSynonymWithMultipleSynonymsInHomotypicalGroupToAcceptedTaxon() {
150 150
		t1.addSynonym(s1, heteroTypicSynonymType);
151
		TaxonNameBase<?,?> otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
151
		TaxonName otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
152 152
		t1.addHeterotypicSynonymName(otherHeteroSynonymName);
153
		TaxonNameBase<?,?> homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
153
		TaxonName homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
154 154
		Synonym homotypicSynonym = Synonym.NewInstance(homotypicSynonymName, t1.getSec());
155 155
		t1.addHomotypicSynonym(homotypicSynonym);
156 156

  
......
218 218
		newInstances.add(t1);
219 219
		newInstances.add(t2);
220 220
		service.save(newInstances);
221
		TaxonNameBase<?,?> synonymName = s1.getName();
221
		TaxonName synonymName = s1.getName();
222 222
		UUID synNameUUID = synonymName.getUuid();
223 223

  
224 224
		Taxon newTaxon = (Taxon) service.changeSynonymToRelatedTaxon(s1, t2, TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), reference, referenceDetail).getCdmEntity();
......
257 257
		t1.addSynonym(s1, heteroTypicSynonymType);
258 258

  
259 259
		//s2 - heterotypic
260
		TaxonNameBase otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
260
		TaxonName otherHeteroSynonymName = TaxonNameFactory.NewNonViralInstance(null);
261 261
		Synonym s2 = Synonym.NewInstance(otherHeteroSynonymName, t1.getSec());
262 262
		t1.addSynonym(s2, heteroTypicSynonymType);
263
		TaxonNameBase<?,?> otherHeteroSynonymNameB = TaxonNameFactory.NewNonViralInstance(null);
263
		TaxonName otherHeteroSynonymNameB = TaxonNameFactory.NewNonViralInstance(null);
264 264
		otherHeteroSynonymName.addBasionym(otherHeteroSynonymNameB);
265 265
		Synonym s2b = Synonym.NewInstance(otherHeteroSynonymNameB, t1.getSec());
266 266
		t1.addSynonym(s2b, heteroTypicSynonymType);
267 267

  
268 268
		//homotypic
269
		TaxonNameBase<?,?> homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
269
		TaxonName homotypicSynonymName = TaxonNameFactory.NewNonViralInstance(null);
270 270
		Synonym homotypicSynonym = Synonym.NewInstance(homotypicSynonymName, t1.getSec());
271 271
		t1.addHomotypicSynonym(homotypicSynonym);
272 272
		t1.getName().addBasionym(homotypicSynonymName);

Also available in: Unified diff