From 813531f5ae9b07ee7761fc90f1aac9fd094a223d Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 17 Mar 2020 16:17:46 +0100 Subject: [PATCH] Feature #18848, Updated Catalogue ENUM in accounting dashboard harvester --- .../dataharvest/datamodel/HarvestedDataKey.java | 10 +++++----- .../AccountingDataHarvesterPluginTest.java | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java b/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java index ffe6d2b..c9d85ad 100644 --- a/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java +++ b/src/main/java/org/gcube/dataharvest/datamodel/HarvestedDataKey.java @@ -7,14 +7,14 @@ package org.gcube.dataharvest.datamodel; /** * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * May 22, 2018 + * @author M. Assante, ISTI-CNR */ public enum HarvestedDataKey { - CATALOGUE_ACCESSES("Catalogue Home Accesses"), - CATALOGUE_DATASET_LIST_ACCESSES("Catalogue Datasets List (Also Filtered)"), - CATALOGUE_DATASET_ACCESSES("Catalogue Dataset"), - CATALOGUE_RESOURCE_ACCESSES("Catalogue Resource"), + CATALOGUE_ACCESSES("Catalogue Accesses"), + CATALOGUE_DATASET_LIST_ACCESSES("Item List"), + CATALOGUE_DATASET_ACCESSES("Item Metadata"), + CATALOGUE_RESOURCE_ACCESSES("Item Resource"), ACCESSES("VRE Accesses"), USERS("VRE Users"), DATA_METHOD_DOWNLOAD("Data/Method download"), diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index c6e6b40..f41a73a 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -734,9 +734,10 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { @Test public void testCatalogueHarvester() { try { - +// String context = ROOT; + String context = "/gcube"; //Utils.setContext(RESOURCE_CATALOGUE); - ContextTest.setContextByName(ROOT); + ContextTest.setContextByName(context); System.out.println("vaaa"); AggregationType measureType = AggregationType.MONTHLY; @@ -751,13 +752,14 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { // ContextAuthorization contextAuthorization = new ContextAuthorization(); // SortedSet contexts = contextAuthorization.getContexts(); -// + + // for(String context : contexts) { - ScopeBean scopeBean = new ScopeBean(ROOT); + ScopeBean scopeBean = new ScopeBean(context); logger.debug("FullName {} - Name {}", scopeBean.toString(), scopeBean.name()); - ContextTest.setContextByName(ROOT); + ContextTest.setContextByName(context); CatalogueAccessesHarvester catalogueHarvester = new CatalogueAccessesHarvester(start, end); List data = catalogueHarvester.getAccountingRecords(); for (AccountingRecord accountingRecord : data) {