From add1754dccd7d2831dfcf51663777ee12a0e00b6 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Wed, 1 Dec 2021 12:02:48 +0100 Subject: [PATCH] Refactored Test Classes --- .../application/geoportal/StorageTests.java | 2 +- .../clients/StatefulClientTests.java | 25 ++++++------ .../clients/StatelessClientTests.java | 40 +++++++++---------- .../service/ConcessioniOverMongoTest.java | 31 +++++++------- .../service/engine/caches/Caches.java | 5 ++- .../engine/materialization/SDITests.java | 5 ++- .../application/cms/usecases/StressTest.java | 7 ++-- .../mocks/ConcessionPublisherThread.java | 9 +++-- .../cms/usecases/mocks/MockFromFolder.java | 4 +- 9 files changed, 67 insertions(+), 61 deletions(-) diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java index 5056c64..87f4801 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/StorageTests.java @@ -2,7 +2,7 @@ package org.gcube.application.geoportal; import org.apache.commons.io.IOUtils; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.TestModel; + import org.gcube.application.geoportal.common.rest.TempFile; import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.StorageUtils; 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 40ed640..f8e861b 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 @@ -7,7 +7,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import org.gcube.application.cms.tests.model.TestModel; + +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.client.legacy.ConcessioniManagerI; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.legacy.*; @@ -28,28 +29,28 @@ public class StatefulClientTests extends BasicVreTests{ StorageUtils storage=new StorageUtils(); - Concessione toRegister= TestModel.prepareEmptyConcessione(); + Concessione toRegister= TestConcessioniModel.prepareEmptyConcessione(); toRegister.setNome("Mock module"); manager.createNew(toRegister); - Concessione source=TestModel.prepareConcessione(); + Concessione source=TestConcessioniModel.prepareConcessione(); UploadedImage toRegisterImg= source.getImmaginiRappresentative().get(0); // TEMP Files are hosted in INFRASTRUCTURE's VOLATILE AREA TempFile toUpload=storage.putOntoStorage( - new File(TestModel.getBaseFolder(),"immagine1.png"), "immagine.png"); + new File(TestConcessioniModel.getBaseFolder(),"immagine1.png"), "immagine.png"); manager.addImmagineRappresentativa(toRegisterImg, toUpload); //Alternative Method InputStreamDescriptor isDesc= - new InputStreamDescriptor(new FileInputStream(new File(TestModel.getBaseFolder(), + new InputStreamDescriptor(new FileInputStream(new File(TestConcessioniModel.getBaseFolder(), "immagine1.png")), "San Mauro_drone totale.JPG"); manager.addImmagineRappresentativa(toRegisterImg, isDesc); @@ -58,15 +59,15 @@ public class StatefulClientTests extends BasicVreTests{ //Relazione manager.setRelazioneScavo(source.getRelazioneScavo(), - storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_it.pdf"), - storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "relazione_en.pdf")); + storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"), "relazione_it.pdf"), + storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"), "relazione_en.pdf")); assertEquals(AccessPolicy.EMBARGOED,manager.getCurrent().getRelazioneScavo().getPolicy()); //Abstract manager.setAbstractRelazioneScavo( source.getAbstractRelazione(), - storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_it.pdf"), - storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_en.pdf")); + storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_it.pdf"), + storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"), "abstract_relazione_en.pdf")); @@ -74,12 +75,12 @@ public class StatefulClientTests extends BasicVreTests{ manager.setPosizionamento(source.getPosizionamentoScavo(), storage.putOntoStorage( - new File(TestModel.getBaseFolder(),"pos.shp"),"pos.shp")); + new File(TestConcessioniModel.getBaseFolder(),"pos.shp"),"pos.shp")); // Piante manager.addPiantaFineScavo(source.getPianteFineScavo().get(0), storage.putOntoStorage( - new File(TestModel.getBaseFolder(),"pianta.shp"),"pianta.shp")); + new File(TestConcessioniModel.getBaseFolder(),"pianta.shp"),"pianta.shp")); // new File("/Users/fabioisti/Documents/invio_08_05/Montalto di Castro (VT)_Vulci_Indagini non invasive_Doc. paragr._Va/CONSEGNA_WGS84") // .listFiles((file,name)->{return name.startsWith("Mag_anomalies_WGS84");}))); @@ -118,7 +119,7 @@ public class StatefulClientTests extends BasicVreTests{ ConcessioniManagerI manager=statefulMongoConcessioni().build(); StorageUtils storage=new StorageUtils(); - manager.createNew(TestModel.prepareEmptyConcessione()); + manager.createNew(TestConcessioniModel.prepareEmptyConcessione()); manager.delete(); } diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java index 7da0e2c..5d5602e 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/StatelessClientTests.java @@ -12,9 +12,9 @@ import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; import org.bson.Document; -import org.gcube.application.cms.tests.model.TestFilters; -import org.gcube.application.cms.tests.model.TestModel; -import org.gcube.application.cms.tests.model.TestQueries; +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniFilters; +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniQueries; import org.gcube.application.geoportal.client.utils.Queries; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.legacy.*; @@ -40,7 +40,7 @@ public class StatelessClientTests extends BasicVreTests{ @Test public void searches() throws Exception { - TestFilters.filters.forEach((k,v)->{ + TestConcessioniFilters.filters.forEach((k, v)->{ try { System.out.println("Count for " + k + "\t" + count(client.search(v))); }catch (Exception e){ @@ -62,7 +62,7 @@ public class StatelessClientTests extends BasicVreTests{ // No Transformation System.out.print("First Registered \t"); Iterator queriedDocuments=client.query( - Queries.parse(TestQueries.queries.get("firstRegistered.json"))); + Queries.parse(TestConcessioniQueries.queries.get("firstRegistered.json"))); // Expected one result assertTrue(count(queriedDocuments)==1); @@ -71,7 +71,7 @@ public class StatelessClientTests extends BasicVreTests{ System.out.print("Last Registered \t"); // Expected one result queriedDocuments=client.query( - Queries.parse(TestQueries.queries.get("lastRegistered.json"))); + Queries.parse(TestConcessioniQueries.queries.get("lastRegistered.json"))); assertTrue(count(queriedDocuments)==1); queriedDocuments.forEachRemaining((Concessione c)->{System.out.println(c.getNome());}); @@ -80,11 +80,11 @@ public class StatelessClientTests extends BasicVreTests{ // Transformations System.out.println( client.queryForJSON( - Queries.parse(TestQueries.queries.get("lastNameRegisteredByFabio.json")))); + Queries.parse(TestConcessioniQueries.queries.get("lastNameRegisteredByFabio.json")))); System.out.println( client.queryForJSON( - Queries.parse(TestQueries.queries.get("publicationWarningMessages.json")))); + Queries.parse(TestConcessioniQueries.queries.get("publicationWarningMessages.json")))); // String query=Files.readFileAsString(filterFile.getAbsolutePath(), Charset.defaultCharset()); // System.out.println("Count for "+filterFile.getName()+"\t"+ count(client.search(query))); @@ -101,14 +101,14 @@ public class StatelessClientTests extends BasicVreTests{ @Test public void testCreateNew() throws Exception { - Concessione c= client.createNew(TestModel.prepareEmptyConcessione()); + Concessione c= client.createNew(TestConcessioniModel.prepareEmptyConcessione()); assertNotNull(c); assertNotNull(c.getMongo_id()); } @Test public void testReplace() throws Exception { - Concessione testObject= client.createNew(TestModel.prepareEmptyConcessione()); + Concessione testObject= client.createNew(TestConcessioniModel.prepareEmptyConcessione()); String title="My new shiny Title"; testObject.setNome(title); Concessione c1=client.replace(testObject); @@ -117,11 +117,11 @@ public class StatelessClientTests extends BasicVreTests{ @Test public void testUploadFileSet() throws Exception { - Concessione testObject= client.createNew(TestModel.prepareConcessione()); + Concessione testObject= client.createNew(TestConcessioniModel.prepareConcessione()); AddSectionToConcessioneRequest request= -// FileSets.prepareRequest(new StorageUtils(),Paths.RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf")); +// FileSets.prepareRequest(new StorageUtils(),Paths.RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf")); FileSets.build(Paths.ABSTRACT_RELAZIONE).add( - new StorageUtils().putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"),"San Mauro_drone totale.JPG")) + new StorageUtils().putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"),"San Mauro_drone totale.JPG")) .getTheRequest(); testObject= client.registerFileSet(testObject.getMongo_id(), request); @@ -134,7 +134,7 @@ public class StatelessClientTests extends BasicVreTests{ @Test public void testDeleteById() throws Exception { - Concessione c= client.createNew(TestModel.prepareEmptyConcessione()); + Concessione c= client.createNew(TestConcessioniModel.prepareEmptyConcessione()); client.deleteById(c.getMongo_id()); } @@ -181,7 +181,7 @@ public class StatelessClientTests extends BasicVreTests{ private Concessione prepare() throws Exception { int numImgs=1; - Concessione c= client.createNew(TestModel.prepareConcessione(1,numImgs)); + Concessione c= client.createNew(TestConcessioniModel.prepareConcessione(1,numImgs)); StorageUtils storage = new StorageUtils(); c.getRelazioneScavo().setPolicy(AccessPolicy.EMBARGOED); @@ -191,30 +191,30 @@ public class StatelessClientTests extends BasicVreTests{ assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); c=client.registerFileSet(mongoId, - FileSets.prepareRequest(storage,Paths.RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf"))); + FileSets.prepareRequest(storage,Paths.RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"))); assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); c=client.registerFileSet(mongoId, - FileSets.prepareRequest(storage,Paths.ABSTRACT_RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf"))); + FileSets.prepareRequest(storage,Paths.ABSTRACT_RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"))); assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); for(int i=0;i Iterator queryFile(String filename, WebTarget target, Class clazz) throws Exception { - String queryString= TestQueries.queries.get(filename); + String queryString= 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); @@ -135,7 +136,7 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ public void search() throws Exception { WebTarget target=target(PATH); AtomicLong validatedCount= new AtomicLong(0); - Iterator it=search(TestFilters.filters.get("validated.json"),target); + Iterator it=search(TestConcessioniFilters.filters.get("validated.json"),target); it.forEachRemaining(concessione -> {validatedCount.incrementAndGet();}); System.out.println("Validated : "+ validatedCount.get()); } @@ -170,7 +171,7 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ @Test public void createNew() throws Exception { WebTarget target=target(PATH); - Concessione c=register(target,TestModel.prepareConcessione()); + Concessione c=register(target,TestConcessioniModel.prepareConcessione()); Assert.assertTrue(c.getMongo_id()!=null&&!c.getMongo_id().isEmpty()); } @@ -237,14 +238,14 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ @Test public void uploadFile() throws Exception { WebTarget target=target(PATH); - Response resp=target.request(MediaType.APPLICATION_JSON).post(Entity.entity(Serialization.write(TestModel.prepareEmptyConcessione()), MediaType.APPLICATION_JSON)); + Response resp=target.request(MediaType.APPLICATION_JSON).post(Entity.entity(Serialization.write(TestConcessioniModel.prepareEmptyConcessione()), MediaType.APPLICATION_JSON)); Concessione c=check(resp,Concessione.class); Assert.assertTrue(c.getMongo_id()!=null&&!c.getMongo_id().isEmpty()); System.out.println("ID IS "+c.getMongo_id()); // Insert section - c.setRelazioneScavo(TestModel.prepareConcessione().getRelazioneScavo()); - // c.getRelazioneScavo().setMongo_id(TestModel.rnd()); + c.setRelazioneScavo(TestConcessioniModel.prepareConcessione().getRelazioneScavo()); + // c.getRelazioneScavo().setMongo_id(TestConcessioniModel.rnd()); resp=target.request(MediaType.APPLICATION_JSON).put(Entity.entity(Serialization.write(c), MediaType.APPLICATION_JSON)); @@ -312,10 +313,10 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ private Concessione getFullPublished(WebTarget target) throws Exception { - File layerFolder=TestModel.getBaseFolder(); + File layerFolder=TestConcessioniModel.getBaseFolder(); Map> layers = Files.getAllShapeSet(layerFolder,true); - Concessione c=TestModel.prepareConcessione(layers.size(),1); + Concessione c=TestConcessioniModel.prepareConcessione(layers.size(),1); c.getRelazioneScavo().setPolicy(AccessPolicy.EMBARGOED); assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); @@ -338,7 +339,7 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ String[] keys=layers.keySet().toArray(new String [0]); c=upload(storage,target,c.getMongo_id(),Paths.POSIZIONAMENTO, -// TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta.shp");})); +// TestConcessioniModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta.shp");})); layers.get(keys[0]).toArray(new File[0])); assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); @@ -349,7 +350,7 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{ c.getContentByPath(path).setTitolo("Pianta from "+key.replace(layerFolder.getAbsolutePath(),"")); c=update(c,target); c=upload(storage, target, c.getMongo_id(), path, -// TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta.shp");})); +// TestConcessioniModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta.shp");})); layers.get(key).toArray(new File[0])); } assertEquals(AccessPolicy.EMBARGOED,c.getRelazioneScavo().getPolicy()); diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java index 00c5081..bb75222 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/caches/Caches.java @@ -4,7 +4,8 @@ import ch.qos.logback.core.net.SyslogOutputStream; import com.mongodb.MongoWaitQueueFullException; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.TestModel; + +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.service.BasicServiceTestUnit; import org.gcube.application.geoportal.service.engine.ImplementationProvider; @@ -114,7 +115,7 @@ public class Caches extends BasicServiceTestUnit { final StorageUtils storage=ImplementationProvider.get().getStorageProvider().getObject(); - String id =storage.putOntoStorage(new File(TestModel.getBaseFolder(),"relazione.pdf"))[0].getId(); + String id =storage.putOntoStorage(new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf"))[0].getId(); //for 100 secs while(Duration.between(start,LocalDateTime.now()). diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/materialization/SDITests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/materialization/SDITests.java index c6558f3..7896692 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/materialization/SDITests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/materialization/SDITests.java @@ -3,7 +3,8 @@ package org.gcube.application.geoportal.service.engine.materialization; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.TestModel; + +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.legacy.GeoServerContent; import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; @@ -60,7 +61,7 @@ public class SDITests { //Disabled because dependant on state public void registerLayer() throws IOException, SDIInteractionException { Concessione toTest= Serialization.read(Files.readFileAsString( - new File(TestModel.getBaseFolder(),"transferTest.json").getAbsolutePath(), Charset.defaultCharset()), Concessione.class); + new File(TestConcessioniModel.getBaseFolder(),"transferTest.json").getAbsolutePath(), Charset.defaultCharset()), Concessione.class); SDIManager manager = new SDIManager(); diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java index c09d177..cbf3b2e 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/StressTest.java @@ -2,7 +2,8 @@ package org.gcube.application.cms.usecases; import lombok.extern.slf4j.Slf4j; import org.gcube.application.cms.tests.TokenSetter; -import org.gcube.application.cms.tests.model.TestModel; + +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.common.model.legacy.Concessione; import org.gcube.application.geoportal.common.model.rest.AddSectionToConcessioneRequest; import org.gcube.application.geoportal.common.rest.MongoConcessioni; @@ -29,7 +30,7 @@ public class StressTest { AtomicLong executed=new AtomicLong(0); AddSectionToConcessioneRequest request= FileSets.prepareRequest( - new StorageUtils(), Concessione.Paths.RELAZIONE,new File(TestModel.getBaseFolder(),"relazione.pdf")); + new StorageUtils(), Concessione.Paths.RELAZIONE,new File(TestConcessioniModel.getBaseFolder(),"relazione.pdf")); int numRequests=100000; for(int i=0;i> piante, List pos, MongoConcessioni client, StorageUtils storage) throws Exception { - Concessione c= TestModel.prepareConcessione(piante.size(), 1); + Concessione c= TestConcessioniModel.prepareConcessione(piante.size(), 1); c.setNome("Mock for "+baseName+" ("+packageName+")"); c= client.createNew(c); String mongoId=c.getMongo_id(); // TEST DATA, DO NOT CARE client.registerFileSet(mongoId, FileSets.prepareRequest(storage, - Concessione.Paths.RELAZIONE,new File (TestModel.getBaseFolder(),"relazione.pdf"))); + Concessione.Paths.RELAZIONE,new File (TestConcessioniModel.getBaseFolder(),"relazione.pdf"))); client.registerFileSet(mongoId, FileSets.prepareRequest(storage, - Concessione.Paths.imgByIndex(0),Files.getSiblings(TestModel.getBaseFolder(),"immagine").get(0))); + Concessione.Paths.imgByIndex(0),Files.getSiblings(TestConcessioniModel.getBaseFolder(),"immagine").get(0))); // POSIZIONAMENTO diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/mocks/MockFromFolder.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/mocks/MockFromFolder.java index e1f0852..802f845 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/mocks/MockFromFolder.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/mocks/MockFromFolder.java @@ -2,8 +2,8 @@ package org.gcube.application.cms.usecases.mocks; import com.opencsv.CSVReader; import lombok.extern.slf4j.Slf4j; -import org.gcube.application.cms.tests.model.TestModel; import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.cms.tests.model.concessioni.TestConcessioniModel; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.utils.FileSets; @@ -30,7 +30,7 @@ public class MockFromFolder { String context = "/pred4s/preprod/preVRE"; - File descriptorsBaseFolder=new File(TestModel.getBaseFolder(),"packages"); + File descriptorsBaseFolder=new File(TestConcessioniModel.getBaseFolder(),"packages"); // config csv -> base folder Map configurations=new HashMap<>();