diff --git a/pom.xml b/pom.xml index a8684e4..9a53c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,24 +41,6 @@ - - org.gcube.accounting - accounting-lib - [2.1.0-SNAPSHOT, 3.0.0-SNAPSHOT) - test - - - org.gcube.core - common-encryption - [1.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - test - - - org.gcube.resources - registry-publisher - [1.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - test - junit junit @@ -71,6 +53,7 @@ 1.0.13 test + diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java deleted file mode 100644 index 402678d..0000000 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java +++ /dev/null @@ -1,134 +0,0 @@ -/** - * - */ -package org.gcube.accounting.persistence; - -import java.io.StringWriter; -import java.util.Calendar; -import java.util.concurrent.TimeUnit; - -import org.gcube.accounting.datamodel.BasicUsageRecord; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.resources.gcore.Resource; -import org.gcube.common.resources.gcore.Resources; -import org.gcube.common.resources.gcore.ServiceEndpoint; -import org.gcube.documentstore.persistence.PersistenceBackend; -import org.gcube.documentstore.persistence.PersistenceBackendFactory; -import org.gcube.documentstore.persistence.PersistenceCouchBase; -import org.gcube.informationsystem.publisher.RegistryPublisher; -import org.gcube.informationsystem.publisher.RegistryPublisherFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ - * - */ -public class PersistenceCouchBaseTest { - - private static final Logger logger = LoggerFactory.getLogger(PersistenceCouchBaseTest.class); - - public static final long timeout = 5000; - public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS; - - - @Before - public void before() throws Exception{ - SecurityTokenProvider.instance.set(TestUtility.TOKEN); - } - - @After - public void after(){ - SecurityTokenProvider.instance.reset(); - } - - public static PersistenceBackend getPersistence(){ - PersistenceBackendFactory.setFallbackLocation(null); - return PersistenceBackendFactory.getPersistenceBackend(BasicUsageRecord.getScopeFromToken()); - } - - @Test - public void persistenceIsCouchBase() { - PersistenceBackend persistence = getPersistence(); - Assert.assertTrue(persistence instanceof PersistenceCouchBase); - } - - private static void publishResource(Resource resource) throws Exception { - StringWriter stringWriter = new StringWriter(); - Resources.marshal(resource, stringWriter); - - RegistryPublisher registryPublisher = RegistryPublisherFactory.create(); - - try { - logger.debug("Trying to publish to {}:\n{}", BasicUsageRecord.getScopeFromToken(), stringWriter); - registryPublisher.create(resource); - } catch (Exception e) { - logger.error("The resource was not published", e); - throw e; - } - } - - private static void unPublishResource(Resource resource) throws Exception { - //StringWriter stringWriter = new StringWriter(); - //Resources.marshal(resource, stringWriter); - - RegistryPublisher registryPublisher = RegistryPublisherFactory.create(); - - String id = resource.id(); - logger.debug("Trying to remove {} with ID {} from {}", - resource.getClass().getSimpleName(), id, - BasicUsageRecord.getScopeFromToken()); - - registryPublisher.remove(resource); - - logger.debug("{} with ID {} removed successfully", resource.getClass().getSimpleName(), id); - } - - public void testScopeRecheck() throws Exception { - ServiceEndpoint serviceEndpoint = null; - try { - AccountingPersistenceConfiguration persitenceConfiguration = new AccountingPersistenceConfiguration(PersistenceCouchBase.class); - serviceEndpoint = persitenceConfiguration.getServiceEndpoint( - AccountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY, - AccountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME, - PersistenceCouchBase.class); - unPublishResource(serviceEndpoint); - }catch(IndexOutOfBoundsException e){ - SecurityTokenProvider.instance.set(TestUtility.PARENT_TOKEN); - AccountingPersistenceConfiguration persitenceConfiguration = new AccountingPersistenceConfiguration(PersistenceCouchBase.class); - serviceEndpoint = persitenceConfiguration.getServiceEndpoint( - AccountingPersistenceConfiguration.SERVICE_ENDPOINT_CATEGORY, AccountingPersistenceConfiguration.SERVICE_ENDPOINT_NAME, - PersistenceCouchBase.class); - SecurityTokenProvider.instance.set(TestUtility.TOKEN); - } - - long startTime = Calendar.getInstance().getTimeInMillis(); - long endTime = startTime; - while(endTime <= (startTime + 10*1000)){ // 10 sec - endTime = Calendar.getInstance().getTimeInMillis(); - } - - logger.debug("Going to check First Time"); - PersistenceBackend first = PersistenceBackendFactory.getPersistenceBackend(BasicUsageRecord.getScopeFromToken()); - logger.debug("First {} : {}", PersistenceBackend.class.getSimpleName(), first); - - publishResource(serviceEndpoint); - - startTime = Calendar.getInstance().getTimeInMillis(); - endTime = startTime; - while(endTime <= (startTime + (PersistenceBackendFactory.FALLBACK_RETRY_TIME + 100))){ - endTime = Calendar.getInstance().getTimeInMillis(); - } - - logger.debug("Going to check Second Time"); - PersistenceBackend second = PersistenceBackendFactory.getPersistenceBackend(BasicUsageRecord.getScopeFromToken()); - logger.debug("Second {} : {}", PersistenceBackend.class.getSimpleName(), second); - - Assert.assertNotEquals(first, second); - - } -} diff --git a/src/test/java/org/gcube/accounting/persistence/TestUtility.java b/src/test/java/org/gcube/accounting/persistence/TestUtility.java deleted file mode 100644 index 6f5fbee..0000000 --- a/src/test/java/org/gcube/accounting/persistence/TestUtility.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * - */ -package org.gcube.accounting.persistence; - -import java.io.StringWriter; - -import org.gcube.common.authorization.client.Constants; -import org.gcube.common.authorization.library.AuthorizationEntry; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.resources.gcore.Resource; -import org.gcube.common.resources.gcore.Resources; -import org.gcube.informationsystem.publisher.RegistryPublisher; -import org.gcube.informationsystem.publisher.RegistryPublisherFactory; -import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ - * - */ -public class TestUtility { - - public static final String TOKEN = ""; - public static final String PARENT_TOKEN = ""; - - /** - * Logger - */ - private static Logger logger = LoggerFactory.getLogger(TestUtility.class); - - public static String getScopeFromToken(){ - String token = SecurityTokenProvider.instance.get(); - AuthorizationEntry authorizationEntry; - try { - authorizationEntry = Constants.authorizationService().get(token); - } catch (Exception e) { - throw new RuntimeException(e); - } - String scope = authorizationEntry.getContext(); - return scope; - } - - /** - * Publish the provided resource on current scope - * @param resource to be published - * @throws RegistryNotFoundException if the Registry is not found so the - * resource has not be published - */ - public static void publishResource(Resource resource) throws Exception { - StringWriter stringWriter = new StringWriter(); - Resources.marshal(resource, stringWriter); - - RegistryPublisher registryPublisher = RegistryPublisherFactory.create(); - - try { - logger.debug("Trying to publish to {}:\n{}", getScopeFromToken(), stringWriter); - registryPublisher.create(resource); - } catch (Exception e) { - logger.error("The resource was not published", e); - throw e; - } - } - - /** - * Remove the resource from IS from curretn scope - * @param resource to be unpublished - * @throws RegistryNotFoundException if the Registry is not found so the - * resource has not be published - */ - public static void unPublishResource(Resource resource) throws Exception { - //StringWriter stringWriter = new StringWriter(); - //Resources.marshal(resource, stringWriter); - - RegistryPublisher registryPublisher = RegistryPublisherFactory.create(); - - String id = resource.id(); - logger.debug("Trying to remove {} with ID {} from {}", resource.getClass().getSimpleName(), id, getScopeFromToken()); - - registryPublisher.remove(resource); - - logger.debug("{} with ID {} removed successfully", resource.getClass().getSimpleName(), id); - } - -} diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java deleted file mode 100644 index 78f7446..0000000 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * - */ -package org.gcube.documentstore.persistence; - -import java.net.URL; - -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; -import org.gcube.accounting.persistence.TestUtility; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.documentstore.records.Record; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.couchbase.client.deps.com.fasterxml.jackson.databind.JsonNode; - -/** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ - * - */ -public class PersistenceCouchBaseTest { - - private static final Logger logger = LoggerFactory.getLogger(PersistenceCouchBaseTest.class); - - @Before - public void before() throws Exception{ - SecurityTokenProvider.instance.set(TestUtility.TOKEN); - } - - @After - public void after(){ - SecurityTokenProvider.instance.reset(); - } - - @Test - public void testJsonNodeUsageRecordConversions() throws Exception { - Record record = TestUsageRecord.createTestServiceUsageRecordAutomaticScope(); - logger.debug("UsageRecord : {}", record.toString()); - JsonNode node = PersistenceCouchBase.usageRecordToJsonNode(record); - logger.debug("Node : {}", node.toString()); - Record r = PersistenceCouchBase.jsonNodeToUsageRecord(node); - Assert.assertEquals(0, record.compareTo(r)); - Assert.assertEquals(0, r.compareTo(record)); - } - - @Test - public void testJsonNodeUsageRecordConversionsWithNestedMap() throws Exception { - Record record = TestUsageRecord.createTestTaskUsageRecordAutomaticScope(); - logger.debug("UsageRecord : {}", record.toString()); - JsonNode node = PersistenceCouchBase.usageRecordToJsonNode(record); - logger.debug("Node : {}", node.toString()); - Record r = PersistenceCouchBase.jsonNodeToUsageRecord(node); - Assert.assertEquals(0, record.compareTo(r)); - Assert.assertEquals(0, r.compareTo(record)); - } - - public void testProxyWithTestConfiguration() throws Exception{ - // Production-Preproduction Nodes - URL url = new URL("http://pc-frosini.isti.cnr.it"); - - PersistenceBackendConfiguration persitenceConfiguration = PersistenceBackendConfiguration.getUnconfiguredInstance(); - persitenceConfiguration.addProperty(PersistenceCouchBase.URL_PROPERTY_KEY, url.toString()); - //persitenceConfiguration.addProperty(AccountingPersistenceCouchBase.USERNAME_PROPERTY_KEY, ""); - persitenceConfiguration.addProperty(PersistenceCouchBase.PASSWORD_PROPERTY_KEY, ""); - persitenceConfiguration.addProperty(PersistenceCouchBase.BUCKET_NAME_PROPERTY_KEY,"accounting"); - - PersistenceCouchBase couchBase = new PersistenceCouchBase(); - couchBase.prepareConnection(persitenceConfiguration); - - Record record = TestUsageRecord.createTestServiceUsageRecordAutomaticScope(); - couchBase.reallyAccount(record); - } - -} \ No newline at end of file