Project

General

Profile

« Previous | Next » 

Revision da3cc7e3

Added by Cherian Mathew over 8 years ago

Correct properties file load and server info test

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java
33 33 

  		




  34
  34
  
    
import org.apache.log4j.Logger;


  		




  35
  35
  
    
import org.eclipse.core.runtime.FileLocator;


  		




  36
  
  
    
import org.eclipse.core.runtime.Platform;


  		




  37
  
  
    
import org.osgi.framework.Bundle;


  		




  38
  36
  
    
import org.springframework.core.io.ClassPathResource;


  		




  39
  37
  
    
import org.springframework.core.io.Resource;


  		




  40
  38
  
    
import org.unitils.database.annotations.TestDataSource;


  		




  ......




  92
  90
  
    
    private File dataSourcesFile;


  		




  93
  91
  
    
    private final String dataSourceName;


  		




  94
  92
  
    

  		




  95
  
  
    
    public CDMServer(String dataSourceName) throws CDMServerException {


  		




  
  93
  
    
    public CDMServer(String dataSourceName, URL serverPropertiesURL) throws CDMServerException {


  		




  96
  94
  
    
        this.dataSourceName = dataSourceName;


  		




  97
  95
  
    
        Properties prop = new Properties();


  		




  98
  96
  
    

  		




  99
  
  
    
        Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.cdmlib");


  		




  100
  
  
    
        URL serverPropertiesURL = bundle.getEntry("src/test/resources/server.properties");


  		




  101
  
  
    

  		




  102
  97
  
    
        try {


  		




  103
  98
  
    
            File serverPropertiesFile = new File(FileLocator.resolve(serverPropertiesURL).toURI());


  		




  104
  99
  
    
            InputStream inputStream = new FileInputStream(serverPropertiesFile);


  		




  105
  100
  
    

  		




  106
  
  
    
            if (inputStream != null) {


  		




  107
  
  
    
                prop.load(inputStream);


  		




  108
  
  
    
                inputStream.close();


  		




  109
  
  
    
            }


  		




  
  101
  
    
            prop.load(inputStream);


  		




  
  102
  
    
            inputStream.close();


  		




  
  103
  
    

  		




  110
  104
  
    
        } catch (FileNotFoundException e) {


  		




  111
  105
  
    
            throw new CDMServerException(e);


  		




  112
  106
  
    
        } catch (URISyntaxException e) {


  		












Also available in:  Unified diff