Merge branch 'researchImport' into develop

* researchImport:
  changed remote lookup in test
This commit is contained in:
Emil Siverhall 2012-02-15 12:39:24 +01:00
commit 05c8df7ff6

@ -118,7 +118,7 @@ public class TestDeployConfiguration {
public void testRemoteLookupUrlCfg() throws XPathExpressionException, IOException{
InputSource applicationContextXml = getInputSource(applicationContextPath);
XPath xPath = getApplicationContextXPath();
Assert.assertEquals("https://api.dsv.su.se", xPath.evaluate("/beanNS:beans/beanNS:bean[@id='applicationSettings']/beanNS:property[@name='remoteLookupUrl']/@value", applicationContextXml));
Assert.assertEquals("https://api.dsv.su.se/rest", xPath.evaluate("/beanNS:beans/beanNS:bean[@id='applicationSettings']/beanNS:property[@name='remoteLookupUrl']/@value", applicationContextXml));
}
@Test
public void testRemoteLookupUserCfg() throws XPathExpressionException, IOException{