From d6f3a94f89d8899d3a54e976a844df8618ff2fcc Mon Sep 17 00:00:00 2001
From: jrybicki-jsc <j.rybicki@fz-juelich.de>
Date: Mon, 7 Jun 2021 18:00:12 +0200
Subject: [PATCH] test update method
---
apiserver/storage/JsonFileStorageAdapter.py | 1 -
tests/apiserver_tests/test_apiwithauth.py | 52 ++++++++++++++++++++-
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/apiserver/storage/JsonFileStorageAdapter.py b/apiserver/storage/JsonFileStorageAdapter.py
index 961c08e..f1334c4 100644
--- a/apiserver/storage/JsonFileStorageAdapter.py
+++ b/apiserver/storage/JsonFileStorageAdapter.py
@@ -94,7 +94,6 @@ class JsonFileStorageAdapter(AbstractLocationDataStorageAdapter):
def delete(self, n_type: LocationDataType, oid: str, usr: str):
fullpath = self.__get_object_path(value=n_type.value, oid=oid)
- print(f"Removing {fullpath}")
os.remove(fullpath)
def get_owner(self, type: LocationDataType, oid: str):
diff --git a/tests/apiserver_tests/test_apiwithauth.py b/tests/apiserver_tests/test_apiwithauth.py
index 6afd0c6..7024fbb 100644
--- a/tests/apiserver_tests/test_apiwithauth.py
+++ b/tests/apiserver_tests/test_apiwithauth.py
@@ -56,8 +56,6 @@ class UserTests(TestCase):
(oid, dty) = rsp.json()
d['id'] = oid
-
-
for d in dss:
i = d['id']
rsp = self.client.get(f"/dataset/{i}")
@@ -67,3 +65,53 @@ class UserTests(TestCase):
self.assertEqual(d['url'], dty['url'])
self.client.delete(f"/dataset/{i}")
+
+ def test_create_and_delete(self):
+ lst = self.client.get('/dataset').json()
+ self.assertEqual(len(lst), 0)
+
+ self.client.post('/dataset', json={
+ 'name': 'new_obj',
+ 'url': 'some_url'
+ })
+
+ lst = self.client.get('/dataset').json()
+ self.assertEqual(len(lst), 1, 'Should be 1 now')
+
+ for r in lst:
+ (name, oid) = r
+ rsp = self.client.delete(f"/dataset/{oid}")
+ self.assertEqual(rsp.status_code, 200)
+
+ lst = self.client.get('/dataset').json()
+ self.assertEqual(len(lst), 0, 'Should be empty now')
+
+ def test_update(self):
+
+ rsp = self.client.post('/dataset',
+ json={
+ 'name': 'new_obj',
+ 'url': 'some_url'
+ }
+ )
+ (oid, name) = rsp.json()
+
+ rsp = self.client.put(f"/dataset/{oid}", json={
+ 'name': 'new_name',
+ 'url': 'new_url',
+ 'metadata': {
+ 'key': 'value'
+ }
+ }
+ )
+ self.assertEqual(rsp.status_code, 200)
+
+ rsp2 = self.client.get(f"/dataset/{oid}")
+ self.assertEqual(rsp2.status_code, 200)
+ dd = rsp2.json()
+ self.assertEqual(dd['name'], 'new_name')
+ self.assertEqual(dd['url'], 'new_url')
+ self.assertEqual(dd['metadata'], {'key': 'value'})
+
+ self.client.delete(f"/dataset/{oid}")
+
--
GitLab