|
|
|
@ -3,6 +3,7 @@
|
|
|
|
|
*/
|
|
|
|
|
package org.gcube.accounting.datamodel.aggregation;
|
|
|
|
|
|
|
|
|
|
import java.net.URI;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
|
|
|
|
@ -84,11 +85,15 @@ public class AggregatedStorageUsageRecordTest extends ContextTest {
|
|
|
|
|
Assert.assertFalse(aggregated.getResourceProperties().containsKey(TestUsageRecord.TEST_PROPERTY_NAME));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@SuppressWarnings("deprecation")
|
|
|
|
|
@Test
|
|
|
|
|
public void secondAsAggregated() throws InvalidValueException, NotAggregatableRecordsExceptions {
|
|
|
|
|
public void secondAsAggregated() throws Exception {
|
|
|
|
|
SecurityTokenProvider.instance.reset();
|
|
|
|
|
ScopeProvider.instance.reset();
|
|
|
|
|
StorageUsageRecord storageUsageRecord = TestUsageRecord.createTestStorageUsageRecord();
|
|
|
|
|
storageUsageRecord.setResourceScope("/gcube");
|
|
|
|
|
storageUsageRecord.setResourceURI(new URI("resourceURI"));
|
|
|
|
|
|
|
|
|
|
Assert.assertTrue(storageUsageRecord.getScope()==null);
|
|
|
|
|
storageUsageRecord.setScope(TestUsageRecord.TEST_SCOPE);
|
|
|
|
|
storageUsageRecord.validate();
|
|
|
|
@ -99,6 +104,9 @@ public class AggregatedStorageUsageRecordTest extends ContextTest {
|
|
|
|
|
aggregated.validate();
|
|
|
|
|
|
|
|
|
|
StorageUsageRecord storageUsageRecord2 = TestUsageRecord.createTestStorageUsageRecord();
|
|
|
|
|
storageUsageRecord2.setResourceScope("/gcube/devsec");
|
|
|
|
|
storageUsageRecord2.setResourceURI(new URI("anotherResourceURI"));
|
|
|
|
|
|
|
|
|
|
Assert.assertTrue(storageUsageRecord2.getScope()==null);
|
|
|
|
|
storageUsageRecord2.setScope(TestUsageRecord.TEST_SCOPE);
|
|
|
|
|
storageUsageRecord2.setResourceProperty(TestUsageRecord.TEST_PROPERTY_NAME, TestUsageRecord.TEST_PROPERTY_VALUE);
|
|
|
|
|