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/NameServiceImplTest.java
112 112
        name1.addRelationshipToName(nameWithBasionym,nameRelType , null, null, null);
113 113
//		nameWithBasionym.addBasionym(name1);
114 114
        nameService.save(name1);
115
        nameService.save(nameWithBasionym);
115 116
        commitAndStartNewTransaction(tableNames);
116 117

  
117 118

  
......
155 156
        NameRelationshipType nameRelType = (NameRelationshipType)termService.find(NameRelationshipType.BASIONYM().getUuid());
156 157
        name1.addRelationshipToName(nameWithBasionym,nameRelType , null, null, null);
157 158
        nameService.save(name1);
159
        nameService.save(nameWithBasionym);
158 160
        commitAndStartNewTransaction(tableNames);
159 161
        NameDeletionConfigurator config = new NameDeletionConfigurator();
160 162

  
......
191 193
        NameRelationshipType nameRelType = (NameRelationshipType)termService.find(NameRelationshipType.BASIONYM().getUuid());
192 194
        name1.addRelationshipToName(nameWithBasionym,nameRelType , null, null, null);
193 195
        nameService.save(name1);
196
        nameService.save(nameWithBasionym);
194 197
        commitAndStartNewTransaction(tableNames);
195 198
        NameDeletionConfigurator config = new NameDeletionConfigurator();
196 199

  
......
227 230
        NameRelationshipType nameRelType = (NameRelationshipType)termService.find(NameRelationshipType.BASIONYM().getUuid());
228 231
        basionym.addRelationshipToName(name1,nameRelType , null, null, null);
229 232
        nameService.save(name1);
233
        nameService.save(basionym);
230 234
        commitAndStartNewTransaction(tableNames);
231 235
        NameDeletionConfigurator config = new NameDeletionConfigurator();
232 236
        config.setIgnoreHasBasionym(false);
......
270 274
        HybridRelationshipType relType = (HybridRelationshipType)termService.find(HybridRelationshipType.FIRST_PARENT().getUuid());
271 275
        name1.addHybridParent(parent, relType, null);
272 276
        nameService.save(name1);
277
        nameService.save(parent);
273 278
        commitAndStartNewTransaction(tableNames); //otherwise first save is rolled back with following failing delete
274 279
        Assert.assertEquals("'Parent' should be a parent in a hybrid relation.", 1,parent.getHybridParentRelations().size());
275
//		printDataSet(System.out, tableNames);
276 280

  
277 281
        //parent
278 282

  
279
         name1 = nameService.find(name1.getUuid());
280
         DeleteResult result = nameService.delete(name1);
281
         if (result.isError()){
283
        name1 = nameService.find(name1.getUuid());
284
        DeleteResult result = nameService.delete(name1);
285
        if (result.isError()){
282 286
            Assert.fail("Delete should throw NO exception when deleting a hybrid child: " + result.getExceptions().iterator().next().getMessage());
283 287
        }
284 288
        commitAndStartNewTransaction(tableNames);
......
291 295
        name1 = TaxonNameFactory.NewBotanicalInstance(getSpeciesRank());
292 296
        name1.addHybridChild(child, relType, null);
293 297
        nameService.save(name1);
298
        nameService.save(child);
294 299
        commitAndStartNewTransaction(tableNames);
295 300

  
296 301

  

Also available in: Unified diff