gCubeSystem
/
accounting-lib-legacy
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed tests

This commit is contained in:
Luca Frosini 2021-04-14 00:55:43 +02:00
parent d516325660
commit b2a8885fe3
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
View File

@ -164,7 +164,11 @@ public abstract class AbstractStorageUsageRecord extends BasicUsageRecord {
@Deprecated @Deprecated
public void setResourceURI(URI resourceURI) throws InvalidValueException { 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); // setResourceProperty(RESOURCE_URI, resourceURI);
} }

10
src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java
View File

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

2
src/test/resources/logback-test.xml
View File

@ -13,7 +13,7 @@
<!-- logger name="org.gcube.documentstore" level="INFO" / --> <!-- logger name="org.gcube.documentstore" level="INFO" / -->
<!-- logger name="org.gcube.accounting" level="TRACE" / --> <!-- 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.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"> <root level="WARN">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />