fixed tests

master
Luca Frosini 3 years ago
parent d516325660
commit b2a8885fe3

@ -164,7 +164,11 @@ public abstract class AbstractStorageUsageRecord extends BasicUsageRecord {
@Deprecated
public void setResourceURI(URI resourceURI) throws InvalidValueException {
setResourceProperty(RESOURCE_SCOPE, NOT_NEEDED);
try {
setResourceProperty(RESOURCE_URI, new URI(NOT_NEEDED));
}catch (Exception e) {
setResourceProperty(RESOURCE_URI, NOT_NEEDED);
}
// setResourceProperty(RESOURCE_URI, resourceURI);
}

@ -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);

@ -13,7 +13,7 @@
<!-- logger name="org.gcube.documentstore" level="INFO" / -->
<!-- logger name="org.gcube.accounting" level="TRACE" / -->
<!-- logger name="org.gcube.accounting.datamodel.validations.validators.Harmonizer" level="ERROR" /-->
<logger name="org.gcube.accounting.datamodel.validations.validators.TestRules" level="INFO" />
<logger name="org.gcube.accounting.datamodel.aggregation" level="TRACE" />
<root level="WARN">
<appender-ref ref="STDOUT" />

Loading…
Cancel
Save