diff --git a/pom.xml b/pom.xml index b15259c..8baf002 100644 --- a/pom.xml +++ b/pom.xml @@ -28,31 +28,37 @@ org.gcube.data.publishing document-store-lib [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.gcube.data.publishing document-store-lib-couchbase [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.reflections reflections 0.9.10 + test org.gcube.data.publishing document-store-lib-couchdb [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.gcube.common couchdb-connector [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.gcube.data.publishing document-store-lib-mongodb [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) + test @@ -60,17 +66,20 @@ org.gcube.accounting accounting-lib [2.2.0-SNAPSHOT, 3.0.0-SNAPSHOT) + test org.gcube.accounting accounting-analytics [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + test org.gcube.accounting accounting-analytics-persistence-couchdb [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + test @@ -85,33 +95,39 @@ org.gcube.vremanagement smart-executor [1.4.0-SNAPSHOT,2.0.0-SNAPSHOT) + test war org.gcube.vremanagement smart-executor-client [1.3.0-SNAPSHOT,2.0.0-SNAPSHOT) + test org.gcube.accounting couchdb-cache-se-plugin [1.1.0-SNAPSHOT,2.0.0-SNAPSHOT) + test org.gcube.information-system is-sweeper-se-plugin [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + test - + org.acme HelloWorldPlugin [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test @@ -120,33 +136,39 @@ org.gcube.core common-scope [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.gcube.resources registry-publisher [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.gcube.core common-encryption [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + test org.slf4j slf4j-api 1.7.5 + test ch.qos.logback logback-classic 1.0.13 + test junit junit 4.11 + test diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java index 1d916ac..50c2ddc 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java @@ -22,6 +22,7 @@ import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord; import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; +import org.gcube.documentstore.records.AggregatedRecord; import org.gcube.testutility.ScopedTest; import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; @@ -38,11 +39,11 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { private static Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryFactoryTest.class); - protected AccountingPersistenceBackendQuery apq; + protected AccountingPersistenceQuery apq; @Before public void before() throws NoAvailableScopeException, NoUsableAccountingPersistenceQueryFound{ - apq = AccountingPersistenceBackendQueryFactory.getInstance(); + apq = AccountingPersistenceQueryFactory.getInstance(); } @Test @@ -52,7 +53,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { Calendar endTime = Calendar.getInstance(); TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY); List filters = null; - Map infos = AccountingPersistenceQuery.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); + Map infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); for(Info info : infos.values()){ logger.debug(info.toString()); @@ -66,7 +67,8 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { Calendar endTime = Calendar.getInstance(); TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY); List filters = new ArrayList(); - Map infos = AccountingPersistenceQuery.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); + Class> clz = AggregatedServiceUsageRecord.class; + Map infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); for(Info info : infos.values()){ logger.debug(info.toString()); @@ -81,7 +83,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY); List filters = new ArrayList(); filters.add(new Filter("AUX", "AUX")); - AccountingPersistenceQuery.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); + apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); } @@ -93,7 +95,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY); List filters = new ArrayList(); filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, "AUX")); - Map infos = AccountingPersistenceQuery.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); + Map infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); Assert.assertTrue(infos.isEmpty()); } @@ -110,7 +112,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY); List filters = new ArrayList(); filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, TestUsageRecord.TEST_SERVICE_CLASS)); - Map infos = AccountingPersistenceQuery.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); + Map infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); Assert.assertTrue(!infos.isEmpty()); for(Info info : infos.values()){ @@ -119,7 +121,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { filters = new ArrayList(); filters.add(new Filter(StorageUsageRecord.RESOURCE_OWNER, TestUsageRecord.TEST_RESOUCE_OWNER)); - infos = AccountingPersistenceQuery.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters); + infos = apq.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); Assert.assertTrue(!infos.isEmpty()); for(Info info : infos.values()){ @@ -157,7 +159,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { filters.add(new Filter(UsageRecord.CONSUMER_ID, "gianpaolo.coro")); AccountingPersistenceBackendQuery apq = AccountingPersistenceBackendQueryFactory.getInstance(); - Map infos = apq.query(AggregatedStorageUsageRecord.class, temporalConstraint, filters); + Map infos = apq.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters); Assert.assertTrue(infos!=null); Assert.assertTrue(!infos.isEmpty()); @@ -165,7 +167,7 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { logger.debug(info.toString()); } - ResourceRecordQuery resourceRecordQuery = new ResourceRecordQuery(); + resourceRecordQuery resourceRecordQuery = new ResourceRecordQuery(); List padded = resourceRecordQuery.getInfo(AggregatedStorageUsageRecord.class, temporalConstraint, filters, true); Assert.assertTrue(padded!=null); Assert.assertTrue(!padded.isEmpty()); diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java index 97b0963..28bb32b 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java @@ -32,7 +32,7 @@ public class AccountingPersistenceQueryCouchDBTest extends ScopedTest { private static Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryCouchDBTest.class); - protected AccountingPersistenceQueryCouchDB accountingPersistenceQueryCouchDBNew; + protected AccountingPersistenceQueryCouchDB accountingPersistenceQueryCouchDB; @Before public void before() throws Exception{ @@ -45,8 +45,8 @@ public class AccountingPersistenceQueryCouchDBTest extends ScopedTest { String url = configuration.getProperty(AccountingPersistenceQueryCouchDB.URL_PROPERTY_KEY); url = url.replace("accounting-d-d4s.d4science.org", "couchdb01-d-d4s.d4science.org:5984"); configuration.addProperty(AccountingPersistenceQueryCouchDB.URL_PROPERTY_KEY, url); - accountingPersistenceQueryCouchDBNew = new AccountingPersistenceQueryCouchDB(); - accountingPersistenceQueryCouchDBNew.prepareConnection(configuration); + accountingPersistenceQueryCouchDB = new AccountingPersistenceQueryCouchDB(); + accountingPersistenceQueryCouchDB.prepareConnection(configuration); } public static String printCalendarMap(Map map){ @@ -92,21 +92,21 @@ public class AccountingPersistenceQueryCouchDBTest extends ScopedTest { AggregatedServiceUsageRecord.class; Map> map = - accountingPersistenceQueryCouchDBNew.getTopValues(clz, + accountingPersistenceQueryCouchDB.getTopValues(clz, temporalConstraint, filters); logger.debug("Top Query Results :\n{}", printMap(map)); SortedSet possibleValues = - accountingPersistenceQueryCouchDBNew.getNextPossibleValues(clz, + accountingPersistenceQueryCouchDB.getNextPossibleValues(clz, temporalConstraint, filters); logger.debug("Possibile Values :\n{}", possibleValues); filter.setValue("UNKNOWN"); SortedMap timeSeries = - accountingPersistenceQueryCouchDBNew.getTimeSeries(clz, + accountingPersistenceQueryCouchDB.getTimeSeries(clz, temporalConstraint, filters); logger.debug("Time Series for {}:\n{}", filter, diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java index 498f678..9c47aff 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java @@ -9,7 +9,6 @@ import org.ektorp.ViewQuery; import org.ektorp.ViewResult; import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration; import org.gcube.testutility.ScopedTest; -import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java index 3e1e28a..39a84ee 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java @@ -25,6 +25,7 @@ public class CouchDBQueryPluginTest extends ScopedTest { AccountingPersistenceFactory.initAccountingPackages(); Map inputs = new HashMap(); inputs.put(CouchDBQueryPlugin.DELAY_MILLIS, 1000*10); // Delay 10 sec + inputs.put(CouchDBQueryPlugin.MAX_RETRY_NUMBER, 0); // No Retry CouchDBQueryPlugin couchDBQueryPlugin = new CouchDBQueryPlugin(null); couchDBQueryPlugin.launch(inputs); logger.debug("-------------- launch test finished"); diff --git a/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java b/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java index 612c237..a22ff6c 100644 --- a/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java @@ -12,10 +12,8 @@ import java.util.Calendar; import org.gcube.accounting.persistence.AccountingPersistence; import org.gcube.accounting.persistence.AccountingPersistenceFactory; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.testutility.ScopedTest; import org.gcube.testutility.TestUsageRecord; -import org.gcube.testutility.TestUtility; import org.junit.Test; /**