From 88fad4a3d7b0cfc72e7060988325fcfa99b529d8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 3 Apr 2024 12:44:18 +0200 Subject: [PATCH] Fixing service --- src/main/resources/freemarker/Fishery.ftl | 5 ++--- src/main/resources/freemarker/Stock.ftl | 5 ++--- src/test/java/org/gcube/grsf/publisher/ContextTest.java | 4 ++-- .../java/org/gcube/grsf/publisher/record/RecordTest.java | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/resources/freemarker/Fishery.ftl b/src/main/resources/freemarker/Fishery.ftl index 1f1d734..d5d5fe1 100644 --- a/src/main/resources/freemarker/Fishery.ftl +++ b/src/main/resources/freemarker/Fishery.ftl @@ -18,10 +18,9 @@ <@metadata key="Short Name" namespace=identity_namespace var=short_name /> <#if database_sources??> <@metadatalist key="Database Source" namespace=identity_namespace list=database_sources /> - <#if include_sensitive> - <#-- We are in Administrative VRE e.g. GRSF_Admin --> + <#if source = "grsf"> <#list database_sources as database_source> - <#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] > + <#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] > diff --git a/src/main/resources/freemarker/Stock.ftl b/src/main/resources/freemarker/Stock.ftl index f7166e3..19626a9 100644 --- a/src/main/resources/freemarker/Stock.ftl +++ b/src/main/resources/freemarker/Stock.ftl @@ -18,10 +18,9 @@ <@metadata key="Short Name" namespace=identity_namespace var=short_name /> <#if database_sources??> <@metadatalist key="Database Source" namespace=identity_namespace list=database_sources /> - <#if include_sensitive> - <#-- We are in Administrative VRE e.g. GRSF_Admin --> + <#if source = "grsf"> <#list database_sources as database_source> - <#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] > + <#assign group_list += [{"name":"${database_source_name_to_id[database_source?json_string]}-group", "title":"${database_source?json_string}"}] > diff --git a/src/test/java/org/gcube/grsf/publisher/ContextTest.java b/src/test/java/org/gcube/grsf/publisher/ContextTest.java index e11dabb..79665ed 100644 --- a/src/test/java/org/gcube/grsf/publisher/ContextTest.java +++ b/src/test/java/org/gcube/grsf/publisher/ContextTest.java @@ -64,8 +64,8 @@ public class ContextTest { ROOT_PROD = "/d4science.research-infrastructures.eu"; -// DEFAULT_TEST_SCOPE = DEVVRE; - DEFAULT_TEST_SCOPE = VRE_GRSF_PRE; + DEFAULT_TEST_SCOPE = DEVVRE; +// DEFAULT_TEST_SCOPE = VRE_GRSF_PRE; properties = new Properties(); InputStream input = ContextTest.class.getClassLoader().getResourceAsStream(CONFIG_INI_FILENAME); diff --git a/src/test/java/org/gcube/grsf/publisher/record/RecordTest.java b/src/test/java/org/gcube/grsf/publisher/record/RecordTest.java index c9ee6ce..881b482 100644 --- a/src/test/java/org/gcube/grsf/publisher/record/RecordTest.java +++ b/src/test/java/org/gcube/grsf/publisher/record/RecordTest.java @@ -238,7 +238,7 @@ public class RecordTest extends ContextTest { // maxTestRecords = 1; int maxTestRecordsPerSource = Integer.MAX_VALUE; -// maxTestRecordsPerSource = 3; + maxTestRecordsPerSource = 5; /* * Tell if we want test the whole creation process; @@ -455,7 +455,7 @@ public class RecordTest extends ContextTest { } @Ignore -// @Test + @Test public void testDeleteAll() throws Exception { ContextTest.setContextByName(DEVVRE);