diff --git a/pom.xml b/pom.xml index 1672578..c5ce0d0 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.gcube.common couchdb-connector - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) test 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 faab777..17333f6 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryConfigurationTest.java @@ -12,7 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingPersistenceQueryConfigurationTest extends ScopedTest { 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 82ba0de..9979fa0 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQueryFactoryTest.java @@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingPersistenceQueryFactoryTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java index a6c04d2..ad67bbb 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBaseTest.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingPersistenceQueryCouchBaseTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java index b698e84..c321308 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/AccountingPersistenceQueryCouchDBTest.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingPersistenceQueryCouchDBTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java index 9c47aff..9768393 100644 --- a/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java +++ b/src/test/java/org/gcube/accounting/analytics/persistence/couchdb/DeleteTestDocument.java @@ -13,7 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class DeleteTestDocument extends ScopedTest { 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 71eda44..249fb7f 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginSmartExecutorSchedulerTest.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ public class CouchDBQueryPluginSmartExecutorSchedulerTest extends ScopedTest { 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 a6a6dc8..c4a4fd1 100644 --- a/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java +++ b/src/test/java/org/gcube/accounting/couchdb/query/CouchDBQueryPluginTest.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ public class CouchDBQueryPluginTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/datamodel/records/aggregation/RecordUtilityTest.java b/src/test/java/org/gcube/accounting/datamodel/records/aggregation/RecordUtilityTest.java index 72d6284..d901af5 100644 --- a/src/test/java/org/gcube/accounting/datamodel/records/aggregation/RecordUtilityTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/records/aggregation/RecordUtilityTest.java @@ -19,7 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class RecordUtilityTest { diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java index d8ed2ff..9dc3163 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingTest { 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 d21520b..4e870a8 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/JobUsageRecordScopedTest.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class JobUsageRecordScopedTest extends ScopedTest { 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 7ef13fb..bfd9b75 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordScopedTest.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class ServiceUsageRecordScopedTest extends ScopedTest { 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 318aae3..641f0ee 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/StorageUsageRecordScopedTest.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class StorageUsageRecordScopedTest extends ScopedTest { 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 ef100f5..b1fa2a8 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/TaskUsageRecordScopedTest.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class TaskUsageRecordScopedTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java b/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java index 0527fda..5551544 100644 --- a/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java +++ b/src/test/java/org/gcube/accounting/persistence/AccountingPersistenceConfigurationTest.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingPersistenceConfigurationTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java index 2b1258c..5b6faf6 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchBaseTest.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceCouchBaseTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java index 0500e5b..6f27a37 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceCouchDBTest.java @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceCouchDBTest extends ScopedTest { diff --git a/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java b/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java index e15f9e1..4836459 100644 --- a/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java +++ b/src/test/java/org/gcube/accounting/persistence/PersistenceMongoDBTest.java @@ -23,7 +23,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceMongoDBTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendFactoryTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendFactoryTest.java index ef2d3ca..27b8fec 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendFactoryTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendFactoryTest.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceBackendFactoryTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java index a80bb45..8de2b7b 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendMonitorTest.java @@ -17,7 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceBackendMonitorTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java index 82e6ffa..36b4101 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceBackendTest.java @@ -19,7 +19,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceBackendTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java index 30ff17a..3cb91a5 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchBaseTest.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; import com.couchbase.client.deps.com.fasterxml.jackson.databind.JsonNode; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceCouchBaseTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java index 599e41a..4aac977 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceCouchDBTest.java @@ -15,7 +15,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceCouchDBTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java index 7da363e..40b094d 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistenceMongoDBTest.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class PersistenceMongoDBTest { diff --git a/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java b/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java index a22ff6c..9ce222e 100644 --- a/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/RenameFileTest.java @@ -17,7 +17,7 @@ import org.gcube.testutility.TestUsageRecord; import org.junit.Test; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class RenameFileTest extends ScopedTest { diff --git a/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java b/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java index 18c5f09..51cb670 100644 --- a/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java +++ b/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class RecordUtilityTest { 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 37da936..bda35f8 100644 --- a/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java +++ b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AggregationSchedulerTest extends ScopedTest { diff --git a/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java index b1005fb..0b3a659 100644 --- a/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java @@ -21,9 +21,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ -public class SocialDataIndexerPluginSmartExecutorSchedulerTest extends ScopedTest { +public class SocialDataIndexerPluginSmartExecutorSchedulerTest { private static Logger logger = LoggerFactory.getLogger(SocialDataIndexerPluginSmartExecutorSchedulerTest.class); @@ -31,7 +31,7 @@ public class SocialDataIndexerPluginSmartExecutorSchedulerTest extends ScopedTes @Before public void before() throws Exception{ - super.before(); + //super.before(); //ScopeProvider.instance.reset(); // Comment this to run the test. this line has been added to avoid unwanted launch ScopeProvider.instance.set("/gcube"); proxy = ExecutorPlugin.getExecutorProxy("social-data-indexer-plugin").build(); @@ -41,10 +41,11 @@ public class SocialDataIndexerPluginSmartExecutorSchedulerTest extends ScopedTes public UUID scheduleTest(Scheduling scheduling, Long sleepTime) throws Exception { Map inputs = new HashMap(); logger.debug("Inputs : {}", inputs); - + inputs.put("scope", "gcube"); LaunchParameter parameter = new LaunchParameter("social-data-indexer-plugin", inputs); parameter.setScheduling(scheduling); + try { String uuidString = proxy.launch(parameter); return UUID.fromString(uuidString); diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java index 59687c4..eabaab7 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginSmartExecutorSchedulerTest.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ public class ISSweeperPluginSmartExecutorSchedulerTest extends ScopedTest { diff --git a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java index ddc2c3f..3d05831 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/ISSweeperPluginTest.java @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ public class ISSweeperPluginTest extends ScopedTest { diff --git a/src/test/java/org/gcube/informationsystem/sweeper/RemoveGoodRITest.java b/src/test/java/org/gcube/informationsystem/sweeper/RemoveGoodRITest.java index 9c25abf..4735bfb 100644 --- a/src/test/java/org/gcube/informationsystem/sweeper/RemoveGoodRITest.java +++ b/src/test/java/org/gcube/informationsystem/sweeper/RemoveGoodRITest.java @@ -17,7 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class RemoveGoodRITest extends ScopedTest { diff --git a/src/test/java/org/gcube/test/AccountingTest.java b/src/test/java/org/gcube/test/AccountingTest.java index 8249a6c..802f4df 100644 --- a/src/test/java/org/gcube/test/AccountingTest.java +++ b/src/test/java/org/gcube/test/AccountingTest.java @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class AccountingTest extends ScopedTest { diff --git a/src/test/java/org/gcube/test/TempTest.java b/src/test/java/org/gcube/test/TempTest.java index d096f6f..5e711fb 100644 --- a/src/test/java/org/gcube/test/TempTest.java +++ b/src/test/java/org/gcube/test/TempTest.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class TempTest { diff --git a/src/test/java/org/gcube/testutility/ScopedTest.java b/src/test/java/org/gcube/testutility/ScopedTest.java index b44090f..d934c53 100644 --- a/src/test/java/org/gcube/testutility/ScopedTest.java +++ b/src/test/java/org/gcube/testutility/ScopedTest.java @@ -3,14 +3,13 @@ */ package org.gcube.testutility; -//import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.junit.After; import org.junit.Before; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class ScopedTest { diff --git a/src/test/java/org/gcube/testutility/StressTestUtility.java b/src/test/java/org/gcube/testutility/StressTestUtility.java index 09f5637..812d4e4 100644 --- a/src/test/java/org/gcube/testutility/StressTestUtility.java +++ b/src/test/java/org/gcube/testutility/StressTestUtility.java @@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class StressTestUtility { diff --git a/src/test/java/org/gcube/testutility/TestOperation.java b/src/test/java/org/gcube/testutility/TestOperation.java index 8503fc4..4c72775 100644 --- a/src/test/java/org/gcube/testutility/TestOperation.java +++ b/src/test/java/org/gcube/testutility/TestOperation.java @@ -5,7 +5,7 @@ package org.gcube.testutility; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public interface TestOperation { diff --git a/src/test/java/org/gcube/testutility/TestUsageRecord.java b/src/test/java/org/gcube/testutility/TestUsageRecord.java index f495ed3..610d6b1 100644 --- a/src/test/java/org/gcube/testutility/TestUsageRecord.java +++ b/src/test/java/org/gcube/testutility/TestUsageRecord.java @@ -22,7 +22,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class TestUsageRecord { diff --git a/src/test/java/org/gcube/testutility/TestUtility.java b/src/test/java/org/gcube/testutility/TestUtility.java index 4ac81bd..267801a 100644 --- a/src/test/java/org/gcube/testutility/TestUtility.java +++ b/src/test/java/org/gcube/testutility/TestUtility.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class TestUtility { diff --git a/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java b/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java index 2b34b9d..7babdcc 100644 --- a/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/GCoreEndPointCreationTest.java @@ -12,7 +12,7 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.testutility.ScopedTest; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class GCoreEndPointCreationTest extends ScopedTest { 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 a5177cb..d7b5677 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/DefaultExecutorTest.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class DefaultExecutorTest extends ScopedTest { @@ -110,8 +110,9 @@ public class DefaultExecutorTest extends ScopedTest { inputs.put("Hello", "World"); long sleepTime = 20000; // 1000 millisec * 20 = 20 sec inputs.put(HelloWorldPlugin.SLEEP_TIME, sleepTime); + int minuteinterval = 2; // Every 5 minutes, for 12 times (one hour totally). - Scheduling scheduling = new Scheduling(60*5,12,true); + Scheduling scheduling = new Scheduling(60*minuteinterval,12,true); scheduling.setGlobal(false); LaunchParameter launchParameter = new LaunchParameter(HelloWorldPluginDeclaration.NAME, inputs, scheduling); @@ -130,12 +131,12 @@ public class DefaultExecutorTest extends ScopedTest { Thread.sleep(6000); // 12 sec (total : 22 sec) Assert.assertEquals(PluginState.DONE, proxy.getStateEvolution(executionIdentifier).getPluginState()); - Thread.sleep(1000*60*5); // After 5 minutes the thread should be active again + Thread.sleep(1000*60*minuteinterval); // After 5 minutes the thread should be active again Assert.assertEquals(PluginState.RUNNING, proxy.getStateEvolution(executionIdentifier).getPluginState()); Assert.assertEquals(PluginState.RUNNING, proxy.getIterationStateEvolution(executionIdentifier, 1).getPluginState()); - logger.debug("Trying to stop scheduled task"); - proxy.unSchedule(executionIdentifier, true); + //logger.debug("Trying to stop scheduled task"); + //proxy.unSchedule(executionIdentifier, true); } catch (Exception e) { logger.error("testOk Exception", e); 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 421a03e..1467dee 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/QueriedClientTest.java @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class QueriedClientTest { 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 14a25a1..f27eb42 100644 --- a/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java +++ b/src/test/java/org/gcube/vremanagement/executor/client/SmartGenericWorkerDiscoveryQuery.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class SmartGenericWorkerDiscoveryQuery {