Ignore:
Timestamp:
02/13/14 10:54:47 (10 years ago)
Author:
twagoo
Message:

turned VloConfig? into a POJO, created factory interface so that multiple ways. Adapted importer and web app to use this - importer still using static (but project-local) config references

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.0/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java

    r4199 r4507  
    22
    33import eu.clarin.cmdi.vlo.FacetConstants;
    4 import eu.clarin.cmdi.vlo.config.VloConfig;
    54import java.io.File;
    65import java.util.ArrayList;
    … …  
    1312import static org.junit.Assert.assertNotNull;
    1413import static org.junit.Assert.assertTrue;
    15 import org.junit.Before;
    1614import org.junit.Test;
    1715
    … …  
    2624       
    2725        // make sure the mapping file for testing is used
    28         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     26        config.setFacetConceptsFile("/facetConceptsTest.xml");
    2927
    3028        String content = "";
    … …  
    9088       
    9189        // make sure the mapping file for testing is used
    92         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     90        config.setFacetConceptsFile("/facetConceptsTest.xml");
    9391
    9492        String content = "";
    … …  
    415413       
    416414        // make sure the mapping file for testing is used
    417         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     415        config.setFacetConceptsFile("/facetConceptsTest.xml");
    418416
    419417        String content = "";
    … …  
    444442       
    445443        // make sure the mapping file for testing is used
    446         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     444        config.setFacetConceptsFile("/facetConceptsTest.xml");
    447445
    448446        String content = "";
    … …  
    536534
    537535        // make sure the mapping file for testing is used
    538         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     536        config.setFacetConceptsFile("/facetConceptsTest.xml");
    539537
    540538        String content = "";
    … …  
    622620       
    623621        // make sure the mapping file for testing is used
    624         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     622        config.setFacetConceptsFile("/facetConceptsTest.xml");
    625623
    626624        String content = "";
    … …  
    717715       
    718716        // make sure the mapping file for testing is used
    719         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     717        config.setFacetConceptsFile("/facetConceptsTest.xml");
    720718
    721719        String content = "";
    … …  
    743741       
    744742        // make sure the mapping file for testing is used
    745         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     743        config.setFacetConceptsFile("/facetConceptsTest.xml");
    746744
    747745        String content = "";
    … …  
    769767       
    770768        // make sure the mapping file for testing is used
    771         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     769        config.setFacetConceptsFile("/facetConceptsTest.xml");
    772770
    773771        String content = "";
    … …  
    800798       
    801799        // make sure the mapping file for testing is used
    802         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     800        config.setFacetConceptsFile("/facetConceptsTest.xml");
    803801
    804802        String content = "";
    … …  
    852850       
    853851        // make sure the mapping file for testing is used
    854         VloConfig.setFacetConceptsFile("/facetConceptsTest.xml");
     852        config.setFacetConceptsFile("/facetConceptsTest.xml");
    855853
    856854        String content = "";
Note: See TracChangeset for help on using the changeset viewer.