Project

General

Profile

« Previous | Next » 

Revision 1a10708d

Added by Andreas Müller over 7 years ago

Add circular check for homotypicgouptaxon comparator #3338

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparator.java
213 213 
            return 1;
214 214 
        }
215 215 

  		




  216
  
  
    
        if (getReplacedSynonymClosure(basionym1).contains(basionym2)){


  		




  
  216
  
    
        boolean basio2IsReplacedSynForBasio1 = getReplacedSynonymClosure(basionym1).contains(basionym2);


  		




  
  217
  
    
        boolean basio1IsReplacedSynForBasio2 = getReplacedSynonymClosure(basionym2).contains(basionym1);


  		




  
  218
  
    

  		




  
  219
  
    
        if (basio2IsReplacedSynForBasio1 && !basio1IsReplacedSynForBasio2){


  		




  217
  220
  
    
            return 1;


  		




  218
  
  
    
        }else if (getReplacedSynonymClosure(basionym2).contains(basionym1)){


  		




  
  221
  
    
        }else if (basio1IsReplacedSynForBasio2){  //&& !basio2IsReplacedSynForBasio1


  		




  219
  222
  
    
            return -1;


  		




  220
  223
  
    
        }


  		




  221
  224
  
    

  		












  

    
      cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/HomotypicGroupTaxonComparatorTest.java
    
  





  326
  326
  
    
    }


  		




  327
  327
  
    

  		




  328
  328
  
    
    @Test


  		




  329
  
  
    
    public void testCompare_NoCircularProblems() {


  		




  
  329
  
    
    public void testCompare_NoCircularProblemsWithBasionyms() {


  		




  
  330
  
    
        //TODO not yet fully implemented


  		




  330
  331
  
    

  		




  331
  332
  
    
        taxon1.addHomotypicSynonymName(botName3, null, null);


  		




  332
  333
  
    
        taxon1.addHomotypicSynonymName(botName5, null, null);


  		




  ......




  340
  341
  
    
        botName5.addBasionym(botName1);


  		




  341
  342
  
    
        botName1.addBasionym(botName3);


  		




  342
  343
  
    

  		




  
  344
  
    
        list.addAll(taxon1.getSynonyms());


  		




  
  345
  
    
        list.add(taxon1);


  		




  
  346
  
    
        Collections.sort(list, new HomotypicGroupTaxonComparator(null));


  		




  
  347
  
    

  		




  
  348
  
    
//        Assert.assertEquals(botName1, list.get(0).getName());


  		




  
  349
  
    
//        Assert.assertEquals(botName3, list.get(1).getName());


  		




  
  350
  
    
//        Assert.assertEquals(botName5, list.get(2).getName());


  		




  
  351
  
    

  		




  
  352
  
    
    }


  		




  
  353
  
    

  		




  
  354
  
    
    @Test


  		




  
  355
  
    
    public void testCompare_NoCircularProblemsWithReplacedSynonyms() {


  		




  
  356
  
    

  		




  
  357
  
    
        taxon1.addHomotypicSynonymName(botName3, null, null);


  		




  
  358
  
    
        taxon1.addHomotypicSynonymName(botName5, null, null);


  		




  
  359
  
    
        botName3.addReplacedSynonym(botName5, null, null, null);


  		




  
  360
  
    

  		




  
  361
  
    
        Assert.assertEquals(botName1.getHomotypicalGroup(), botName5.getHomotypicalGroup());


  		




  
  362
  
    
        botName5.addReplacedSynonym(botName1, null, null, null);


  		




  
  363
  
    
        botName1.addReplacedSynonym(botName3, null, null, null);


  		




  
  364
  
    

  		




  
  365
  
    
        list.addAll(taxon1.getSynonyms());


  		




  
  366
  
    
        list.add(taxon1);


  		




  343
  367
  
    
        Collections.sort(list, new HomotypicGroupTaxonComparator(null));


  		




  344
  368
  
    

  		




  
  369
  
    
        Assert.assertEquals(botName1, list.get(0).getName());


  		




  
  370
  
    
        Assert.assertEquals(botName3, list.get(1).getName());


  		




  
  371
  
    
        Assert.assertEquals(botName5, list.get(2).getName());


  		




  
  372
  
    

  		




  
  373
  
    

  		




  345
  374
  
    
    }


  		




  346
  375
  
    

  		




  347
  376
  
    
}


  		












Also available in:  Unified diff