diff --git a/pom.xml b/pom.xml index fa60d82..d3e52f5 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,8 @@ provided + + org.gcube.data.publishing document-store-lib @@ -73,13 +75,6 @@ [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) test - - - org.reflections - reflections - 0.9.10 - test - + + org.gcube.accounting accounting-lib @@ -121,23 +118,15 @@ test --> - org.gcube.accounting accounting-analytics-persistence-couchbase [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) test - - - org.gcube.accounting - accounting-aggregator-se-plugin - [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - test - - - - + + + org.gcube.vremanagement smart-executor @@ -152,31 +141,28 @@ test - - org.gcube.information-system - is-sweeper-se-plugin - [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - test - - - - org.gcube.information-system - is-exporter-se-plugin - [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - test - - org.acme HelloWorldPlugin [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) test - + + org.gcube.accounting + accounting-aggregator-se-plugin + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + test + org.gcube.information-system - resource-registry-api - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + is-sweeper-se-plugin + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + test + + + org.gcube.information-system + is-exporter-se-plugin + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) test 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 446f6e8..5568154 100644 --- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java +++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/AccountingTest.java @@ -3,13 +3,6 @@ */ package org.gcube.accounting.datamodel.usagerecords; -import java.util.concurrent.TimeUnit; - -import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; -import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord; -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; @@ -41,7 +34,7 @@ public class AccountingTest extends ScopedTest{ @After public void after(){ try { - accountingPersistence.flush(1000, TimeUnit.MILLISECONDS); + accountingPersistence.flush(); } catch (Exception e) { logger.error("Error flushing Buffered Records", e); } diff --git a/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java b/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java index 961fa3c..2dc5a88 100644 --- a/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java +++ b/src/test/java/org/gcube/documentstore/records/RecordUtilityTest.java @@ -4,13 +4,7 @@ package org.gcube.documentstore.records; -import java.net.URI; - -import org.gcube.accounting.datamodel.UsageRecord.OperationResult; import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord; -import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord; -import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.DataType; -import org.gcube.accounting.datamodel.basetypes.AbstractStorageUsageRecord.OperationType; import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; import org.junit.Assert; import org.junit.Test; 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 a8d3ddb..2f637e6 100644 --- a/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java +++ b/src/test/java/org/gcube/documentstore/records/aggregation/AggregationSchedulerTest.java @@ -30,7 +30,7 @@ public class AggregationSchedulerTest extends ScopedTest { private static final Logger logger = LoggerFactory.getLogger(AggregationSchedulerTest.class); public static AggregationScheduler getAggregationScheduler(){ - return new BufferAggregationScheduler(persistenceExecutor, "TEST"); + return new BufferAggregationScheduler(persistenceExecutor); } public static PersistenceExecutor persistenceExecutor = new PersistenceExecutor(){ diff --git a/src/test/java/org/gcube/informationsystem/socialdataindexer/ResourceCheckerPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/informationsystem/socialdataindexer/ResourceCheckerPluginSmartExecutorSchedulerTest.java deleted file mode 100644 index bc7e652..0000000 --- a/src/test/java/org/gcube/informationsystem/socialdataindexer/ResourceCheckerPluginSmartExecutorSchedulerTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.gcube.informationsystem.socialdataindexer; - -import java.util.HashMap; -import java.util.Map; - -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.informationsystem.resource_checker.utils.SendNotification; -import org.gcube.vremanagement.executor.api.types.LaunchParameter; -import org.gcube.vremanagement.executor.api.types.Scheduling; -import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; -import org.gcube.vremanagement.executor.client.proxies.SmartExecutorProxy; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.quartz.CronExpression; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * Launch the ResourceCheckerPlugin - * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) - */ -public class ResourceCheckerPluginSmartExecutorSchedulerTest { - - private static Logger logger = LoggerFactory.getLogger(ResourceCheckerPluginSmartExecutorSchedulerTest.class); - private SmartExecutorProxy proxy; - - @Before - public void before() throws Exception{ - ScopeProvider.instance.set("/gcube"); - SecurityTokenProvider.instance.set("2c56a96d-5f17-41a0-94a8-b8efa44d9e7c-98187548"); // gcube scope, ResourceCheckerPlugin application - proxy = ExecutorPlugin.getExecutorProxy("resource-checker-se-plugin").build(); - Assert.assertNotNull(proxy); - } - - @Test - public void cronExpPreviousMustBeTerminated() throws Exception { - //CronExpression cronExpression = new CronExpression("0 0 0/4 * * ? *"); // every 30 minutes starting from now - CronExpression cronExpression = new CronExpression("0 0 0/1 * * ?"); // every 30 minutes starting from now - Scheduling scheduling = new Scheduling(cronExpression, true); - scheduling.setGlobal(true); - - Map inputs = new HashMap(); - inputs.put("role", "Administrator"); - logger.debug("Inputs : {}", inputs); - LaunchParameter parameter = new LaunchParameter("resource-checker-se-plugin", inputs); - Map inputsNotification = new HashMap(); - inputsNotification.put("recipient", "costantino.perciante"); - parameter.addPluginStateNotifications(SendNotification.class, inputsNotification); - parameter.setScheduling(scheduling); - - try { - String uuidString = proxy.launch(parameter); - logger.info("Launched with UUID : {}" + uuidString); - } catch(Exception e){ - logger.error("Error launching sheduled task" + e); - throw e; - } - - } - - //@Test - public void unSchedule() throws Exception { - String id = "c2918249-4644-47fb-b151-8f8448f67f05"; - //proxy.unSchedule(id, true); - proxy.stop(id); - } - -} diff --git a/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java b/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java deleted file mode 100644 index aaec9e3..0000000 --- a/src/test/java/org/gcube/informationsystem/socialdataindexer/SocialDataIndexerPluginSmartExecutorSchedulerTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/** - * - */ -package org.gcube.informationsystem.socialdataindexer; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.vremanagement.executor.api.types.LaunchParameter; -import org.gcube.vremanagement.executor.api.types.Scheduling; -import org.gcube.vremanagement.executor.client.plugins.ExecutorPlugin; -import org.gcube.vremanagement.executor.client.proxies.SmartExecutorProxy; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.quartz.CronExpression; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public class SocialDataIndexerPluginSmartExecutorSchedulerTest { - - private static Logger logger = LoggerFactory.getLogger(SocialDataIndexerPluginSmartExecutorSchedulerTest.class); - - private SmartExecutorProxy proxy; - - @Before - public void before() throws Exception{ - //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(); - Assert.assertNotNull(proxy); - } - - 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); - } catch(Exception e){ - logger.error("Error launching sheduled task", e); - throw e; - } - - } - - @Test - public void cronExpPreviousMustBeTerminated() throws Exception { - CronExpression cronExpression = new CronExpression("0 */10 * * * ?"); // every 10 minutes starting from now - Scheduling scheduling = new Scheduling(cronExpression, true); - scheduling.setGlobal(true); - UUID uuid = scheduleTest(scheduling, new Long(1000*60)); // 1 min - logger.debug("Launched with UUID : {}", uuid); - } - - //@Test - public void unSchedule() throws Exception { - proxy.unSchedule(null, true); - } - -}