Project

General

Profile

« Previous | Next » 

Revision 32c018db

Added by Andreas Müller almost 6 years ago

ref #7392 remove cascade from relationships and adapt tests (up to service layer)

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
146 146

  
147 147
		//nameRelations
148 148

  
149
		t1.getName().addRelationshipFromName(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
149
		TaxonName relatedName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
150
		t1.getName().addRelationshipFromName(relatedName, NameRelationshipType.ALTERNATIVE_NAME(), null );
150 151

  
151 152
		//taxonRelations
152
		t1.addTaxonRelation(Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
153
		Taxon relatedTaxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
154
		t1.addTaxonRelation(relatedTaxon, TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
153 155
		Synonym synonym = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
154
		UUID uuidSynonym = taxonService.save(synonym).getUuid();
156
		taxonService.save(t1);
157
		taxonService.save(relatedTaxon);
158
		nameService.save(relatedName);
155 159

  
156 160
		t1.addHomotypicSynonym(synonym);
157 161
		taxonService.saveOrUpdate(t1);
......
234 238
		polKeyService.save(polKey);
235 239

  
236 240
		//nameRelations
237
		t1.getName().addRelationshipFromName(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), NameRelationshipType.ALTERNATIVE_NAME(), null );
241
		TaxonName relatedName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
242
		t1.getName().addRelationshipFromName(relatedName, NameRelationshipType.ALTERNATIVE_NAME(), null );
238 243
		TaxonName name1 = t1.getName();
239 244
		UUID name1UUID = name1.getUuid();
240 245
		//taxonRelations
241
		t1.addTaxonRelation(Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null), TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
246
		Taxon relatedTaxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
247
		t1.addTaxonRelation(relatedTaxon, TaxonRelationshipType.CONGRUENT_OR_EXCLUDES(), null, null);
242 248
		Synonym t1HomotypSynonym = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
243 249

  
244 250
		t1.addHomotypicSynonym(t1HomotypSynonym);
......
250 256
		Assert.assertTrue("taxon 2 must have no descriptions", t2.getDescriptions().size() == 0);
251 257

  
252 258
		//save
253
		UUID uuidSynonym = taxonService.save(t1HomotypSynonym).getUuid();
259
		taxonService.save(t1HomotypSynonym);
260
		taxonService.save(relatedTaxon);
261
		nameService.save(relatedName);
254 262

  
255 263
		//do it
256 264
		DeleteResult result = taxonNodeService.makeTaxonNodeASynonymOfAnotherTaxonNode

Also available in: Unified diff