diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 23ec7c18fb..1814106fe5 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -82,6 +82,8 @@ jobs: RODA_CORE_SOLR_TYPE: CLOUD RODA_CORE_SOLR_CLOUD_URLS: localhost:2181 SIEGFRIED_MODE: standalone + LDAP_SERVER_URL: ldap://localhost + LDAP_SERVER_PORT: 1389 - name: Package run: mvn $MAVEN_CLI_OPTS -Dmaven.test.skip=true package @@ -90,3 +92,5 @@ jobs: RODA_CORE_SOLR_TYPE: CLOUD RODA_CORE_SOLR_CLOUD_URLS: localhost:2181 SIEGFRIED_MODE: standalone + LDAP_SERVER_URL: ldap://localhost + LDAP_SERVER_PORT: 1389 diff --git a/roda-core/roda-core-tests/src/main/java/org/roda/core/common/ConfigurationManagerTest.java b/roda-core/roda-core-tests/src/main/java/org/roda/core/common/ConfigurationManagerTest.java index ae5e7af132..4822805540 100644 --- a/roda-core/roda-core-tests/src/main/java/org/roda/core/common/ConfigurationManagerTest.java +++ b/roda-core/roda-core-tests/src/main/java/org/roda/core/common/ConfigurationManagerTest.java @@ -186,18 +186,4 @@ public void testGetConfigurationFile() throws IOException { configurationFilePath.toString()); } - @Test - public void testGetConfigurationFileAsStream() throws IOException { - // set up - Path configPath = configurationManager.getConfigPath(); - Files.createDirectories(configPath); - String configurationFile = "roda-wui.properties"; - Path configurationFilePath = Files.createFile(configPath.resolve(configurationFile)); - - // check if input stream is not null - InputStream configurationFileAsStream = configurationManager - .getConfigurationFileAsStream(configurationFilePath.toString()); - Assert.assertNotNull(configurationFileAsStream); - } - } diff --git a/roda-core/roda-core/src/main/java/org/roda/core/model/utils/LdapUtility.java b/roda-core/roda-core/src/main/java/org/roda/core/model/utils/LdapUtility.java index 5558a0f22d..8fb22ea6e0 100644 --- a/roda-core/roda-core/src/main/java/org/roda/core/model/utils/LdapUtility.java +++ b/roda-core/roda-core/src/main/java/org/roda/core/model/utils/LdapUtility.java @@ -210,11 +210,11 @@ public void initialize(RodaConstants.NodeType nodeType) throws Exception { this.rodaAdministratorsDN = configuration.getString("core.ldap.rodaAdministratorsDN", "cn=administrators,ou=groups,dc=roda,dc=org"); - final String ldapUrl = configuration.getString("core.ldap.url", RodaConstants.CORE_LDAP_DEFAULT_URL); - final int ldapPort = configuration.getInt("core.ldap.port", RodaConstants.CORE_LDAP_DEFAULT_PORT); - final String ldapAdminPassword = configuration.getString("core.ldap.adminPassword", "roda"); - if (nodeType != RodaConstants.NodeType.TEST) { + final String ldapUrl = configuration.getString("core.ldap.url", RodaConstants.CORE_LDAP_DEFAULT_URL); + final int ldapPort = configuration.getInt("core.ldap.port", RodaConstants.CORE_LDAP_DEFAULT_PORT); + final String ldapAdminPassword = configuration.getString("core.ldap.adminPassword", "roda"); + LdapContextSource contextSource = new LdapContextSource(); contextSource.setUrl(ldapUrl + ":" + ldapPort); contextSource.setBase(ldapRootDN);