Project

General

Profile

« Previous | Next » 

Revision fbeefcaf

Added by Andreas Müller over 7 years ago

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
41 41
import eu.etaxonomy.cdm.model.reference.Reference;
42 42
import eu.etaxonomy.cdm.model.taxon.Classification;
43 43
import eu.etaxonomy.cdm.model.taxon.Synonym;
44
import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
44
import eu.etaxonomy.cdm.model.taxon.SynonymType;
45 45
import eu.etaxonomy.cdm.model.taxon.Taxon;
46 46
import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
47 47
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
......
100 100
	private Taxon t2;
101 101
	private Taxon t4;
102 102
//	private Synonym s1;
103
	private SynonymRelationshipType synonymRelationshipType;
103
	private SynonymType synonymType;
104 104
	private Reference reference;
105 105
	private String referenceDetail;
106 106
	private Classification classification;
......
117 117
	}
118 118

  
119 119
	/**
120
	 * Test method for {@link eu.etaxonomy.cdm.api.service.TaxonNodeServiceImpl#makeTaxonNodeASynonymOfAnotherTaxonNode(eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)}.
120
	 * Test method for {@link eu.etaxonomy.cdm.api.service.TaxonNodeServiceImpl#makeTaxonNodeASynonymOfAnotherTaxonNode(eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.SynonymType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)}.
121 121
	 */
122 122
	@Test
123 123
	@DataSet
......
127 127
		node2 = taxonNodeService.load(node2Uuid);
128 128
		node4 = taxonNodeService.load(node4Uuid);
129 129
		reference = referenceService.load(referenceUuid);
130
//		synonymRelationshipType = SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF();
131
		synonymRelationshipType = CdmBase.deproxy(termService.load(SynonymRelationshipType.uuidHomotypicSynonymOf), SynonymRelationshipType.class) ;
130
//		synonymType = SynonymType.HOMOTYPIC_SYNONYM_OF();
131
		synonymType = CdmBase.deproxy(termService.load(SynonymType.uuidHomotypicSynonymOf), SynonymType.class) ;
132 132
		referenceDetail = "test";
133 133

  
134 134
		//
......
172 172
        UUID uuidT4 = t4.getUuid();
173 173
        t4 = (Taxon) taxonService.load(uuidT4);
174 174
        TaxonNameBase name4 = nameService.load(t4.getName().getUuid());
175
        result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode(node4, node2, synonymRelationshipType, reference, referenceDetail);
175
        result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode(node4, node2, synonymType, reference, referenceDetail);
176 176
        if (result.isError() || result.isAbort()){
177 177
            Assert.fail();
178 178
        }
......
180 180
        assertNull(t4);
181 181

  
182 182
		//Taxon can't be deleted because of the polytomous key node
183
		result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode(node1, node2, synonymRelationshipType, reference, referenceDetail);
183
		result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode(node1, node2, synonymType, reference, referenceDetail);
184 184
		if (result.isError() || result.isAbort()){
185 185
			Assert.fail();
186 186
		}
......
215 215
	}
216 216

  
217 217
	/**
218
	 * Test method for {@link eu.etaxonomy.cdm.api.service.TaxonNodeServiceImpl#makeTaxonNodeASynonymOfAnotherTaxonNode(eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)}.
218
	 * Test method for {@link eu.etaxonomy.cdm.api.service.TaxonNodeServiceImpl#makeTaxonNodeASynonymOfAnotherTaxonNode(eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.model.taxon.SynonymType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)}.
219 219
	 */
220 220
	@Test
221 221
	@DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class)
......
226 226
		node1 = taxonNodeService.load(node1Uuid);
227 227
		node2 = taxonNodeService.load(node2Uuid);
228 228
		reference = referenceService.load(referenceUuid);
229
		synonymRelationshipType = CdmBase.deproxy(termService.load(SynonymRelationshipType.uuidHeterotypicSynonymOf), SynonymRelationshipType.class) ;
229
		synonymType = CdmBase.deproxy(termService.load(SynonymType.uuidHeterotypicSynonymOf), SynonymType.class) ;
230 230
		referenceDetail = "test";
231 231

  
232 232
		// descriptions
......
258 258

  
259 259
		//do it
260 260
		DeleteResult result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode
261
		        (node1, node2, synonymRelationshipType, reference, referenceDetail);
261
		        (node1, node2, synonymType, reference, referenceDetail);
262 262

  
263 263
		//post conditions
264 264
		if (!result.getUpdatedObjects().iterator().hasNext()){
......
277 277
		HibernateProxyHelper.deproxy(t2.getHomotypicGroup());
278 278
		HibernateProxyHelper.deproxy(t2.getName());
279 279

  
280
		termService.saveOrUpdate(synonymRelationshipType);
280
		termService.saveOrUpdate(synonymType);
281 281
		Assert.assertFalse("taxon 2 must hav a synonym now", t2.getSynonyms().isEmpty());
282 282
		assertEquals("taxon 2 must have 3 synonyms now, the old taxon 1 and it's 2 synonyms", 3, t2.getSynonyms().size());
283 283
		assertEquals("taxon 2 must have 2 descriptions now, taken form taxon 1", 2, t2.getDescriptions().size());

Also available in: Unified diff