diff --git a/pom.xml b/pom.xml index 8baf002..373d0e4 100644 --- a/pom.xml +++ b/pom.xml @@ -82,14 +82,13 @@ test - + org.gcube.vremanagement diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java index b5466ee..a6c04d2 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java @@ -7,11 +7,15 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Map; +import java.util.SortedSet; import org.gcube.accounting.analytics.Filter; import org.gcube.accounting.analytics.Info; +import org.gcube.accounting.analytics.NumberedFilter; import org.gcube.accounting.analytics.TemporalConstraint; import org.gcube.accounting.analytics.TemporalConstraint.AggregationMode; +import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration; +import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord; import org.gcube.testutility.ScopedTest; import org.json.JSONObject; import org.junit.Before; @@ -27,7 +31,7 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest { private static Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryCouchBaseTest.class); - //protected AccountingPersistenceQueryCouchBase accountingPersistenceQueryCouchBase; + protected AccountingPersistenceQueryCouchBase accountingPersistenceQueryCouchBase; public class ExtendedInfo extends Info { @@ -63,12 +67,10 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest { @Before public void before() throws Exception{ super.before(); - /* AccountingPersistenceBackendQueryConfiguration configuration = new AccountingPersistenceBackendQueryConfiguration(AccountingPersistenceQueryCouchBase.class); accountingPersistenceQueryCouchBase = new AccountingPersistenceQueryCouchBase(); accountingPersistenceQueryCouchBase.prepareConnection(configuration); - */ } @@ -81,18 +83,27 @@ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest { @Test public void test() throws Exception { Calendar startTime = Calendar.getInstance(); - startTime.set(2015, Calendar.SEPTEMBER, 9); + startTime.set(2016, Calendar.JANUARY, 1); Calendar endTime = Calendar.getInstance(); - endTime.set(2016, Calendar.OCTOBER, 16); List filters = new ArrayList(); - Filter filter = new Filter("consumerId", "gianpaolo.coro"); + + Filter filter = + new Filter(AggregatedStorageUsageRecord.CONSUMER_ID, "gianpaolo.coro"); filters.add(filter); - TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.DAILY); - /* - Map infos = accountingPersistenceQueryCouchBase.query(AggregatedStorageUsageRecord.class, temporalConstraint, filters); + TemporalConstraint temporalConstraint = + new TemporalConstraint(startTime.getTimeInMillis(), + endTime.getTimeInMillis(), AggregationMode.DAILY); - printMap(infos); - */ + Class clz = + AggregatedStorageUsageRecord.class; + + SortedSet set = + accountingPersistenceQueryCouchBase.getNextPossibleValues( + clz, temporalConstraint, filters, + AggregatedStorageUsageRecord.OPERATION_TYPE, null); + + logger.debug("{}", set); + } }