Project

General

Profile

« Previous | Next » 

Revision 59734b3b

Added by Andreas Müller almost 6 years ago

cleanup

View differences:

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

  
55 55
/**
56 56
 * @author n.hoffmann
57
 * @created Dec 16, 2010
57
 * @since Dec 16, 2010
58 58
 */
59 59
//@SpringApplicationContext("file:./target/test-classes/eu/etaxonomy/cdm/applicationContext-test.xml")
60 60
public class TaxonNodeServiceImplTest extends CdmTransactionalIntegrationTest{
......
134 134
		synonymType = CdmBase.deproxy(termService.load(SynonymType.uuidHomotypicSynonymOf), SynonymType.class) ;
135 135
		referenceDetail = "test";
136 136

  
137
		//
138 137
		//TODO
139 138

  
140
//		printDataSet(System.err, new String [] {"TaxonNode"});
141

  
142 139
		// descriptions
143 140
		t1 = node1.getTaxon();
144 141
		PolytomousKey polKey = PolytomousKey.NewInstance();
......
157 154
		UUID uuidSynonym = taxonService.save(synonym).getUuid();
158 155

  
159 156
		t1.addHomotypicSynonym(synonym);
160
		UUID uuidT1 = taxonService.saveOrUpdate(t1);
161
		t1 = null;
162
		t1 =(Taxon) taxonService.load(uuidT1);
157
		taxonService.saveOrUpdate(t1);
158
		t1 =(Taxon) taxonService.load(t1.getUuid());
163 159
		t1 = HibernateProxyHelper.deproxy(t1);
164 160
		TaxonName nameT1 = t1.getName();
165
		UUID t1UUID = t1.getUuid();
166 161
		t2 = node2.getTaxon();
167 162
		assertEquals(2, t1.getDescriptions().size());
168 163
		Assert.assertTrue(t2.getSynonyms().isEmpty());
169 164
		Assert.assertTrue(t2.getDescriptions().size() == 0);
170 165
		assertEquals(2,t1.getSynonyms().size());
171
		UUID synUUID = null;
172 166
		DeleteResult result;
173 167

  
174 168
		t4 = node4.getTaxon();
......
270 264
		assertNotNull("Old taxon should not have been deleted as it is referenced by key node", taxonService.find(t1Uuid));
271 265
		assertNull("Old taxon node should not exist anymore", taxonNodeService.find(node1Uuid));
272 266

  
273
		t1HomotypSynonym = (Synonym)taxonService.find(uuidSynonym);
267
		t1HomotypSynonym = (Synonym)taxonService.find(t1HomotypSynonym.getUuid());
274 268
		assertNotNull(t1HomotypSynonym);
275 269

  
276 270
		keyNode.setTaxon(null);
......
293 287
		name1 = nameService.find(name1UUID);
294 288
		assertNotNull("taxon name 1 should still exist", name1);
295 289
		assertEquals("... but being used for the new synonym only as taxon 1 is deleted", 1, name1.getTaxonBases().size());
296
		t1HomotypSynonym = (Synonym)taxonService.find(uuidSynonym);
290
		t1HomotypSynonym = (Synonym)taxonService.find(t1HomotypSynonym.getUuid());
297 291
		assertNotNull(t1HomotypSynonym);
298 292

  
299 293
		Synonym newSynonym =(Synonym) name1.getTaxonBases().iterator().next();
......
489 483
		treeNodes.add(node1);
490 484
		treeNodes.add(node2);
491 485

  
492
		DeleteResult result = taxonNodeService.deleteTaxonNodes(treeNodes, null);
493

  
486
		taxonNodeService.deleteTaxonNodes(treeNodes, null);
494 487

  
495 488
		newNode = taxonNodeService.load(uuidNewNode);
496 489
		node1 = taxonNodeService.load(node1Uuid);
......
689 682
            compareChildren(taxonNode.getChildNodes(), taxonNodeService.listChildNodesAsUuidAndTitleCache(foundMatch));
690 683
        }
691 684
    }
692

  
693
    private UuidAndTitleCache<TaxonNode> findMatchingUuidAndTitleCache(List<UuidAndTitleCache<TaxonNode>> childNodesUuidAndTitleCache,
694
            UuidAndTitleCache<TaxonNode> foundMatch, TaxonNode taxonNode) {
695
        for (UuidAndTitleCache<TaxonNode> uuidAndTitleCache : childNodesUuidAndTitleCache) {
696
            if(uuidAndTitleCache.getUuid().equals(taxonNode.getUuid())){
697
                String titleCache = taxonNode.getTaxon().getTitleCache();
698
                if(uuidAndTitleCache.getTitleCache().equals(titleCache)){
699
                    foundMatch = uuidAndTitleCache;
700
                    break;
701
                }
702
            }
703
        }
704
        return foundMatch;
705
    }
685
//
686
//    private UuidAndTitleCache<TaxonNode> findMatchingUuidAndTitleCache(List<UuidAndTitleCache<TaxonNode>> childNodesUuidAndTitleCache,
687
//            UuidAndTitleCache<TaxonNode> foundMatch, TaxonNode taxonNode) {
688
//        for (UuidAndTitleCache<TaxonNode> uuidAndTitleCache : childNodesUuidAndTitleCache) {
689
//            if(uuidAndTitleCache.getUuid().equals(taxonNode.getUuid())){
690
//                String titleCache = taxonNode.getTaxon().getTitleCache();
691
//                if(uuidAndTitleCache.getTitleCache().equals(titleCache)){
692
//                    foundMatch = uuidAndTitleCache;
693
//                    break;
694
//                }
695
//            }
696
//        }
697
//        return foundMatch;
698
//    }
706 699

  
707 700
    @Test
708 701
    @DataSet("TaxonNodeServiceImplTest.testSetSecundumForSubtree.xml")

Also available in: Unified diff