Project

General

Profile

« Previous | Next » 

Revision de8249cf

Added by Andreas Müller over 3 years ago

ref #9114 add URI Wrapper and replace all java.net.URI occurrences by the wrapper in cdmlib

View differences:

cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java
35 35 
import eu.etaxonomy.cdm.api.service.INameService;
36 36 
import eu.etaxonomy.cdm.api.service.ITaxonService;
37 37 
import eu.etaxonomy.cdm.api.service.ITermService;
38 
import eu.etaxonomy.cdm.common.URI;
38 39 
import eu.etaxonomy.cdm.io.common.CdmApplicationAwareDefaultImport;
39 40 
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
40 41 
import eu.etaxonomy.cdm.model.common.CdmBase;
......
90 91 
		String inputFile = "/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest-input.xls";
91 92 
		URL url = this.getClass().getResource(inputFile);
92 93 
	 	assertNotNull("URL for the test file '" + inputFile + "' does not exist", url);
93 
		configurator = NormalExplicitImportConfigurator.NewInstance(url.toURI(), null, NomenclaturalCode.ICNAFP, null);
94 
		configurator = NormalExplicitImportConfigurator.NewInstance(URI.fromUrl(url), null, NomenclaturalCode.ICNAFP, null);
94 95 
		assertNotNull("Configurator could not be created", configurator);
95 96 

  		




  96
  97
  
    
		inputFile = "/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.testUuid-input.xls";


  		




  97
  98
  
    
		url = this.getClass().getResource(inputFile);


  		




  98
  99
  
    
	 	assertNotNull("URL for the test file '" + inputFile + "' does not exist", url);


  		




  99
  
  
    
		uuidConfigurator = NormalExplicitImportConfigurator.NewInstance(url.toURI(), null, NomenclaturalCode.ICNAFP, null);


  		




  
  100
  
    
		uuidConfigurator = NormalExplicitImportConfigurator.NewInstance(URI.fromUrl(url), null, NomenclaturalCode.ICNAFP, null);


  		




  100
  101
  
    
		assertNotNull("Configurator could be created", configurator);


  		




  101
  102
  
    

  		




  102
  103
  
    
		String inputFileXslx = "/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest-input.xlsx";


  		




  103
  104
  
    
		url = this.getClass().getResource(inputFileXslx);


  		




  104
  105
  
    
	 	assertNotNull("URL for the test file '" + inputFileXslx + "' does not exist", url);


  		




  105
  
  
    
		configuratorXslx = NormalExplicitImportConfigurator.NewInstance(url.toURI(), null, NomenclaturalCode.ICNAFP, null);


  		




  
  106
  
    
		configuratorXslx = NormalExplicitImportConfigurator.NewInstance(URI.fromUrl(url), null, NomenclaturalCode.ICNAFP, null);


  		




  106
  107
  
    
		assertNotNull("Configurator could not be created", configuratorXslx);


  		




  107
  108
  
    

  		




  108
  109
  
    
		String inputFileTropicos = "/eu/etaxonomy/cdm/io/excel/taxa/ExcelTropicosImportExampleTest-input.xlsx";


  		




  109
  110
  
    
        url = this.getClass().getResource(inputFileTropicos);


  		




  110
  111
  
    
        assertNotNull("URL for the test file '" + inputFileTropicos + "' does not exist", url);


  		




  111
  
  
    
        configuratorTropicos = NormalExplicitImportConfigurator.NewInstance(url.toURI(), null, NomenclaturalCode.ICNAFP, null);


  		




  
  112
  
    
        configuratorTropicos = NormalExplicitImportConfigurator.NewInstance(URI.fromUrl(url), null, NomenclaturalCode.ICNAFP, null);


  		




  112
  113
  
    
        assertNotNull("Configurator could not be created", configuratorTropicos);


  		




  113
  114
  
    
	}


  		




  114
  115
  
    

  		












Also available in:  Unified diff