Changeset 6409 for vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java

Timestamp:

07/23/15 12:59:01 (9 years ago)

Author:

Twan Goosen

Message:

Data roots are include via XInclude, file to include determined via property. Default build has not changed (now a profile called 'test-local'). Filtered (post-build) config files are now included in the distribution package instead of from source.
Fixes #746

File:

• vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) (3 diffs)

vlo/trunk/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java

@@ -21 +21 @@
 import java.io.StringWriter;
 import java.util.Arrays;
+import java.util.Properties;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
@@ -31 +32 @@
 
 /**
- * 
+ *
  * @author twagoo
  */
 public class VloConfigMarshallerTest {
     
+    private final static String VLO_CONFIG_FILE = "/VloConfig.xml";
     private final static Logger logger = LoggerFactory.getLogger(VloConfigMarshallerTest.class);
     private VloConfigMarshaller instance;
+    private Properties testProps;
     
     @Before
     public void setUp() throws Exception {
         instance = new VloConfigMarshaller();
+        testProps = new Properties();
+        testProps.load(getClass().getResourceAsStream("/vloconfig.properties"));
     }
 
@@ -49 +54 @@
     @Test
     public void testUnmarshal() throws Exception {
-        InputStream configFile = getClass().getResourceAsStream("/VloConfig.xml");
-        VloConfig config = instance.unmarshal(new StreamSource(configFile));
+        InputStream configFile = getClass().getResourceAsStream(VLO_CONFIG_FILE);
+        VloConfig config = instance.unmarshal(new StreamSource(configFile, getClass().getResource(VLO_CONFIG_FILE).toString()));
         configFile.close();
         
         assertNotNull(config);
-        assertEquals("http://localhost:8080/vlo-solr/core0/", config.getSolrUrl());
-        assertEquals(2, config.getDataRoots().size());
+        assertEquals(testProps.getProperty("solrUrl"), config.getSolrUrl());
         assertEquals(14, config.getFacetFields().size());
     }