diff --git a/src/main/java/org/gcube/accounting/persistence/PersistenceConfiguration.java b/src/main/java/org/gcube/accounting/persistence/PersistenceConfiguration.java index 57f045c..5563aac 100644 --- a/src/main/java/org/gcube/accounting/persistence/PersistenceConfiguration.java +++ b/src/main/java/org/gcube/accounting/persistence/PersistenceConfiguration.java @@ -124,7 +124,7 @@ public class PersistenceConfiguration { Group accessPoints = serviceEndpoint.profile().accessPoints(); for(AccessPoint accessPoint : accessPoints){ persistenceConfiguration.uri = new URI(accessPoint.address()); - persistenceConfiguration.username = accessPoint.name(); + persistenceConfiguration.username = accessPoint.username(); String encryptedPassword = accessPoint.password(); String password = decrypt(encryptedPassword, key); @@ -146,6 +146,5 @@ public class PersistenceConfiguration { ServiceEndpoint serviceEndpoint = getServiceEndpoint(scope, persistenceClassName); return createPersistenceConfiguration(serviceEndpoint, key); } - - + } diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceConfigurationTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceConfigurationTest.java index b174922..92b3fcf 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceConfigurationTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceConfigurationTest.java @@ -4,6 +4,7 @@ package org.gcube.accounting.persistence; import java.io.StringWriter; +import java.net.URL; import java.security.Key; import java.util.Arrays; import java.util.List; @@ -25,6 +26,7 @@ import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.gcube.resources.discovery.icclient.ICFactory; +import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -186,7 +188,7 @@ public class PersistenceConfigurationTest { } @Test - public void testPersistenceFromIS() throws Exception{ + public void testPersistenceConfigurationFromIS() throws Exception{ boolean createResource = false; ServiceEndpoint serviceEndpoint = null; if(createResource){ @@ -198,7 +200,13 @@ public class PersistenceConfigurationTest { try { String keyName = "devsec.gcubekey"; Key key = SymmetricKey.getKey(System.getProperty(PersistenceTest.HOME_SYSTEM_PROPERTY)+ "/" + keyName); - PersistenceConfiguration.getPersistenceConfiguration(GCUBE_DEVSEC_SCOPE, COUCHDB_CLASS_NAME, key); + PersistenceConfiguration persitenceConfiguration = PersistenceConfiguration.getPersistenceConfiguration(GCUBE_DEVSEC_SCOPE, COUCHDB_CLASS_NAME, key); + if(createResource){ + Assert.assertTrue(persitenceConfiguration.getUri().toURL().equals(new URL(RUNNING_ON))); + Assert.assertTrue(persitenceConfiguration.getUsername().compareTo(FAKE_USERNAME)==0); + Assert.assertTrue(persitenceConfiguration.getPassword().compareTo(FAKE_PASSWORD)==0); + Assert.assertTrue(persitenceConfiguration.getProperty(DB_NAME_PROPERTY_NAME).compareTo(DB_NAME_PROPERTY_VALUE)==0); + } } finally { if(createResource){ unPublishScopedResource(serviceEndpoint);