improving tests
This commit is contained in:
parent
14ce8855f1
commit
de5fe9aa2a
|
@ -20,9 +20,11 @@ import org.gcube.accounting.analytics.exception.ValueException;
|
||||||
import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration;
|
import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration;
|
||||||
import org.gcube.accounting.analytics.persistence.AccountingPersistenceQuery;
|
import org.gcube.accounting.analytics.persistence.AccountingPersistenceQuery;
|
||||||
import org.gcube.accounting.datamodel.UsageRecord;
|
import org.gcube.accounting.datamodel.UsageRecord;
|
||||||
|
import org.gcube.accounting.datamodel.aggregation.AggregatedJobUsageRecord;
|
||||||
import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
|
import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
|
||||||
import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
|
import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
|
||||||
import org.gcube.accounting.utility.postgresql.RecordToDBMapping;
|
import org.gcube.accounting.utility.postgresql.RecordToDBMapping;
|
||||||
|
import org.gcube.documentstore.records.AggregatedRecord;
|
||||||
import org.gcube.documentstore.records.Record;
|
import org.gcube.documentstore.records.Record;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
@ -47,99 +49,44 @@ public class AccountingPersistenceQueryPostgreSQLTest extends ContextTest {
|
||||||
accountingPersistenceQueryPostgreSQL.prepareConnection(configuration);
|
accountingPersistenceQueryPostgreSQL.prepareConnection(configuration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected TemporalConstraint getTemporalConstraint() {
|
||||||
|
Calendar startTimeCalendar = Calendar.getInstance();
|
||||||
|
startTimeCalendar.set(Calendar.YEAR, 2015);
|
||||||
|
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
||||||
|
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
||||||
|
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
||||||
|
startTimeCalendar.set(Calendar.MINUTE, 0);
|
||||||
|
|
||||||
|
Calendar entTimeCalendar = Calendar.getInstance();
|
||||||
|
entTimeCalendar.set(Calendar.YEAR, 2021);
|
||||||
|
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
||||||
|
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
||||||
|
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
||||||
|
entTimeCalendar.set(Calendar.MINUTE, 0);
|
||||||
|
|
||||||
|
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MINUTELY);
|
||||||
|
|
||||||
|
return temporalConstraint;
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetNoContextTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
public void testGetNoContextTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
||||||
Calendar startTimeCalendar = Calendar.getInstance();
|
|
||||||
startTimeCalendar.set(Calendar.YEAR, 2020);
|
|
||||||
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
startTimeCalendar.set(Calendar.MINUTE, 0);
|
|
||||||
|
|
||||||
Calendar entTimeCalendar = Calendar.getInstance();
|
|
||||||
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 15);
|
|
||||||
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 16);
|
|
||||||
entTimeCalendar.set(Calendar.MINUTE, 17);
|
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<>();
|
List<Filter> filters = new ArrayList<>();
|
||||||
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
|
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MINUTELY);
|
TemporalConstraint temporalConstraint = getTemporalConstraint();
|
||||||
SortedMap<Calendar, Info> timeseries = accountingPersistenceQueryPostgreSQL.getNoContextTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
|
||||||
for(Calendar c : timeseries.keySet()) {
|
|
||||||
Info info = timeseries.get(c);
|
|
||||||
logger.debug("{}", info);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
|
||||||
Calendar startTimeCalendar = Calendar.getInstance();
|
|
||||||
startTimeCalendar.set(Calendar.YEAR, 2020);
|
|
||||||
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
startTimeCalendar.set(Calendar.MINUTE, 0);
|
|
||||||
|
|
||||||
Calendar entTimeCalendar = Calendar.getInstance();
|
List<Class<? extends AggregatedRecord<?, ?>>> classes = new ArrayList<Class<? extends AggregatedRecord<?, ?>>>();
|
||||||
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
classes.add(AggregatedServiceUsageRecord.class);
|
||||||
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 15);
|
classes.add(AggregatedStorageUsageRecord.class);
|
||||||
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 16);
|
classes.add(AggregatedJobUsageRecord.class);
|
||||||
entTimeCalendar.set(Calendar.MINUTE, 17);
|
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<>();
|
for(Class<? extends AggregatedRecord<?, ?>> clz : classes) {
|
||||||
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
logger.debug("----------------------------------------------------------------------");
|
||||||
filters.add(filter);
|
logger.debug("Going to query {}\n", RecordToDBMapping.getRecordTypeByClass(clz));
|
||||||
|
SortedMap<Calendar, Info> timeseries = accountingPersistenceQueryPostgreSQL.getNoContextTimeSeries(clz, temporalConstraint, filters);
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MINUTELY);
|
|
||||||
SortedMap<Calendar, Info> timeseries = accountingPersistenceQueryPostgreSQL.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
|
||||||
for(Calendar c : timeseries.keySet()) {
|
|
||||||
Info info = timeseries.get(c);
|
|
||||||
logger.debug("{}", info);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
timeseries = accountingPersistenceQueryPostgreSQL.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters);
|
|
||||||
for(Calendar c : timeseries.keySet()) {
|
|
||||||
Info info = timeseries.get(c);
|
|
||||||
logger.debug("{}", info);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testContextTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
|
||||||
Calendar startTimeCalendar = Calendar.getInstance();
|
|
||||||
startTimeCalendar.set(Calendar.YEAR, 2020);
|
|
||||||
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
startTimeCalendar.set(Calendar.MINUTE, 0);
|
|
||||||
|
|
||||||
Calendar entTimeCalendar = Calendar.getInstance();
|
|
||||||
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 15);
|
|
||||||
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 16);
|
|
||||||
entTimeCalendar.set(Calendar.MINUTE, 17);
|
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<>();
|
|
||||||
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
|
||||||
filters.add(filter);
|
|
||||||
|
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MONTHLY);
|
|
||||||
|
|
||||||
List<String> contexts = new ArrayList<>();
|
|
||||||
contexts.add("/gcube/devsec/devVRE");
|
|
||||||
contexts.add("/gcube/devNext/NextNext");
|
|
||||||
|
|
||||||
SortedMap<Filter, SortedMap<Calendar, Info>> contextTimeseries = accountingPersistenceQueryPostgreSQL.getContextTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters, contexts);
|
|
||||||
for(Filter f : contextTimeseries.keySet()) {
|
|
||||||
logger.debug("{}", f);
|
|
||||||
SortedMap<Calendar, Info> timeseries = contextTimeseries.get(f);
|
|
||||||
for(Calendar c : timeseries.keySet()) {
|
for(Calendar c : timeseries.keySet()) {
|
||||||
Info info = timeseries.get(c);
|
Info info = timeseries.get(c);
|
||||||
logger.debug("{}", info);
|
logger.debug("{}", info);
|
||||||
|
@ -147,27 +94,80 @@ public class AccountingPersistenceQueryPostgreSQLTest extends ContextTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testGetFilterValues() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
public void testTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
||||||
Calendar startTimeCalendar = Calendar.getInstance();
|
List<Filter> filters = new ArrayList<>();
|
||||||
startTimeCalendar.set(Calendar.YEAR, 2020);
|
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
||||||
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
filters.add(filter);
|
||||||
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
startTimeCalendar.set(Calendar.MINUTE, 0);
|
|
||||||
|
|
||||||
Calendar entTimeCalendar = Calendar.getInstance();
|
TemporalConstraint temporalConstraint = getTemporalConstraint();
|
||||||
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 15);
|
List<Class<? extends AggregatedRecord<?, ?>>> classes = new ArrayList<Class<? extends AggregatedRecord<?, ?>>>();
|
||||||
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 16);
|
classes.add(AggregatedServiceUsageRecord.class);
|
||||||
entTimeCalendar.set(Calendar.MINUTE, 17);
|
classes.add(AggregatedStorageUsageRecord.class);
|
||||||
|
classes.add(AggregatedJobUsageRecord.class);
|
||||||
|
|
||||||
|
for(Class<? extends AggregatedRecord<?, ?>> clz : classes) {
|
||||||
|
logger.debug("----------------------------------------------------------------------");
|
||||||
|
logger.debug("Going to query {}\n", RecordToDBMapping.getRecordTypeByClass(clz));
|
||||||
|
|
||||||
|
|
||||||
|
SortedMap<Calendar, Info> timeseries = accountingPersistenceQueryPostgreSQL.getTimeSeries(clz, temporalConstraint, filters);
|
||||||
|
for(Calendar c : timeseries.keySet()) {
|
||||||
|
Info info = timeseries.get(c);
|
||||||
|
logger.debug("{}", info);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testContextTimeSeries() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<>();
|
List<Filter> filters = new ArrayList<>();
|
||||||
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
|
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MINUTELY);
|
TemporalConstraint temporalConstraint = getTemporalConstraint();
|
||||||
|
|
||||||
|
List<String> contexts = new ArrayList<>();
|
||||||
|
contexts.add("/gcube/devsec/devVRE");
|
||||||
|
contexts.add("/gcube/devNext/NextNext");
|
||||||
|
|
||||||
|
|
||||||
|
List<Class<? extends AggregatedRecord<?, ?>>> classes = new ArrayList<Class<? extends AggregatedRecord<?, ?>>>();
|
||||||
|
classes.add(AggregatedServiceUsageRecord.class);
|
||||||
|
classes.add(AggregatedStorageUsageRecord.class);
|
||||||
|
classes.add(AggregatedJobUsageRecord.class);
|
||||||
|
|
||||||
|
for(Class<? extends AggregatedRecord<?, ?>> clz : classes) {
|
||||||
|
logger.debug("----------------------------------------------------------------------");
|
||||||
|
logger.debug("Going to query {}\n", RecordToDBMapping.getRecordTypeByClass(clz));
|
||||||
|
|
||||||
|
SortedMap<Filter, SortedMap<Calendar, Info>> contextTimeseries = accountingPersistenceQueryPostgreSQL.getContextTimeSeries(clz, temporalConstraint, filters, contexts);
|
||||||
|
for(Filter f : contextTimeseries.keySet()) {
|
||||||
|
logger.debug("{}", f);
|
||||||
|
SortedMap<Calendar, Info> timeseries = contextTimeseries.get(f);
|
||||||
|
for(Calendar c : timeseries.keySet()) {
|
||||||
|
Info info = timeseries.get(c);
|
||||||
|
logger.debug("{}", info);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetFilterValues() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
||||||
|
|
||||||
|
List<Filter> filters = new ArrayList<>();
|
||||||
|
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
||||||
|
filters.add(filter);
|
||||||
|
|
||||||
|
TemporalConstraint temporalConstraint = getTemporalConstraint();
|
||||||
|
|
||||||
SortedSet<NumberedFilter> numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(AggregatedServiceUsageRecord.class, temporalConstraint, filters, AggregatedServiceUsageRecord.CALLED_METHOD);
|
SortedSet<NumberedFilter> numberedFilters = accountingPersistenceQueryPostgreSQL.getFilterValues(AggregatedServiceUsageRecord.class, temporalConstraint, filters, AggregatedServiceUsageRecord.CALLED_METHOD);
|
||||||
for(NumberedFilter numberedFilter : numberedFilters) {
|
for(NumberedFilter numberedFilter : numberedFilters) {
|
||||||
logger.debug("{}", numberedFilter);
|
logger.debug("{}", numberedFilter);
|
||||||
|
@ -189,24 +189,11 @@ public class AccountingPersistenceQueryPostgreSQLTest extends ContextTest {
|
||||||
public void testTopValues() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
public void testTopValues() throws DuplicatedKeyFilterException, KeyException, ValueException, Exception {
|
||||||
String orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(AggregatedServiceUsageRecord.class);
|
String orderingProperty = AccountingPersistenceQuery.getDefaultOrderingProperties(AggregatedServiceUsageRecord.class);
|
||||||
|
|
||||||
Calendar startTimeCalendar = Calendar.getInstance();
|
|
||||||
startTimeCalendar.set(Calendar.YEAR, 2020);
|
|
||||||
startTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
startTimeCalendar.set(Calendar.DAY_OF_MONTH, 1);
|
|
||||||
startTimeCalendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
startTimeCalendar.set(Calendar.MINUTE, 0);
|
|
||||||
|
|
||||||
Calendar entTimeCalendar = Calendar.getInstance();
|
|
||||||
entTimeCalendar.set(Calendar.MONTH, Calendar.MARCH);
|
|
||||||
entTimeCalendar.set(Calendar.DAY_OF_MONTH, 15);
|
|
||||||
entTimeCalendar.set(Calendar.HOUR_OF_DAY, 16);
|
|
||||||
entTimeCalendar.set(Calendar.MINUTE, 17);
|
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<>();
|
List<Filter> filters = new ArrayList<>();
|
||||||
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
Filter filter = new Filter(UsageRecord.CONSUMER_ID, QueryTest.getRandomUser());
|
||||||
filters.add(filter);
|
filters.add(filter);
|
||||||
|
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTimeCalendar.getTimeInMillis(), entTimeCalendar.getTimeInMillis(), AggregationMode.MONTHLY);
|
TemporalConstraint temporalConstraint = getTemporalConstraint();
|
||||||
|
|
||||||
SortedMap<NumberedFilter, SortedMap<Calendar, Info>> topTimeSeries = accountingPersistenceQueryPostgreSQL.getTopValues(AggregatedServiceUsageRecord.class, temporalConstraint, filters, AggregatedServiceUsageRecord.CALLED_METHOD, orderingProperty);
|
SortedMap<NumberedFilter, SortedMap<Calendar, Info>> topTimeSeries = accountingPersistenceQueryPostgreSQL.getTopValues(AggregatedServiceUsageRecord.class, temporalConstraint, filters, AggregatedServiceUsageRecord.CALLED_METHOD, orderingProperty);
|
||||||
for(NumberedFilter numberedFilter : topTimeSeries.keySet()) {
|
for(NumberedFilter numberedFilter : topTimeSeries.keySet()) {
|
||||||
|
|
Loading…
Reference in New Issue