gCubeSystem
/
accounting-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #200: Create accouting-lib library 

https://support.d4science.org/issues/200
Fixing tests

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117009 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-07-06 10:36:41 +00:00
parent 92d6313635
commit 317b72c11a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/gcube/accounting/persistence/PersistenceConfiguration.java
View File

@ -124,7 +124,7 @@ public class PersistenceConfiguration {
Group<AccessPoint> 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);
}
}

12
src/test/java/org/gcube/accounting/persistence/PersistenceConfigurationTest.java
View File

@ -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);