Skip to content
Snippets Groups Projects
Commit eaef9813 authored by jakubs's avatar jakubs
Browse files

SSDM-3013: V3 api, change listDeletions method to searchDeletions 

SVN: 35570
parent 157e8414
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
+ 7
− 7
View file @ eaef9813
...@@ -10,11 +10,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open ...@@ -10,11 +10,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
c.assertNotNull(permId, "Entity was created"); c.assertNotNull(permId, "Entity was created");
return fFind(facade, permId).then(function(entity) { return fFind(facade, permId).then(function(entity) {
c.assertNotNull(entity, "Entity can be found"); c.assertNotNull(entity, "Entity can be found");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(beforeDeletions) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(beforeDeletions) {
c.ok("Got before deletions"); c.ok("Got before deletions");
return fDelete(facade, permId).then(function() { return fDelete(facade, permId).then(function() {
c.ok("Entity was deleted"); c.ok("Entity was deleted");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(afterDeletions) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(afterDeletions) {
c.ok("Got after deletions"); c.ok("Got after deletions");
c.assertEqual(beforeDeletions.length, afterDeletions.length, "No new deletions found"); c.assertEqual(beforeDeletions.length, afterDeletions.length, "No new deletions found");
return fFind(facade, permId).then(function(entityAfterDeletion) { return fFind(facade, permId).then(function(entityAfterDeletion) {
...@@ -40,11 +40,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open ...@@ -40,11 +40,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
c.assertNotNull(permId, "Entity was created"); c.assertNotNull(permId, "Entity was created");
return fFind(facade, permId).then(function(entity) { return fFind(facade, permId).then(function(entity) {
c.assertNotNull(entity, "Entity can be found"); c.assertNotNull(entity, "Entity can be found");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(beforeDeletions) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(beforeDeletions) {
c.ok("Got before deletions"); c.ok("Got before deletions");
return fDelete(facade, permId).then(function(deletionId) { return fDelete(facade, permId).then(function(deletionId) {
c.ok("Entity was deleted"); c.ok("Entity was deleted");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(afterDeletions) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(afterDeletions) {
c.ok("Got after deletions"); c.ok("Got after deletions");
c.assertEqual(afterDeletions.length, beforeDeletions.length + 1, "One new deletion"); c.assertEqual(afterDeletions.length, beforeDeletions.length + 1, "One new deletion");
c.assertEqual(afterDeletions[afterDeletions.length - 1].getId().getTechId(), deletionId.getTechId(), "Deletion ids match"); c.assertEqual(afterDeletions[afterDeletions.length - 1].getId().getTechId(), deletionId.getTechId(), "Deletion ids match");
...@@ -77,11 +77,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open ...@@ -77,11 +77,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
c.assertNotNull(permId, "Entity was created"); c.assertNotNull(permId, "Entity was created");
return fFind(facade, permId).then(function(entity) { return fFind(facade, permId).then(function(entity) {
c.assertNotNull(entity, "Entity can be found"); c.assertNotNull(entity, "Entity can be found");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(deletionsBeforeDeletion) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(deletionsBeforeDeletion) {
c.ok("Got before deletions"); c.ok("Got before deletions");
return fDelete(facade, permId).then(function(deletionId) { return fDelete(facade, permId).then(function(deletionId) {
c.ok("Entity was deleted"); c.ok("Entity was deleted");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(deletionsAfterDeletion) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(deletionsAfterDeletion) {
c.ok("Got after deletions"); c.ok("Got after deletions");
c.assertEqual(deletionsAfterDeletion.length, deletionsBeforeDeletion.length + 1, "One new deletion"); c.assertEqual(deletionsAfterDeletion.length, deletionsBeforeDeletion.length + 1, "One new deletion");
c.assertEqual(deletionsAfterDeletion[deletionsAfterDeletion.length - 1].getId().getTechId(), deletionId.getTechId(), "Deletion ids match"); c.assertEqual(deletionsAfterDeletion[deletionsAfterDeletion.length - 1].getId().getTechId(), deletionId.getTechId(), "Deletion ids match");
...@@ -91,7 +91,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open ...@@ -91,7 +91,7 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
c.ok("Confirmed deletion"); c.ok("Confirmed deletion");
return fFind(facade, permId).then(function(entityAfterConfirm) { return fFind(facade, permId).then(function(entityAfterConfirm) {
c.assertNull(entityAfterConfirm, "Entity is still gone"); c.assertNull(entityAfterConfirm, "Entity is still gone");
return facade.listDeletions(new c.DeletionFetchOptions()).then(function(deletionsAfterConfirm) { return facade.searchDeletions(new c.DeletionSearchCriteria(), new c.DeletionFetchOptions()).then(function(deletionsAfterConfirm) {
c.assertEqual(deletionsAfterConfirm.length, deletionsBeforeDeletion.length, "New deletion is also gone"); c.assertEqual(deletionsAfterConfirm.length, deletionsBeforeDeletion.length, "New deletion is also gone");
c.finish(); c.finish();
}); });
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment