diff --git a/src/test/java/org/gcube/application/geoportal/common/model/BasicVreTests.java b/src/test/java/org/gcube/application/geoportal/common/model/BasicVreTests.java new file mode 100644 index 0000000..aa598e5 --- /dev/null +++ b/src/test/java/org/gcube/application/geoportal/common/model/BasicVreTests.java @@ -0,0 +1,15 @@ +package org.gcube.application.geoportal.common.model; + +import org.junit.Before; +import org.junit.BeforeClass; + +public class BasicVreTests { + + @BeforeClass + public static void setScope(){ +// TokenSetter.set("/gcube/devNext/NextNext"); + TokenSetter.set("/gcube/devsec/devVRE"); + } + + +} diff --git a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java index 12a7be5..735dcc5 100644 --- a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java +++ b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java @@ -12,15 +12,11 @@ import org.gcube.application.geoportal.common.model.legacy.report.ValidationRepo import org.junit.Before; import org.junit.Test; -public class ConcessioniTests { +public class ConcessioniTests extends BasicVreTests{ static boolean STOP_ON_FAIL=true; - @Before - public void setScope(){ -// TokenSetter.set("/gcube/devNext/NextNext"); - TokenSetter.set("/gcube/devsec/devVRE"); - } + @Test public void readAll() throws Exception { diff --git a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniManagerTest.java b/src/test/java/org/gcube/application/geoportal/common/model/StatefulClientTests.java similarity index 92% rename from src/test/java/org/gcube/application/geoportal/common/model/ConcessioniManagerTest.java rename to src/test/java/org/gcube/application/geoportal/common/model/StatefulClientTests.java index 4d6914e..a97ad28 100644 --- a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniManagerTest.java +++ b/src/test/java/org/gcube/application/geoportal/common/model/StatefulClientTests.java @@ -21,18 +21,11 @@ import org.junit.Before; import org.junit.Test; -public class ConcessioniManagerTest { +public class StatefulClientTests extends BasicVreTests{ - @Before - public void setScope(){ -// TokenSetter.set("/gcube/devNext/NextNext"); - TokenSetter.set("/gcube/devsec/devVRE"); - } - @Test - public void createNew() throws RemoteBackendException, FileNotFoundException, Exception { - + private Concessione publishNew() throws Exception { ConcessioniManagerI manager=statefulMongoConcessioni().build(); StorageUtils storage=new StorageUtils(); @@ -66,8 +59,14 @@ public class ConcessioniManagerTest { storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("concessioni/pianta.shp")), "pianta.shp"), storage.putOntoStorage(new FileInputStream(Files.getFileFromResources("concessioni/pianta.shx")), "pianta.shx")); - Concessione published=manager.publish(); - + return manager.publish(); + } + + + + @Test + public void testRegisterNew() throws RemoteBackendException, FileNotFoundException, Exception { + Concessione published=publishNew(); // VARIOUS CHECKS @@ -89,6 +88,8 @@ public class ConcessioniManagerTest { StorageUtils storage=new StorageUtils(); manager.createNew(TestModel.prepareEmptyConcessione()); + + manager.delete(); } diff --git a/src/test/java/org/gcube/application/geoportal/common/model/StatelessClientTests.java b/src/test/java/org/gcube/application/geoportal/common/model/StatelessClientTests.java new file mode 100644 index 0000000..a3cca34 --- /dev/null +++ b/src/test/java/org/gcube/application/geoportal/common/model/StatelessClientTests.java @@ -0,0 +1,112 @@ +package org.gcube.application.geoportal.common.model; + +import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.mongoConcessioni; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.FileInputStream; +import java.util.Collections; +import java.util.concurrent.atomic.AtomicLong; + +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.report.ValidationReport.ValidationStatus; +import org.gcube.application.geoportal.common.rest.AddSectionToConcessioneRequest; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; +import org.gcube.application.geoportal.common.utils.Files; +import org.gcube.application.geoportal.common.utils.StorageUtils; +import org.junit.Test; + +public class StatelessClientTests extends BasicVreTests{ + + + private MongoConcessioni client=mongoConcessioni().build(); + + @Test + public void testCreateNew() throws Exception { + Concessione c= client.createNew(TestModel.prepareEmptyConcessione()); + assertNotNull(c); + assertNotNull(c.getMongo_id()); + } + + @Test + public void testDeleteById() throws Exception { + Concessione c= client.createNew(TestModel.prepareEmptyConcessione()); + client.deleteById(c.getMongo_id()); + } + + @Test + public void testList() throws Exception { + final AtomicLong counter=new AtomicLong(); + long before=System.currentTimeMillis(); + client.getList().forEach((Concessione c)-> {counter.addAndGet(1);}); + System.out.println("Loaded "+counter+" in "+(System.currentTimeMillis()-before)+" ms"); + } + + @Test + public void testReplace() throws Exception { + Concessione c= client.createNew(TestModel.prepareEmptyConcessione()); + + String title="My new shiny Title"; + c.setNome(title); + Concessione c1=client.replace(c); + assertEquals(title, c1.getNome()); + } + + @Test + public void testUploadFileSet() throws Exception { + Concessione c= client.createNew(TestModel.prepareConcessione()); + assertNotNull(c.getRelazioneScavo()); + AddSectionToConcessioneRequest request= + new AddSectionToConcessioneRequest(Paths.RELAZIONE, + Collections.singletonList(new StorageUtils().putOntoStorage( + new FileInputStream(Files.getFileFromResources("concessioni/relazione.pdf")), "relazione.pdf"))); + + c= client.registerFile(c.getMongo_id(), request); + + assertNotNull(c.getRelazioneScavo().getActualContent()); + assertNotNull(c.getRelazioneScavo().getActualContent().get(0)); + } + + @Test + public void publish() throws Exception { + Concessione c= client.createNew(TestModel.prepareConcessione()); + + String mongoId=c.getMongo_id(); + + AddSectionToConcessioneRequest request= + new AddSectionToConcessioneRequest(Paths.RELAZIONE, + Collections.singletonList(new StorageUtils().putOntoStorage( + new FileInputStream(Files.getFileFromResources("concessioni/relazione.pdf")), "relazione.pdf"))); + + client.registerFile(mongoId, request); + + request= + new AddSectionToConcessioneRequest(Paths.imgByIndex(0), + Collections.singletonList(new StorageUtils().putOntoStorage( + new FileInputStream(Files.getFileFromResources("concessioni/immagine.png")), "immagine.png"))); + + client.registerFile(mongoId, request); + + + request= + new AddSectionToConcessioneRequest(Paths.POSIZIONAMENTO, + Collections.singletonList(new StorageUtils().putOntoStorage( + new FileInputStream(Files.getFileFromResources("concessioni/pos.shp")), "pos.shp"))); + + client.registerFile(mongoId, request); + + request= + new AddSectionToConcessioneRequest(Paths.piantaByIndex(0), + Collections.singletonList(new StorageUtils().putOntoStorage( + new FileInputStream(Files.getFileFromResources("concessioni/pianta.shp")), "pianta.shp"))); + + client.registerFile(mongoId, request); + + + c=client.publish(mongoId); + + assertTrue(c.getReport().getStatus().equals(ValidationStatus.PASSED)); + } +} diff --git a/src/test/java/org/gcube/application/geoportal/common/model/TestModel.java b/src/test/java/org/gcube/application/geoportal/common/model/TestModel.java index 6b83116..1218ab1 100644 --- a/src/test/java/org/gcube/application/geoportal/common/model/TestModel.java +++ b/src/test/java/org/gcube/application/geoportal/common/model/TestModel.java @@ -86,7 +86,8 @@ public class TestModel { // Relazione scavo RelazioneScavo relScavo=new RelazioneScavo(); - relScavo.setAbstractSection("simple abstract section"); + relScavo.setAbstractEng("simple abstract section"); + relScavo.setAbstractEng("semplice sezione abstract"); relScavo.setResponsabili(concessione.getAuthors()); concessione.setRelazioneScavo(relScavo);