From 4d290b3a13ca6b4392c26fa1f879e18214973872 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 27 Apr 2022 16:44:26 +0200 Subject: [PATCH] Fixed tests --- .../gcat/persistence/ckan/CKANGroup.java | 2 +- .../gcat/persistence/ckan/GRSFUtilities.java | 30 +++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANGroup.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANGroup.java index 08891c7..3cb6573 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANGroup.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANGroup.java @@ -44,7 +44,7 @@ public class CKANGroup extends CKAN { PURGE = GROUP_PURGE; } - private static String fromGroupTitleToName(String groupName) { + public static String fromGroupTitleToName(String groupName) { if(groupName == null) return null; diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/GRSFUtilities.java b/src/test/java/org/gcube/gcat/persistence/ckan/GRSFUtilities.java index 9615086..cd15aa8 100644 --- a/src/test/java/org/gcube/gcat/persistence/ckan/GRSFUtilities.java +++ b/src/test/java/org/gcube/gcat/persistence/ckan/GRSFUtilities.java @@ -104,7 +104,7 @@ public class GRSFUtilities extends ContextTest { return modified; } - @Test + // @Test public void testGroupName() { String[] groupNames = new String[] { "GRSF", "Legacy", "Fishery", "Stock", "FIRMS", "FishSource", "RAM", @@ -116,7 +116,9 @@ public class GRSFUtilities extends ContextTest { }; for(String name : groupNames) { String ckanGroupName = getGroupNameOnCkan(name); - logger.info("{} -> {}", name, ckanGroupName); + String groupName = CKANGroup.fromGroupTitleToName(name); + logger.info("{} -> {}", name, ckanGroupName, groupName); + Assert.assertTrue(ckanGroupName.compareTo(groupName)==0); } } @@ -146,6 +148,30 @@ public class GRSFUtilities extends ContextTest { } } + // @Test + public void deleteNewGRSFGroups() throws ObjectNotFound, Exception { + String sysAdminAPI = CKANUtility.getSysAdminAPI(); + String[] groupNames = new String[] { + "GRSF", "Legacy", "Fishery", "Stock", "FIRMS", "FishSource", "RAM", + "Catch", "Landing", + "Abundance Level", "Abundance Level (FIRMS Standard)", "Biomass", + "Fishing Pressure", "Fishing Pressure (FIRMS Standard)", "State and Trend", + "FAO Stock Status Category", "Scientific Advice", + "GRSF SDG Flag", "GRSF Traceability Flag" + }; + for(String name : groupNames) { + CKANGroup ckanGroupToCreate = new CKANGroup(); + ckanGroupToCreate.setApiKey(sysAdminAPI); + ckanGroupToCreate.setName(getGroupNameOnCkan(name)); + try { + ckanGroupToCreate.purge(); + }catch (Exception e) { + + } + } + } + + // @Test public void associateUserToAllCKANGroups() throws ObjectNotFound, Exception { String sysAdminAPI = CKANUtility.getSysAdminAPI();