From e8c79ad211319e6ba0df835908dfb0190becc4f3 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 17 Feb 2016 13:17:31 +0000 Subject: [PATCH] Reorganized tests git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/private/luca.frosini/infrastructure-tests@124251 82a268e6-3cf1-43bd-a215-b396298e98cf --- ...untingPersistenceQueryConfigurationTest.java | 4 ++-- .../AccountingPersistenceQueryFactoryTest.java | 4 ++-- .../couchdb/query/AccountingTest.java | 9 +++++---- ...DBQueryPluginSmartExecutorSchedulerTest.java | 2 +- .../couchdb/query/CouchDBQueryPluginTest.java | 2 +- .../usagerecords/JobUsageRecordScopedTest.java | 4 ++-- .../ServiceUsageRecordScopedTest.java | 4 ++-- .../StorageUsageRecordScopedTest.java | 4 ++-- .../usagerecords/TaskUsageRecordScopedTest.java | 6 +++--- .../AccountingPersistenceConfigurationTest.java | 4 ++-- .../persistence/PersistenceCouchBaseTest.java | 4 ++-- .../persistence/PersistenceCouchDBTest.java | 4 ++-- .../persistence/PersistenceMongoDBTest.java | 4 ++-- .../PersistenceBackendMonitorTest.java | 10 +++++----- .../persistence/PersistenceBackendTest.java | 10 +++++----- .../persistence/PersistenceCouchBaseTest.java | 6 +++--- .../persistence/PersistenceCouchDBTest.java | 4 ++-- .../persistence/PersistenceMongoDBTest.java | 2 +- .../aggregation/AggregationSchedulerTest.java | 8 ++++---- ...SweeperPluginSmartExecutorSchedulerTest.java | 2 +- .../sweeper/ISSweeperPluginTest.java | 2 +- .../gcube/{utils => testutility}/IOUtility.java | 2 +- .../{utils => testutility}/ScopedTest.java | 2 +- .../StressTestUtility.java | 2 +- .../{utils => testutility}/TestOperation.java | 2 +- .../{utils => testutility}/TestUsageRecord.java | 2 +- .../{utils => testutility}/TestUtility.java | 2 +- .../executor/GCoreEndPointCreationTest.java | 17 +---------------- .../executor/client/DefaultExecutorTest.java | 2 +- .../executor/client/QueriedClientTest.java | 2 +- .../SmartGenericWorkerDiscoveryQuery.java | 2 +- 31 files changed, 60 insertions(+), 74 deletions(-) rename src/test/java/org/gcube/{utils => testutility}/IOUtility.java (94%) rename src/test/java/org/gcube/{utils => testutility}/ScopedTest.java (94%) rename src/test/java/org/gcube/{utils => testutility}/StressTestUtility.java (97%) rename src/test/java/org/gcube/{utils => testutility}/TestOperation.java (84%) rename src/test/java/org/gcube/{utils => testutility}/TestUsageRecord.java (99%) rename src/test/java/org/gcube/{utils => testutility}/TestUtility.java (98%) diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java index d6425f4..cb50c89 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java @@ -6,8 +6,8 @@ package org.gcube.accounting.analytics.persistence; import org.gcube.accounting.analytics.persistence.couchbase.AccountingPersistenceQueryCouchBase; import org.gcube.accounting.analytics.persistence.couchdb.AccountingPersistenceQueryCouchDB; import org.gcube.accounting.persistence.AccountingPersistenceConfiguration; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUtility; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java index 15da8fc..cc4536e 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java @@ -23,8 +23,8 @@ import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord; import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/gcube/accounting/couchdb/query/AccountingTest.java b/src/test/java/org/gcube/accounting/couchdb/query/AccountingTest.java index 89af50c..843321a 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/AccountingTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/AccountingTest.java @@ -8,11 +8,12 @@ import java.util.concurrent.TimeUnit; import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; +import org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord; import org.gcube.accounting.persistence.AccountingPersistence; import org.gcube.accounting.persistence.AccountingPersistenceFactory; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.exception.NotAggregatableRecordsExceptions; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.TestUsageRecord; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; @@ -56,7 +57,7 @@ public class AccountingTest { AccountingPersistence accountingPersistence = AccountingPersistenceFactory.getPersistence(); for(int i=0; i<1000; i++){ - StorageUsageRecord sur = org.gcube.utils.TestUsageRecord.createTestStorageUsageRecord(); + StorageUsageRecord sur = org.gcube.testutility.TestUsageRecord.createTestStorageUsageRecord(); sur.setScope(TestUsageRecord.TEST_SCOPE); accountingPersistence.account(sur); } @@ -86,7 +87,7 @@ public class AccountingTest { accountingPersistence.account(pur); } } - + */ @Test public void accountingTaskUsageRecordStressTest() throws InvalidValueException, NotAggregatableRecordsExceptions { @@ -99,6 +100,6 @@ public class AccountingTest { accountingPersistence.account(tur); } } - */ + } diff --git a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java index 715ccb3..1fb4fc9 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.gcube.utils.ScopedTest; +import org.gcube.testutility.ScopedTest; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; diff --git a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java index 718fdf2..76863ab 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java @@ -3,7 +3,7 @@ package org.gcube.accounting.couchdb.query; import java.util.HashMap; import java.util.Map; -import org.gcube.utils.ScopedTest; +import org.gcube.testutility.ScopedTest; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java index 6f940eb..d21520b 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java @@ -6,8 +6,8 @@ package org.gcube.accounting.datamodel.usagerecords; import java.util.Set; import org.gcube.documentstore.exception.InvalidValueException; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java index 2749ac4..7ef13fb 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java @@ -6,8 +6,8 @@ package org.gcube.accounting.datamodel.usagerecords; import java.util.Set; import org.gcube.documentstore.exception.InvalidValueException; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java index 3f064e8..318aae3 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java @@ -5,9 +5,9 @@ package org.gcube.accounting.datamodel.usagerecords; import java.util.Set; -import org.gcube.accounting.testutility.ScopedTest; import org.gcube.documentstore.exception.InvalidValueException; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java index 04f863a..ef100f5 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java @@ -8,12 +8,12 @@ import java.util.Set; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractTaskUsageRecord; -import org.gcube.accounting.testutility.ScopedTest; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; -import org.gcube.utils.TestUsageRecord; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; +import org.gcube.testutility.TestUtility; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java b/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java index b1356a2..0527fda 100644 --- a/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java +++ b/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java @@ -15,8 +15,8 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Runtime; import org.gcube.common.resources.gcore.common.Platform; import org.gcube.common.resources.gcore.utils.Group; import org.gcube.documentstore.persistence.PersistenceBackend; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUtility; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java index e7bdf85..2b1258c 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java @@ -17,8 +17,8 @@ import org.gcube.documentstore.persistence.PersistenceCouchBase; //import org.gcube.documentstore.persistence.PersistenceCouchBase; import org.gcube.informationsystem.publisher.RegistryPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUtility; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java index 359a475..0500e5b 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java @@ -16,8 +16,8 @@ import org.gcube.documentstore.persistence.PersistenceBackendFactory; import org.gcube.documentstore.persistence.PersistenceCouchDB; import org.gcube.informationsystem.publisher.RegistryPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUtility; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java index d8ae341..e15f9e1 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java @@ -15,8 +15,8 @@ import org.gcube.documentstore.persistence.PersistenceBackendFactory; import org.gcube.documentstore.persistence.PersistenceMongoDB; import org.gcube.informationsystem.publisher.RegistryPublisher; import org.gcube.informationsystem.publisher.RegistryPublisherFactory; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUtility; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java index 87c9e7b..8da1f23 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java @@ -7,11 +7,11 @@ import java.util.concurrent.TimeUnit; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.documentstore.exception.InvalidValueException; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.StressTestUtility; -import org.gcube.utils.TestOperation; -import org.gcube.utils.TestUsageRecord; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.StressTestUtility; +import org.gcube.testutility.TestOperation; +import org.gcube.testutility.TestUsageRecord; +import org.gcube.testutility.TestUtility; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java index 59abd5e..da14ca4 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java @@ -8,11 +8,11 @@ import java.util.concurrent.TimeUnit; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.StressTestUtility; -import org.gcube.utils.TestOperation; -import org.gcube.utils.TestUsageRecord; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.StressTestUtility; +import org.gcube.testutility.TestOperation; +import org.gcube.testutility.TestUsageRecord; +import org.gcube.testutility.TestUtility; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java index 7b1a008..30ff17a 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java @@ -7,9 +7,9 @@ import java.net.URL; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.documentstore.records.Record; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUsageRecord; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; +import org.gcube.testutility.TestUtility; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java index d88249a..599e41a 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java @@ -7,8 +7,8 @@ import java.net.URL; import org.codehaus.jackson.JsonNode; import org.gcube.documentstore.records.Record; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java index b788d00..7da363e 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java @@ -9,7 +9,7 @@ import org.bson.Document; import org.gcube.accounting.datamodel.UsageRecord; import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType; import org.gcube.documentstore.records.Record; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java index ad9cce8..37da936 100644 --- a/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java +++ b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java @@ -12,10 +12,10 @@ import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.gcube.documentstore.persistence.PersistenceExecutor; import org.gcube.documentstore.records.AggregatedRecord; import org.gcube.documentstore.records.Record; -import org.gcube.utils.ScopedTest; -import org.gcube.utils.StressTestUtility; -import org.gcube.utils.TestOperation; -import org.gcube.utils.TestUsageRecord; +import org.gcube.testutility.ScopedTest; +import org.gcube.testutility.StressTestUtility; +import org.gcube.testutility.TestOperation; +import org.gcube.testutility.TestUsageRecord; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java index 2a14e92..f25b8c6 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.gcube.utils.ScopedTest; +import org.gcube.testutility.ScopedTest; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java index 3f5d1ae..ddc2c3f 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java @@ -3,7 +3,7 @@ package org.gcube.informationsystem.sweeper; import java.util.HashMap; import java.util.Map; -import org.gcube.utils.ScopedTest; +import org.gcube.testutility.ScopedTest; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/org/gcube/utils/IOUtility.java b/src/test/java/org/gcube/testutility/IOUtility.java similarity index 94% rename from src/test/java/org/gcube/utils/IOUtility.java rename to src/test/java/org/gcube/testutility/IOUtility.java index 8b499c1..48bf07d 100644 --- a/src/test/java/org/gcube/utils/IOUtility.java +++ b/src/test/java/org/gcube/testutility/IOUtility.java @@ -1,4 +1,4 @@ -package org.gcube.utils; +package org.gcube.testutility; import java.io.BufferedReader; import java.io.FileReader; diff --git a/src/test/java/org/gcube/utils/ScopedTest.java b/src/test/java/org/gcube/testutility/ScopedTest.java similarity index 94% rename from src/test/java/org/gcube/utils/ScopedTest.java rename to src/test/java/org/gcube/testutility/ScopedTest.java index 8359a61..72a9a32 100644 --- a/src/test/java/org/gcube/utils/ScopedTest.java +++ b/src/test/java/org/gcube/testutility/ScopedTest.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.utils; +package org.gcube.testutility; //import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; diff --git a/src/test/java/org/gcube/utils/StressTestUtility.java b/src/test/java/org/gcube/testutility/StressTestUtility.java similarity index 97% rename from src/test/java/org/gcube/utils/StressTestUtility.java rename to src/test/java/org/gcube/testutility/StressTestUtility.java index 6ae4fc3..09f5637 100644 --- a/src/test/java/org/gcube/utils/StressTestUtility.java +++ b/src/test/java/org/gcube/testutility/StressTestUtility.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.utils; +package org.gcube.testutility; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/src/test/java/org/gcube/utils/TestOperation.java b/src/test/java/org/gcube/testutility/TestOperation.java similarity index 84% rename from src/test/java/org/gcube/utils/TestOperation.java rename to src/test/java/org/gcube/testutility/TestOperation.java index a4d1b71..8503fc4 100644 --- a/src/test/java/org/gcube/utils/TestOperation.java +++ b/src/test/java/org/gcube/testutility/TestOperation.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.utils; +package org.gcube.testutility; /** diff --git a/src/test/java/org/gcube/utils/TestUsageRecord.java b/src/test/java/org/gcube/testutility/TestUsageRecord.java similarity index 99% rename from src/test/java/org/gcube/utils/TestUsageRecord.java rename to src/test/java/org/gcube/testutility/TestUsageRecord.java index 0b4f64f..299b8e0 100644 --- a/src/test/java/org/gcube/utils/TestUsageRecord.java +++ b/src/test/java/org/gcube/testutility/TestUsageRecord.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.utils; +package org.gcube.testutility; import java.io.Serializable; import java.net.URI; diff --git a/src/test/java/org/gcube/utils/TestUtility.java b/src/test/java/org/gcube/testutility/TestUtility.java similarity index 98% rename from src/test/java/org/gcube/utils/TestUtility.java rename to src/test/java/org/gcube/testutility/TestUtility.java index 8abab60..cb20c48 100644 --- a/src/test/java/org/gcube/utils/TestUtility.java +++ b/src/test/java/org/gcube/testutility/TestUtility.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.utils; +package org.gcube.testutility; import java.io.StringWriter; diff --git a/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java b/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java index 31909d6..2b34b9d 100644 --- a/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java @@ -9,22 +9,7 @@ import java.util.Calendar; import java.util.Map; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; */ -import org.gcube.utils.ScopedTest; -/* -import org.gcube.common.resources.gcore.GCoreEndpoint; -import org.gcube.common.resources.gcore.GCoreEndpoint.Profile; -import org.gcube.common.resources.gcore.GCoreEndpoint.Profile.DeploymentData; -import org.gcube.common.resources.gcore.GCoreEndpoint.Profile.Function.Parameter; -import org.gcube.common.resources.gcore.Resources; -import org.gcube.utils.TestUtility; -import org.gcube.vremanagement.executor.plugin.PluginDeclaration; -import org.junit.After; -import org.junit.Before; - -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -*/ +import org.gcube.testutility.ScopedTest; /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ diff --git a/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java b/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java index cbb90ca..7227d76 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java @@ -10,7 +10,7 @@ import java.util.UUID; import org.acme.HelloWorldPlugin; import org.acme.HelloWorldPluginDeclaration; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.TestUtility; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; diff --git a/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java b/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java index ddd3cf6..4103538 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java @@ -12,7 +12,7 @@ import org.acme.HelloWorldPluginDeclaration; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.clients.ProxyBuilderImpl; import org.gcube.common.clients.exceptions.DiscoveryException; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.TestUtility; import org.gcube.vremanagement.executor.api.SmartExecutor; import org.gcube.vremanagement.executor.api.types.LaunchParameter; import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; diff --git a/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java b/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java index 92b4179..14a25a1 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java @@ -6,7 +6,7 @@ package org.gcube.vremanagement.executor.client; import java.util.List; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.utils.TestUtility; +import org.gcube.testutility.TestUtility; //import org.gcube.dataanalysis.executor.plugin.GenericWorkerPluginDeclaration; import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; import org.gcube.vremanagement.executor.client.plugins.query.SmartExecutorPluginQuery;