From 732cc927027d9ca8b6da28b0709d52699e09a8a4 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 11 Apr 2024 09:43:09 +0200 Subject: [PATCH] Refactored tests --- geoportal-client/CHANGELOG.md | 3 ++ geoportal-client/pom.xml | 2 +- .../application/geoportal/StorageTests.java | 4 +-- .../geoportal/clients/BasicVreTests.java | 4 +-- .../geoportal/clients/GenericUseCases.java | 13 +++++---- .../clients/ProfiledConcessioniTest.java | 29 ++++++++++--------- .../clients/ProfiledDocumentsTest.java | 29 +++++++------------ .../geoportal/clients/UCDTests.java | 17 +++++------ .../serialization/SerializationTests.java | 9 +++--- .../serialization/UseCaseDescriptors.java | 18 ++++++------ 10 files changed, 63 insertions(+), 65 deletions(-) diff --git a/geoportal-client/CHANGELOG.md b/geoportal-client/CHANGELOG.md index c0e2d5b..5ce25aa 100644 --- a/geoportal-client/CHANGELOG.md +++ b/geoportal-client/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog for org.gcube.application.geoportal-client +## [v1.2.2-SNAPSHOT] - 2024-04-11 +- Refactored + ## [v1.2.1] - 2023-09-06 - Using parent version range [#25572] diff --git a/geoportal-client/pom.xml b/geoportal-client/pom.xml index b0a04a1..5a8e88e 100644 --- a/geoportal-client/pom.xml +++ b/geoportal-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.gcube.application geoportal-client - 1.2.1 + 1.2.2-SNAPSHOT Geoportal Client 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 0343578..c2afe30 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 @@ -1,10 +1,10 @@ package org.gcube.application.geoportal; +import java.io.IOException; + import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.utils.StorageUtils; -import java.io.IOException; - public class StorageTests { public static void main(String[] args) throws IOException { diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java index bc540dd..a456b79 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/BasicVreTests.java @@ -1,11 +1,11 @@ package org.gcube.application.geoportal.clients; +import static org.junit.Assume.assumeTrue; + import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.BeforeClass; -import static org.junit.Assume.assumeTrue; - public class BasicVreTests extends GCubeTest { @BeforeClass diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java index c24da3f..ec9d07b 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/GenericUseCases.java @@ -1,6 +1,11 @@ package org.gcube.application.geoportal.clients; -import com.fasterxml.jackson.core.JsonProcessingException; +import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.projects; + +import java.io.File; +import java.io.FileNotFoundException; +import java.rmi.RemoteException; + import org.bson.Document; import org.gcube.application.cms.tests.Tests; import org.gcube.application.geoportal.client.utils.Serialization; @@ -12,11 +17,7 @@ import org.gcube.application.geoportal.common.utils.FileSets; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.junit.Test; -import java.io.File; -import java.io.FileNotFoundException; -import java.rmi.RemoteException; - -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.projects; +import com.fasterxml.jackson.core.JsonProcessingException; public abstract class GenericUseCases extends BasicVreTests{ diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java index 8abc07a..7aaaa5d 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledConcessioniTest.java @@ -1,8 +1,15 @@ package org.gcube.application.geoportal.clients; -import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +import java.io.File; +import java.io.FileNotFoundException; +import java.nio.charset.Charset; +import java.rmi.RemoteException; +import java.util.Iterator; + import org.bson.Document; import org.gcube.application.cms.tests.TestDocuments; import org.gcube.application.cms.tests.Tests; @@ -28,16 +35,10 @@ import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.nio.charset.Charset; -import java.rmi.RemoteException; -import java.util.Iterator; +import com.fasterxml.jackson.core.JsonProcessingException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; @Slf4j public class ProfiledConcessioniTest > extends GenericUseCases{ @@ -66,8 +67,8 @@ public class ProfiledConcessioniTest > e Project p=client.createNew(getNewDocument()); p=prepareWithFileSet(p); - - p = getClient().performStep(p.getId(), new StepExecutionRequest("SUBMIT-FOR-REVIEW",new Document())); + String optionalMessage = null; + p = getClient().performStep(p.getId(), new StepExecutionRequest("SUBMIT-FOR-REVIEW", optionalMessage, new Document())); System.out.println("Result is "+Serialization.write(p)); } diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java index 725a3f1..feef8f3 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/ProfiledDocumentsTest.java @@ -1,9 +1,15 @@ package org.gcube.application.geoportal.clients; -import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.extern.slf4j.Slf4j; +import static org.gcube.application.geoportal.client.utils.Serialization.write; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; + +import java.io.FileNotFoundException; +import java.rmi.RemoteException; +import java.time.LocalDateTime; +import java.util.concurrent.atomic.AtomicLong; + import org.bson.Document; -import org.gcube.application.cms.tests.Tests; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.faults.InvalidRequestException; import org.gcube.application.geoportal.common.model.JSONPathWrapper; @@ -12,28 +18,15 @@ import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.access.Access; import org.gcube.application.geoportal.common.model.document.access.AccessPolicy; import org.gcube.application.geoportal.common.model.document.filesets.RegisteredFileSet; -import org.gcube.application.geoportal.common.model.document.relationships.RelationshipNavigationObject; -import org.gcube.application.geoportal.common.model.rest.CreateRelationshipRequest; -import org.gcube.application.geoportal.common.model.rest.DeleteRelationshipRequest; import org.gcube.application.geoportal.common.model.rest.QueryRequest; import org.gcube.application.geoportal.common.model.rest.RegisterFileSetRequest; import org.gcube.application.geoportal.common.rest.Projects; -import org.gcube.application.geoportal.common.utils.FileSets; -import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.io.File; -import java.io.FileNotFoundException; -import java.rmi.RemoteException; -import java.time.LocalDateTime; -import java.util.Iterator; -import java.util.concurrent.atomic.AtomicLong; +import com.fasterxml.jackson.core.JsonProcessingException; -import static org.gcube.application.geoportal.client.utils.Serialization.write; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeTrue; +import lombok.extern.slf4j.Slf4j; @Slf4j public class ProfiledDocumentsTest> extends GenericUseCases { diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java index 58b4c6f..7a33517 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/UCDTests.java @@ -1,5 +1,13 @@ package org.gcube.application.geoportal.clients; +import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.useCaseDescriptors; +import static org.junit.Assert.assertEquals; +import static org.junit.Assume.assumeTrue; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.concurrent.atomic.AtomicLong; + import org.bson.Document; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.geoportal.client.utils.Serialization; @@ -12,15 +20,6 @@ import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.concurrent.atomic.AtomicLong; - -import static org.gcube.application.geoportal.client.plugins.GeoportalAbstractPlugin.useCaseDescriptors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assume.assumeTrue; - public class UCDTests{ diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java index 5b9a16b..a903aa3 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/SerializationTests.java @@ -1,12 +1,13 @@ package org.gcube.application.geoportal.clients.serialization; -import lombok.extern.slf4j.Slf4j; -import org.gcube.application.geoportal.client.utils.Serialization; -import org.junit.Test; - import java.io.IOException; import java.time.LocalDateTime; +import org.gcube.application.geoportal.client.utils.Serialization; +import org.junit.Test; + +import lombok.extern.slf4j.Slf4j; + @Slf4j public class SerializationTests { diff --git a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/UseCaseDescriptors.java b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/UseCaseDescriptors.java index 9cf043e..d22f911 100644 --- a/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/UseCaseDescriptors.java +++ b/geoportal-client/src/test/java/org/gcube/application/geoportal/clients/serialization/UseCaseDescriptors.java @@ -1,5 +1,14 @@ package org.gcube.application.geoportal.clients.serialization; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.List; +import java.util.Map; + import org.gcube.application.cms.tests.TestProfiles; import org.gcube.application.geoportal.client.utils.Serialization; import org.gcube.application.geoportal.common.model.JSONPathWrapper; @@ -9,15 +18,6 @@ import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDes import org.gcube.application.geoportal.common.utils.Files; import org.junit.Test; -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Map; - -import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertTrue; - public class UseCaseDescriptors { private static UseCaseDescriptor readProfile(String file) throws IOException {