Project

General

Profile

« Previous | Next » 

Revision 194492f7

Added by Cherian Mathew almost 9 years ago

  • ID 194492f79bb2fb5eca5b4a2a5a3b39b849be8c51
  • Parent 0312ac03

updated version in pom file to 7.4.4 and replaced usage of org.json with elemental.json
Two issues seen (needs more investigation) :

  • org.eclipse.jetty.io.EofException seen when accessing UI using jetty 9.0.0 M3 included in run-jetty-run (nightly)
  • d3 tree in concept relationship editor is really : could be due to change to elemental

View differences:

src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java
12 12 
import java.util.UUID;
13 13 

  		




  14
  14
  
    
import org.apache.log4j.Logger;


  		




  15
  
  
    
import org.json.JSONException;


  		




  16
  15
  
    
import org.junit.Assert;


  		




  17
  16
  
    
import org.junit.BeforeClass;


  		




  18
  17
  
    
import org.junit.Test;


  		




  ......




  44
  43
  
    

  		




  45
  44
  
    

  		




  46
  45
  
    
    @Test


  		




  47
  
  
    
    public void testRefreshRelationshipView() throws JSONException {


  		




  
  46
  
    
    public void testRefreshRelationshipView() {


  		




  48
  47
  
    
        UUID taxonUuid = UUID.fromString("5f713f69-e03e-4a11-8a55-700fbbf44805");


  		




  49
  48
  
    
        crp.refreshRelationshipView(new IdUuidName(30, taxonUuid, null), Direction.LEFT_RIGHT);


  		




  50
  49
  
    
        String expected = "{\"direction\":\"left-right\",\"name\":\"Taxon d\",\"children\":[{\"name\":\"Congruent to\",\"children\":[{\"name\":\"Taxon e\",\"uuid\":\"84e99e24-f50a-4726-92d0-6088430c492a\",\"type\":\"taxon\"}],\"uuid\":\"511f504b-ae3b-4f04-b7b9-35c222f06e10\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon a\",\"uuid\":\"eaac797e-cac7-4649-97cf-c7b580076895\",\"type\":\"taxon\"}],\"uuid\":\"0e8b7922-974d-4389-b71e-af6fc9f98c56\",\"type\":\"conceptr\"},{\"name\":\"Includes\",\"children\":[{\"name\":\"Taxon b\",\"uuid\":\"5004a8e7-b907-4744-b67e-44ccb057ab3b\",\"type\":\"taxon\"}],\"uuid\":\"6fd9947e-21c3-4190-8748-57d9661e8659\",\"type\":\"conceptr\"},{\"name\":\"Excludes\",\"children\":[{\"name\":\"Taxon c\",\"uuid\":\"3d71c8b8-3bec-4f5f-ba23-6f9d55ef84e9\",\"type\":\"taxon\"}],\"uuid\":\"cc761030-38d2-4b5d-954d-32329c0ea106\",\"type\":\"conceptr\"}],\"uuid\":\"5f713f69-e03e-4a11-8a55-700fbbf44805\",\"type\":\"taxon\"}";


  		












Also available in:  Unified diff