From 70e0570c82b93e2323aedbb89bb77fa56d1e3d1b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 12 Feb 2016 11:20:04 +0000 Subject: [PATCH] Fixed Tests git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@124114 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../java/org/gcube/accounting/datamodel/UsageRecordTest.java | 2 +- .../aggregation/AggregatedServiceUsageRecordTest.java | 3 ++- .../aggregation/AggregatedStorageUsageRecordTest.java | 4 +++- .../accounting/datamodel/usagerecords/JobUsageRecordTest.java | 2 +- .../datamodel/usagerecords/ServiceUsageRecordTest.java | 2 +- .../datamodel/usagerecords/StorageUsageRecordTest.java | 2 +- .../datamodel/usagerecords/TaskUsageRecordTest.java | 2 +- .../org/gcube/accounting/testutility}/TestUsageRecord.java | 3 ++- 8 files changed, 12 insertions(+), 8 deletions(-) rename src/{main/java/org/gcube/accounting/datamodel/basetypes => test/java/org/gcube/accounting/testutility}/TestUsageRecord.java (98%) diff --git a/src/test/java/org/gcube/accounting/datamodel/UsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/UsageRecordTest.java index 9a3c82b..2663c33 100644 --- a/src/test/java/org/gcube/accounting/datamodel/UsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/UsageRecordTest.java @@ -3,7 +3,7 @@ */ package org.gcube.accounting.datamodel; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.RecordUtility; import org.junit.Assert; diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java index d654934..cb9e4dd 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedServiceUsageRecordTest.java @@ -5,9 +5,9 @@ package org.gcube.accounting.datamodel.aggregation; import java.util.Set; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecordTest; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; @@ -163,6 +163,7 @@ public class AggregatedServiceUsageRecordTest { for(int i=2; i<1002; i++){ ServiceUsageRecord sur = TestUsageRecord.createTestServiceUsageRecord(); + sur.setScope(TestUsageRecord.TEST_SCOPE); sur.setResourceProperty(TestUsageRecord.TEST_PROPERTY_NAME, TestUsageRecord.TEST_PROPERTY_VALUE); sur.validate(); logger.debug("Cycle ServiceUsageRecord {}: {}", i, sur); diff --git a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java index ef0fc15..f7b1867 100644 --- a/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/aggregation/AggregatedStorageUsageRecordTest.java @@ -3,8 +3,8 @@ */ package org.gcube.accounting.datamodel.aggregation; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; @@ -42,6 +42,7 @@ public class AggregatedStorageUsageRecordTest { aggregated.validate(); StorageUsageRecord storageUsageRecord2 = TestUsageRecord.createTestStorageUsageRecord(); + storageUsageRecord2.setScope(TestUsageRecord.TEST_SCOPE); storageUsageRecord2.validate(); logger.debug("StorageUsageRecord 2 : {}", storageUsageRecord2); @@ -108,6 +109,7 @@ public class AggregatedStorageUsageRecordTest { for(int i=2; i<1002; i++){ StorageUsageRecord sur = TestUsageRecord.createTestStorageUsageRecord(); + sur.setScope(TestUsageRecord.TEST_SCOPE); sur.setResourceProperty(TestUsageRecord.TEST_PROPERTY_NAME, TestUsageRecord.TEST_PROPERTY_VALUE); sur.validate(); logger.debug("Cycle StorageUsageRecord {}: {}", i, sur); diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java index 707005d..df4ac6d 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractJobUsageRecord; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java index 4713a9b..9027337 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractServiceUsageRecord; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java index 4e8ef3b..c00029b 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordTest.java index 2070b39..5637aec 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractTaskUsageRecord; -import org.gcube.accounting.datamodel.basetypes.TestUsageRecord; +import org.gcube.accounting.testutility.TestUsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java b/src/test/java/org/gcube/accounting/testutility/TestUsageRecord.java similarity index 98% rename from src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java rename to src/test/java/org/gcube/accounting/testutility/TestUsageRecord.java index b824c0d..15c9e91 100644 --- a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java +++ b/src/test/java/org/gcube/accounting/testutility/TestUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.basetypes; +package org.gcube.accounting.testutility; import java.io.Serializable; import java.net.URI; @@ -11,6 +11,7 @@ import java.util.HashMap; import java.util.UUID; import org.gcube.accounting.datamodel.UsageRecord.OperationResult; +import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord; import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;