From eff29b0176527e5050d15c17b383808792cf9afd Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 12 May 2022 16:29:00 +0200 Subject: [PATCH] Fixed test --- .../gcat/persistence/grsf/GRSFUtilities.java | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java b/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java index d0ec8b1..3d29a40 100644 --- a/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java +++ b/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java @@ -28,6 +28,7 @@ import org.gcube.gcat.persistence.ckan.CKANPackageTest; import org.gcube.gcat.persistence.ckan.CKANUser; import org.gcube.gcat.persistence.ckan.CKANUtility; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,17 +46,16 @@ public class GRSFUtilities extends ContextTest { public static final String PREPROD_GRSF_PRE = "/pred4s/preprod/GRSF_Pre"; - public GRSFUtilities() throws ObjectNotFound, Exception { - ContextTest.setContextByName(PREPROD_GRSF_PRE); - } - - @Test - public void test() throws ObjectNotFound, Exception { + @BeforeClass + public void before() throws Exception { ContextTest.setContextByName(PREPROD_GRSF_PRE); // // ContextTest.setContextByName(PRODUCTION_GRSF); // ContextTest.setContextByName(PRODUCTION_GRSF_ADMIN); // ContextTest.setContextByName(PRODUCTION_GRSF_PRE); + + logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); + logger.debug(SecretManagerProvider.instance.get().getContext()); } private void create(Set createdGroup, Map groups, String name) throws JsonProcessingException, IOException { @@ -149,8 +149,6 @@ public class GRSFUtilities extends ContextTest { // @Test public void createNewGRSFGroups() throws ObjectNotFound, Exception { -// ContextTest.setContext(""); - logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); String sysAdminAPI = CKANUtility.getSysAdminAPI(); String[] groupNames = new String[] { "GRSF", "Legacy", "Fishery", "Stock", "FIRMS", "FishSource", "RAM", @@ -177,10 +175,6 @@ public class GRSFUtilities extends ContextTest { // @Test public void deleteNewGRSFGroups() throws ObjectNotFound, Exception { - ContextTest.setContext(""); - logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); - logger.debug(SecretManagerProvider.instance.get().getContext()); - String sysAdminAPI = CKANUtility.getSysAdminAPI(); // String[] groupNames = new String[] { // "GRSF", "Legacy", "Fishery", "Stock", "FIRMS", "FishSource", "RAM", @@ -192,6 +186,8 @@ public class GRSFUtilities extends ContextTest { // }; // List groupNames = CKANGroupTest.listGroup(); + logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); + logger.debug(SecretManagerProvider.instance.get().getContext()); for(String name : groupNames) { CKANGroup ckanGroupToCreate = new CKANGroup(); @@ -207,14 +203,9 @@ public class GRSFUtilities extends ContextTest { } - @Test + // @Test public void associateUserToAllCKANGroupsAndOrganization() throws ObjectNotFound, Exception { - ContextTest.setContext(""); - logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); - logger.debug(SecretManagerProvider.instance.get().getContext()); - String[] usernames = new String[] { "grsf_publisher", "luca_frosini", "francesco_mangiacrapa"}; - String sysAdminAPI = CKANUtility.getSysAdminAPI(); List groupNames = CKANGroupTest.listGroup(); @@ -299,9 +290,6 @@ public class GRSFUtilities extends ContextTest { // @Test public void purgeAllGRSFRecords() throws Exception { - ContextTest.setContext(""); - logger.debug(SecretManagerProvider.instance.get().getUser().getUsername()); - logger.debug(SecretManagerProvider.instance.get().getContext()); purgeGRSFRecords(100, 0); }