From 1a3ef7a31d6eb1e009bb9c4069dbe08c1c94dcd6 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Tue, 26 Feb 2019 13:53:32 +0000 Subject: [PATCH] Merged from branch after release 4.13.1 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@177276 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../AccountingDataHarvesterPluginTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index cbf6592..552333f 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -36,9 +36,11 @@ import org.gcube.dataharvest.utils.Utils; import org.gcube.resourcemanagement.support.server.managers.context.ContextManager; import org.gcube.vremanagement.executor.api.rest.SmartExecutor; import org.gcube.vremanagement.executor.api.types.LaunchParameter; +import org.gcube.vremanagement.executor.api.types.Scheduling; import org.gcube.vremanagement.executor.client.SmartExecutorClientFactory; import org.junit.Assert; import org.junit.Test; +import org.quartz.CronExpression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,7 +122,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { } - @Test + // @Test public void launchPluginOnSmartExecutor() { try { @@ -136,7 +138,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { inputs.put(AccountingDataHarvesterPlugin.MEASURE_TYPE_INPUT_PARAMETER, aggregationType.name()); inputs.put(AccountingDataHarvesterPlugin.GET_VRE_USERS_INPUT_PARAMETER, true); inputs.put(AccountingDataHarvesterPlugin.RERUN_INPUT_PARAMETER, true); - inputs.put(AccountingDataHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, true); + inputs.put(AccountingDataHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, false); /* Calendar from = DateUtils.getStartCalendar(2016, Calendar.SEPTEMBER, 1); @@ -145,7 +147,11 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { inputs.put(AccountingDataHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate); */ - LaunchParameter launchParameter = new LaunchParameter(DataHarvestPluginDeclaration.NAME, inputs); + // + CronExpression cronExpression = new CronExpression("0 0 10 3 1/1 ? *"); + Scheduling scheduling = new Scheduling(cronExpression); + scheduling.setGlobal(false); + LaunchParameter launchParameter = new LaunchParameter(DataHarvestPluginDeclaration.NAME, inputs, scheduling); smartExecutor.launch(launchParameter); logger.info("End.");