From 2b9b4dede028e0759e25ff2a0d6ad9c794dfb860 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 21 Sep 2021 18:03:18 +0200 Subject: [PATCH] Fixed test methods --- .../clients/StatefulClientTests.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatefulClientTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatefulClientTests.java index 9c24433..8762530 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatefulClientTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatefulClientTests.java @@ -3,6 +3,7 @@ package org.gcube.application.geoportal.clients; import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.statefulMongoConcessioni; import static org.junit.Assert.*; +import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -37,28 +38,32 @@ public class StatefulClientTests extends BasicVreTests{ UploadedImage toRegisterImg= TestModel.prepareConcessione().getImmaginiRappresentative().get(0); // TEMP Files are hosted in INFRASTRUCTURE's VOLATILE AREA - TempFile toUpload=storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/immagine.png")), "immagine.png"); + TempFile toUpload=storage.putOntoStorage( + new File(TestModel.getBaseFolder(),"immagine.png"), "immagine.png"); + manager.addImmagineRappresentativa(toRegisterImg, toUpload); - + + //Alternative Method - InputStreamDescriptor isDesc=new InputStreamDescriptor(new FileInputStream(Files.getFileFromResources("test-data/concessioni/immagine.png")), "immagine.png"); + InputStreamDescriptor isDesc= + new InputStreamDescriptor(new FileInputStream(new File(TestModel.getBaseFolder(), + "immagine.png")), "immagine.png"); manager.addImmagineRappresentativa(toRegisterImg, isDesc); - - - + + //Relazione manager.setRelazioneScavo(TestModel.prepareConcessione().getRelazioneScavo(), - storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/relazione.pdf")), "relazione_it.pdf"), - storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/relazione.pdf")), "relazione_en.pdf")); + storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_it.pdf"), + storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_en.pdf")); // Posizionamento scavo manager.setPosizionamento(TestModel.prepareConcessione().getPosizionamentoScavo(), - storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/pos.shp")), "pos.shp")); + storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pos.shp"), "pos.shp")); // Piante manager.addPiantaFineScavo(TestModel.prepareConcessione().getPianteFineScavo().get(0), - storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/pianta.shp")), "pianta.shp"), - storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("test-data/concessioni/pianta.shx")), "pianta.shx")); + storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pianta.shp"), "pianta.shp"), + storage.putOntoStorage(new File(TestModel.getBaseFolder(),"pianta.shx"), "pianta.shx")); return manager.publish(); }