Project

General

Profile

« Previous | Next » 

Revision 1d066036

Added by Cherian Mathew about 9 years ago

StatusComposite, IStatusComposite : added font awesome refresh icon, updated checkbox generator
CdmSQLContainer : added methods to disable change ebents and possiblity to add items
LeafNodeTaxonContainer : corrected and split queris for taxon and synonyms
StatusPresenter : moving filter / query logic to container
StatusEditorUI : using new edit theme
CdmQueryFactory : new factory for sql queries
StatusPresenterTest, StatusPresenterTest : added tests for loading synonyms

View differences:

src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java
56 56 
            String taxon = (String)item.getItemProperty("Name").getValue();
57 57 
            logger.info("taxon : " + taxon);
58 58 
        }
59 
        Assert.assertEquals(4,itemIds.size());
59 
        Assert.assertEquals(3,itemIds.size());
60 60 

  		




  61
  61
  
    
        sp.setUnplacedFilter();


  		




  62
  62
  
    
        itemIds = container.getItemIds();


  		




  ......




  64
  64
  
    

  		




  65
  65
  
    
        sp.removeUnplacedFilter();


  		




  66
  66
  
    
        itemIds = container.getItemIds();


  		




  67
  
  
    
        Assert.assertEquals(4,itemIds.size());


  		




  
  67
  
    
        Assert.assertEquals(3,itemIds.size());


  		




  68
  68
  
    

  		




  69
  69
  
    
        sp.setNameFilter("Taxon A");


  		




  70
  70
  
    
        itemIds = container.getItemIds();


  		




  71
  71
  
    
        Assert.assertEquals(1,itemIds.size());


  		




  
  72
  
    

  		




  
  73
  
    

  		




  
  74
  
    
    }


  		




  
  75
  
    

  		




  
  76
  
    
    @Test


  		




  
  77
  
    
    public void testLoadSynonyms() throws SQLException {


  		




  
  78
  
    
        LeafNodeTaxonContainer container = sp.loadTaxa(11);


  		




  
  79
  
    
        container.refresh();


  		




  
  80
  
    
        Collection<?> rootItemIds = container.rootItemIds();


  		




  
  81
  
    
        Assert.assertEquals(3,rootItemIds.size());


  		




  
  82
  
    

  		




  
  83
  
    
        Collection<?> childIds = container.getChildren(10);


  		




  
  84
  
    
        Assert.assertEquals(2, childIds.size());


  		




  
  85
  
    

  		




  
  86
  
    
        // FIXME : Need to check why these calls thorw a NPE


  		




  
  87
  
    
        // in the case of h2


  		




  
  88
  
    
        //Assert.assertEquals(true, container.areChildrenAllowed(10));


  		




  
  89
  
    
        //Assert.assertEquals(false, container.areChildrenAllowed(11));


  		




  72
  90
  
    
    }


  		




  73
  91
  
    

  		




  74
  92
  
    
    @Ignore


  		












Also available in:  Unified diff