From ce867018a796f551a934165abad54d6c22a115c9 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Wed, 1 Dec 2021 12:42:39 +0100
Subject: [PATCH] Test on fixed Query Request deserialization

---
 .../geoportal/service/ConcessioniOverMongoTest.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ConcessioniOverMongoTest.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ConcessioniOverMongoTest.java
index f856b84..f084f6d 100644
--- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ConcessioniOverMongoTest.java
+++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/ConcessioniOverMongoTest.java
@@ -10,11 +10,13 @@ import org.gcube.application.geoportal.common.model.legacy.Concessione;
 import org.gcube.application.geoportal.common.model.legacy.Concessione.Paths;
 import org.gcube.application.geoportal.common.model.legacy.LayerConcessione;
 import org.gcube.application.geoportal.common.model.legacy.report.ValidationReport.ValidationStatus;
+import org.gcube.application.geoportal.common.model.rest.QueryRequest;
 import org.gcube.application.geoportal.common.rest.InterfaceConstants;
 import org.gcube.application.geoportal.common.utils.FileSets;
 import org.gcube.application.geoportal.common.utils.Files;
 import org.gcube.application.geoportal.common.utils.StorageUtils;
 import org.gcube.application.geoportal.service.utils.Serialization;
+import org.gcube.common.storagehub.model.query.Queries;
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Before;
@@ -113,10 +115,10 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{
 
 
 	private static <T> Iterator<T> queryFile(String filename, WebTarget target, Class<T> clazz) throws Exception {
-		String queryString=TestConcessioniQueries.queries.get(filename);
+		QueryRequest req= Serialization.parseQuery(TestConcessioniQueries.queries.get(filename));
 
 		String result = check(target.path(InterfaceConstants.Methods.QUERY_PATH).request(MediaType.APPLICATION_JSON_TYPE).post(
-				Entity.entity(queryString,MediaType.APPLICATION_JSON)),String.class);
+				Entity.entity(Serialization.write(req),MediaType.APPLICATION_JSON)),String.class);
 		return Serialization.readCollection(result,clazz);
 	}