Fixing tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/infrastructure-tests@125663 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
829e3fa4a5
commit
76881ba240
|
@ -37,23 +37,30 @@ import org.slf4j.LoggerFactory;
|
||||||
*/
|
*/
|
||||||
public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(AccountingPersistenceQueryFactoryTest.class);
|
private static Logger logger = LoggerFactory
|
||||||
|
.getLogger(AccountingPersistenceQueryFactoryTest.class);
|
||||||
|
|
||||||
protected AccountingPersistenceQuery apq;
|
protected AccountingPersistenceQuery apq;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() throws NoAvailableScopeException, NoUsableAccountingPersistenceQueryFound{
|
public void before() throws NoAvailableScopeException,
|
||||||
|
NoUsableAccountingPersistenceQueryFound {
|
||||||
apq = AccountingPersistenceQueryFactory.getInstance();
|
apq = AccountingPersistenceQueryFactory.getInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testNullFilters() throws Exception {
|
public void testNullFilters() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
startTime.setTimeInMillis(startTime.getTimeInMillis()-(1000*60*60*24*3));
|
startTime.setTimeInMillis(startTime.getTimeInMillis()
|
||||||
|
- (1000 * 60 * 60 * 24 * 3));
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.SECONDLY);
|
||||||
List<Filter> filters = null;
|
List<Filter> filters = null;
|
||||||
Map<Calendar, Info> infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
||||||
|
Map<Calendar, Info> infos = apq.getTimeSeries(clz, temporalConstraint,
|
||||||
|
filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
for (Info info : infos.values()) {
|
for (Info info : infos.values()) {
|
||||||
logger.debug(info.toString());
|
logger.debug(info.toString());
|
||||||
|
@ -63,12 +70,16 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
@Test
|
@Test
|
||||||
public void testEmptyFilters() throws Exception {
|
public void testEmptyFilters() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
startTime.setTimeInMillis(startTime.getTimeInMillis()-(1000*60*60*24*3));
|
startTime.setTimeInMillis(startTime.getTimeInMillis()
|
||||||
|
- (1000 * 60 * 60 * 24 * 3));
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.SECONDLY);
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
||||||
Map<Calendar, Info> infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
Map<Calendar, Info> infos = apq.getTimeSeries(clz, temporalConstraint,
|
||||||
|
filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
for (Info info : infos.values()) {
|
for (Info info : infos.values()) {
|
||||||
logger.debug(info.toString());
|
logger.debug(info.toString());
|
||||||
|
@ -78,41 +89,54 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
@Test(expected = DocumentNotFoundException.class)
|
@Test(expected = DocumentNotFoundException.class)
|
||||||
public void testFakeFilters() throws Exception {
|
public void testFakeFilters() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
startTime.setTimeInMillis(startTime.getTimeInMillis()-(1000*60*60*24*3));
|
startTime.setTimeInMillis(startTime.getTimeInMillis()
|
||||||
|
- (1000 * 60 * 60 * 24 * 3));
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.SECONDLY);
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
filters.add(new Filter("AUX", "AUX"));
|
filters.add(new Filter("AUX", "AUX"));
|
||||||
apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
||||||
|
apq.getTimeSeries(clz, temporalConstraint, filters, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testFiltersGoodKeyFakeValue() throws Exception {
|
public void testFiltersGoodKeyFakeValue() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
startTime.setTimeInMillis(startTime.getTimeInMillis()-(1000*60*60*24*3));
|
startTime.setTimeInMillis(startTime.getTimeInMillis()
|
||||||
|
- (1000 * 60 * 60 * 24 * 3));
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.SECONDLY);
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, "AUX"));
|
filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, "AUX"));
|
||||||
Map<Calendar, Info> infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
||||||
|
Map<Calendar, Info> infos = apq.getTimeSeries(clz, temporalConstraint,
|
||||||
|
filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
Assert.assertTrue(infos.isEmpty());
|
Assert.assertTrue(infos.isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static final long timeout = 5000;
|
public static final long timeout = 5000;
|
||||||
public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS;
|
public static final TimeUnit timeUnit = TimeUnit.MILLISECONDS;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testFiltersGoodKeyGoodValue() throws Exception {
|
public void testFiltersGoodKeyGoodValue() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
startTime.setTimeInMillis(startTime.getTimeInMillis()-(1000*60*60*24*365));
|
startTime.setTimeInMillis(startTime.getTimeInMillis()
|
||||||
|
- (1000 * 60 * 60 * 24 * 365));
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.SECONDLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.SECONDLY);
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, TestUsageRecord.TEST_SERVICE_CLASS));
|
filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS,
|
||||||
Map<Calendar, Info> infos = apq.getTimeSeries(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
TestUsageRecord.TEST_SERVICE_CLASS));
|
||||||
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedServiceUsageRecord.class;
|
||||||
|
Map<Calendar, Info> infos = apq.getTimeSeries(clz, temporalConstraint,
|
||||||
|
filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
Assert.assertTrue(!infos.isEmpty());
|
Assert.assertTrue(!infos.isEmpty());
|
||||||
for (Info info : infos.values()) {
|
for (Info info : infos.values()) {
|
||||||
|
@ -120,8 +144,10 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
filters.add(new Filter(StorageUsageRecord.RESOURCE_OWNER, TestUsageRecord.TEST_RESOUCE_OWNER));
|
filters.add(new Filter(StorageUsageRecord.RESOURCE_OWNER,
|
||||||
infos = apq.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters);
|
TestUsageRecord.TEST_RESOUCE_OWNER));
|
||||||
|
clz = AggregatedStorageUsageRecord.class;
|
||||||
|
infos = apq.getTimeSeries(clz, temporalConstraint, filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
Assert.assertTrue(!infos.isEmpty());
|
Assert.assertTrue(!infos.isEmpty());
|
||||||
for (Info info : infos.values()) {
|
for (Info info : infos.values()) {
|
||||||
|
@ -130,7 +156,6 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// @ Test
|
// @ Test
|
||||||
public void testRange() throws Exception {
|
public void testRange() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
|
@ -140,26 +165,28 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
Calendar endTime = Calendar.getInstance();
|
Calendar endTime = Calendar.getInstance();
|
||||||
endTime.set(Calendar.MONTH, Calendar.SEPTEMBER);
|
endTime.set(Calendar.MONTH, Calendar.SEPTEMBER);
|
||||||
endTime.set(Calendar.DAY_OF_MONTH, 7);
|
endTime.set(Calendar.DAY_OF_MONTH, 7);
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.DAILY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
logger.trace("{} : {}", TemporalConstraint.class.getSimpleName(), temporalConstraint.toString());
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.DAILY);
|
||||||
|
logger.trace("{} : {}", TemporalConstraint.class.getSimpleName(),
|
||||||
|
temporalConstraint.toString());
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
/*
|
/*
|
||||||
filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS, TestUsageRecord.TEST_SERVICE_CLASS));
|
* filters.add(new Filter(ServiceUsageRecord.SERVICE_CLASS,
|
||||||
Map<Calendar, Info> infos = apq.query(AggregatedServiceUsageRecord.class, temporalConstraint, filters);
|
* TestUsageRecord.TEST_SERVICE_CLASS)); Map<Calendar, Info> infos =
|
||||||
Assert.assertTrue(infos!=null);
|
* apq.query(AggregatedServiceUsageRecord.class, temporalConstraint,
|
||||||
Assert.assertTrue(!infos.isEmpty());
|
* filters); Assert.assertTrue(infos!=null);
|
||||||
for(Info info : infos.values()){
|
* Assert.assertTrue(!infos.isEmpty()); for(Info info : infos.values()){
|
||||||
logger.debug(info.toString());
|
* logger.debug(info.toString()); }
|
||||||
}
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
filters = new ArrayList<Filter>();
|
filters = new ArrayList<Filter>();
|
||||||
filters.add(new Filter(UsageRecord.CONSUMER_ID, "gianpaolo.coro"));
|
filters.add(new Filter(UsageRecord.CONSUMER_ID, "gianpaolo.coro"));
|
||||||
|
|
||||||
AccountingPersistenceBackendQuery apq = AccountingPersistenceBackendQueryFactory.getInstance();
|
Class<? extends AggregatedRecord<?, ?>> clz = AggregatedStorageUsageRecord.class;
|
||||||
Map<Calendar, Info> infos = apq.getTimeSeries(AggregatedStorageUsageRecord.class, temporalConstraint, filters);
|
Map<Calendar, Info> infos = apq.getTimeSeries(clz, temporalConstraint,
|
||||||
|
filters, true);
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
Assert.assertTrue(!infos.isEmpty());
|
Assert.assertTrue(!infos.isEmpty());
|
||||||
|
|
||||||
|
@ -167,53 +194,22 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
logger.debug(info.toString());
|
logger.debug(info.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
resourceRecordQuery resourceRecordQuery = new ResourceRecordQuery();
|
|
||||||
List<Info> padded = resourceRecordQuery.getInfo(AggregatedStorageUsageRecord.class, temporalConstraint, filters, true);
|
|
||||||
Assert.assertTrue(padded!=null);
|
|
||||||
Assert.assertTrue(!padded.isEmpty());
|
|
||||||
|
|
||||||
for(Info info : padded){
|
|
||||||
logger.debug(info.toString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getKeysTest() throws Exception {
|
public void getKeysTest() throws Exception {
|
||||||
Set<String> keys = apq.getKeys(AggregatedServiceUsageRecord.class);
|
Set<String> keys = AccountingPersistenceQuery
|
||||||
|
.getQuerableKeys(AggregatedServiceUsageRecord.class);
|
||||||
logger.debug("Got keys : {}", keys);
|
logger.debug("Got keys : {}", keys);
|
||||||
|
|
||||||
Set<String> required = AggregatedServiceUsageRecord.class.newInstance().getRequiredFields();
|
Set<String> required = AggregatedServiceUsageRecord.class.newInstance()
|
||||||
|
.getRequiredFields();
|
||||||
logger.debug("Required fields : {}", required);
|
logger.debug("Required fields : {}", required);
|
||||||
|
|
||||||
Assert.assertTrue(required.containsAll(keys));
|
Assert.assertTrue(required.containsAll(keys));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getPossibileValuesTest() throws Exception {
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
Class[] classes = new Class[]{
|
|
||||||
AggregatedServiceUsageRecord.class,
|
|
||||||
AggregatedStorageUsageRecord.class
|
|
||||||
};
|
|
||||||
|
|
||||||
for(@SuppressWarnings("rawtypes") Class cls : classes){
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
Set<String> keys = apq.getKeys(cls);
|
|
||||||
for(String key : keys){
|
|
||||||
logger.debug("Querying Possible values of {} for key {}", cls.getSimpleName(), key);
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
Set<String> values = apq.getPossibleValuesForKey(cls, key);
|
|
||||||
logger.debug("Possible values of {} for key {} : {}", cls.getSimpleName(), key, values);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testMontly() throws Exception {
|
public void testMontly() throws Exception {
|
||||||
Calendar startTime = Calendar.getInstance();
|
Calendar startTime = Calendar.getInstance();
|
||||||
|
@ -224,13 +220,18 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
endTime.set(Calendar.MONTH, Calendar.DECEMBER);
|
endTime.set(Calendar.MONTH, Calendar.DECEMBER);
|
||||||
endTime.set(Calendar.DAY_OF_MONTH, 31);
|
endTime.set(Calendar.DAY_OF_MONTH, 31);
|
||||||
|
|
||||||
TemporalConstraint temporalConstraint = new TemporalConstraint(startTime.getTimeInMillis(), endTime.getTimeInMillis(), AggregationMode.MONTHLY);
|
TemporalConstraint temporalConstraint = new TemporalConstraint(
|
||||||
logger.trace("{} : {}", TemporalConstraint.class.getSimpleName(), temporalConstraint.toString());
|
startTime.getTimeInMillis(), endTime.getTimeInMillis(),
|
||||||
|
AggregationMode.MONTHLY);
|
||||||
|
logger.trace("{} : {}", TemporalConstraint.class.getSimpleName(),
|
||||||
|
temporalConstraint.toString());
|
||||||
|
|
||||||
List<Filter> filters = new ArrayList<Filter>();
|
List<Filter> filters = new ArrayList<Filter>();
|
||||||
AccountingPersistenceBackendQuery apq = AccountingPersistenceBackendQueryFactory.getInstance();
|
AccountingPersistenceBackendQuery apq = AccountingPersistenceBackendQueryFactory
|
||||||
Map<Calendar, Info> infos = apq.query(AggregatedStorageUsageRecord.class, temporalConstraint, filters);
|
.getInstance();
|
||||||
|
Map<Calendar, Info> infos = apq.getTimeSeries(
|
||||||
|
AggregatedStorageUsageRecord.class, temporalConstraint,
|
||||||
|
filters);
|
||||||
|
|
||||||
Assert.assertTrue(infos != null);
|
Assert.assertTrue(infos != null);
|
||||||
Assert.assertTrue(!infos.isEmpty());
|
Assert.assertTrue(!infos.isEmpty());
|
||||||
|
@ -239,15 +240,6 @@ public class AccountingPersistenceQueryFactoryTest extends ScopedTest {
|
||||||
logger.debug(info.toString());
|
logger.debug(info.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
ResourceRecordQuery resourceRecordQuery = new ResourceRecordQuery();
|
|
||||||
List<Info> padded = resourceRecordQuery.getInfo(AggregatedStorageUsageRecord.class, temporalConstraint, filters, true);
|
|
||||||
Assert.assertTrue(padded!=null);
|
|
||||||
Assert.assertTrue(!padded.isEmpty());
|
|
||||||
|
|
||||||
for(Info info : padded){
|
|
||||||
logger.debug(info.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue