From 5685698a0218f4a3143eaafce6c26da2294f8ef6 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 1 Dec 2020 15:58:49 +0100 Subject: [PATCH] release --- CHANGELOG.md | 2 +- pom.xml | 2 +- .../gcube/data/transfer/library/TestClientCalls.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37cb186..9f4d4fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for org.gcube.data.transfer.data-transfer-library -##[v1.2.3-SNAPSHOT] 2020-12-01 +##[v1.2.3] 2020-12-01 * Deletion method * GetInfo method diff --git a/pom.xml b/pom.xml index d5fdd46..545ab22 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.data.transfer data-transfer-library - 1.2.3-SNAPSHOT + 1.2.3 DataTransfer-library Data Transfer Service client library diff --git a/src/test/java/org/gcube/data/transfer/library/TestClientCalls.java b/src/test/java/org/gcube/data/transfer/library/TestClientCalls.java index b5aa12e..f31c84b 100644 --- a/src/test/java/org/gcube/data/transfer/library/TestClientCalls.java +++ b/src/test/java/org/gcube/data/transfer/library/TestClientCalls.java @@ -34,7 +34,7 @@ public class TestClientCalls { static String hostname="https://geoserver1.dev.d4science.org"; static String scope="/gcube/devsec/devVRE"; static Client client; - + static long testRun=System.currentTimeMillis(); @BeforeClass public static void init() throws ServiceNotFoundException{ @@ -63,7 +63,7 @@ public class TestClientCalls { private RemoteFileDescriptor transfer() throws RemoteServiceException, MalformedURLException { Destination dest=new Destination("readme.md"); dest.setCreateSubfolders(true); - dest.setSubFolder("bla/bla/bllaaa"); + dest.setSubFolder("test/testSub/"+testRun); dest.setOnExistingFileName(DestinationClashPolicy.ADD_SUFFIX); dest.setOnExistingSubFolder(DestinationClashPolicy.APPEND); TransferRequest request= new TransferRequest("", new HttpDownloadSettings(new URL("https://code-repo.d4science.org/gCubeSystem/data-transfer-library/raw/branch/master/README.md"), HttpDownloadOptions.DEFAULT),dest); @@ -106,8 +106,14 @@ public class TestClientCalls { public void delete() throws RemoteServiceException, MalformedURLException { RemoteFileDescriptor remote=transfer(); client.delete(remote); + + } + + @Test + public void deleteFolder() throws RemoteServiceException, MalformedURLException { + RemoteFileDescriptor remote=transfer(); // try to delete parent - client.delete(remote.getPersistenceId()+"/"+remote.getPath()); + client.delete(remote.getPersistenceId()+"/"+remote.getPath().substring(0,remote.getPath().lastIndexOf("/"))); } @Test