From f812ac31d68a25270267888468e17d198d5ca557 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 20 May 2022 15:43:35 +0200
Subject: [PATCH] updated

---
 .../java/org/gcube/application/UCD_Tests.java | 58 ++++++++++++++-----
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/test/java/org/gcube/application/UCD_Tests.java b/src/test/java/org/gcube/application/UCD_Tests.java
index d26ff3d..cbb5397 100644
--- a/src/test/java/org/gcube/application/UCD_Tests.java
+++ b/src/test/java/org/gcube/application/UCD_Tests.java
@@ -23,11 +23,11 @@ public class UCD_Tests {
 	// private static String TOKEN = ""; //preVRE
 
 	private static String CONTEXT = "/gcube/devsec/devVRE";
-	private static String TOKEN = "3aa85bbf-d5f3-4df4-ad03-4f8f788eba3d-98187548"; // devVRE
+	private static String TOKEN = ""; // devVRE
 
 	private static String PROFILE_ID = "profiledConcessioni";
 
-	@Before
+	//@Before
 	public void getClient() {
 		// assumeTrue(GCubeTest.isTestInfrastructureEnabled());
 		ScopeProvider.instance.set(CONTEXT);
@@ -35,7 +35,7 @@ public class UCD_Tests {
 		client = GeoportalClientCaller.useCaseDescriptors();
 	}
 
-	// @Test
+	//@Test
 	public void getList() throws Exception {
 		ScopeProvider.instance.set(CONTEXT);
 		SecurityTokenProvider.instance.set(TOKEN);
@@ -69,22 +69,12 @@ public class UCD_Tests {
 		}
 	}
 
-	@Test
-	public void getUCDForHandlerIds() throws Exception {
+	//@Test
+	public void getUCDForDataEntryHandlerIds() throws Exception {
 		ScopeProvider.instance.set(CONTEXT);
 		SecurityTokenProvider.instance.set(TOKEN);
 
-//		List<String> handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_data_entry.getId());
-//		List<UseCaseDescriptor> listOfUCD = client
-//				.getListForHandlerIds(handlersIds);
-//		int i = 0;
-//		for (UseCaseDescriptor useCaseDescriptor : listOfUCD) {
-//			System.out.println(++i + ") " + useCaseDescriptor);
-//			UseCaseDescriptorDV ucdDV = ConvertToDataValueObjectModel.toUseCaseDescriptorDV(useCaseDescriptor, null);
-//			System.out.println("returned " + ucdDV);
-//		}
-
-		List<String> handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_data_entry.getId());
+		List<String> handlersIds = null;
 		List<UseCaseDescriptor> listUseCaseDescriptor;
 		try {
 			UseCaseDescriptorCaller client = GeoportalClientCaller.useCaseDescriptors();
@@ -113,5 +103,41 @@ public class UCD_Tests {
 		System.out.println(listUCDDV);
 
 	}
+	
+	
+	//@Test
+	public void getUCDForDatalistHandlerIds() throws Exception {
+		ScopeProvider.instance.set(CONTEXT);
+		SecurityTokenProvider.instance.set(TOKEN);
+
+		List<String> handlersIds = null;
+		List<UseCaseDescriptor> listUseCaseDescriptor;
+		try {
+			UseCaseDescriptorCaller client = GeoportalClientCaller.useCaseDescriptors();
+
+			if (handlersIds == null) {
+				handlersIds = Arrays.asList(GEOPORTAL_DATA_HANDLER.geoportal_data_list.getId());
+				System.out.println("handlersIds is null, so using default: " + handlersIds);
+			}
+			listUseCaseDescriptor = client.getListForHandlerIds(handlersIds);
+		} catch (Exception e) {
+			String error = "Error on contacting the Geoportal service";
+			System.out.println(error + " for handlers: " + handlersIds);
+			throw new Exception(
+					"Error when contacting the Geoportal service. Refresh and try again or contact the support", e);
+		}
+
+		if (listUseCaseDescriptor == null) {
+			listUseCaseDescriptor = new ArrayList<UseCaseDescriptor>();
+		}
+
+		List<UseCaseDescriptorDV> listUCDDV = new ArrayList<UseCaseDescriptorDV>(listUseCaseDescriptor.size());
+		for (UseCaseDescriptor ucd : listUseCaseDescriptor) {
+			listUCDDV.add(ConvertToDataValueObjectModel.toUseCaseDescriptorDV(ucd, null));
+		}
+		
+		System.out.println(listUCDDV);
+
+	}
 
 }