From 8b25f5f94c86731815a6c60787ec294ba59a04bb Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 27 Nov 2017 11:05:06 +0000
Subject: [PATCH] SSDM-5724: deleteRoleAssignments js test
SVN: 38955
---
.../openbis-v3-api-test/html/test/common.js | 16 ++++++++++++++++
.../openbis-v3-api-test/html/test/dtos.js | 3 +++
.../html/test/openbis-execute-operations.js | 4 ++++
.../openbis-v3-api-test/html/test/test-delete.js | 5 +++++
4 files changed, 28 insertions(+)
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
index 3227548c6e1..10f4415b8cb 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/common.js
@@ -65,6 +65,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
this.ExternalDmsDeletionOptions = dtos.ExternalDmsDeletionOptions;
this.TagDeletionOptions = dtos.TagDeletionOptions;
this.AuthorizationGroupDeletionOptions = dtos.AuthorizationGroupDeletionOptions;
+ this.RoleAssignmentDeletionOptions = dtos.RoleAssignmentDeletionOptions;
this.SemanticAnnotationDeletionOptions = dtos.SemanticAnnotationDeletionOptions;
this.PersonPermId = dtos.PersonPermId;
this.EntityTypePermId = dtos.EntityTypePermId;
@@ -239,6 +240,7 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
this.DeleteVocabularyTermsOperation = dtos.DeleteVocabularyTermsOperation;
this.DeleteTagsOperation = dtos.DeleteTagsOperation;
this.DeleteAuthorizationGroupsOperation = dtos.DeleteAuthorizationGroupsOperation;
+ this.DeleteRoleAssignmentsOperation = dtos.DeleteRoleAssignmentsOperation;
this.DeleteOperationExecutionsOperation = dtos.DeleteOperationExecutionsOperation;
this.DeleteSemanticAnnotationsOperation = dtos.DeleteSemanticAnnotationsOperation;
@@ -573,6 +575,13 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
});
}.bind(this);
+ this.findRoleAssignment = function(facade, id) {
+ var c = this;
+ return facade.getRoleAssignments([ id ], c.createRoleAssignmentFetchOptions()).then(function(tags) {
+ return tags[id];
+ });
+ }.bind(this);
+
this.findSemanticAnnotation = function(facade, id) {
var c = this;
return facade.getSemanticAnnotations([ id ], c.createSemanticAnnotationFetchOptions()).then(function(annotations) {
@@ -672,6 +681,13 @@ define([ 'jquery', 'openbis', 'underscore', 'test/dtos' ], function($, defaultOp
return facade.deleteAuthorizationGroups([ id ], options);
}.bind(this);
+ this.deleteRoleAssignment = function(facade, id) {
+ var c = this;
+ var options = new dtos.RoleAssignmentDeletionOptions();
+ options.setReason("test reason");
+ return facade.deleteRoleAssignments([ id ], options);
+ }.bind(this);
+
this.deleteOperationExecution = function(facade, id) {
var c = this;
var options = new dtos.OperationExecutionDeletionOptions();
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
index 7c9936d937d..56ec829b984 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/dtos.js
@@ -421,6 +421,9 @@ var sources = [
'as/dto/roleassignment/create/RoleAssignmentCreation',
'as/dto/roleassignment/create/CreateRoleAssignmentsOperation',
'as/dto/roleassignment/create/CreateRoleAssignmentsOperationResult',
+ 'as/dto/roleassignment/delete/RoleAssignmentDeletionOptions',
+ 'as/dto/roleassignment/delete/DeleteRoleAssignmentsOperation',
+ 'as/dto/roleassignment/delete/DeleteRoleAssignmentsOperationResult',
'as/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions',
'as/dto/roleassignment/fetchoptions/RoleAssignmentSortOptions',
'as/dto/roleassignment/get/GetRoleAssignmentsOperation',
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
index 77937c97d06..982075fc6a8 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/openbis-execute-operations.js
@@ -381,6 +381,10 @@ define([ 'jquery', 'openbis', 'test/common' ], function($, openbis, common) {
return this._executeDeleteOperation(new c.DeleteAuthorizationGroupsOperation(ids, deletionOptions));
}
+ this.deleteRoleAssignments = function(ids, deletionOptions) {
+ return this._executeDeleteOperation(new c.DeleteRoleAssignmentsOperation(ids, deletionOptions));
+ }
+
this.deleteOperationExecutions = function(ids, deletionOptions) {
return this._executeDeleteOperation(new c.DeleteOperationExecutionsOperation(ids, deletionOptions));
}
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
index b5f2c00e641..5ef07657d03 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-delete.js
@@ -195,6 +195,11 @@ define([ 'jquery', 'underscore', 'openbis', 'test/openbis-execute-operations', '
testDeleteWithoutTrash(c, c.createAuthorizationGroup, c.findAuthorizationGroup, c.deleteAuthorizationGroup);
});
+ QUnit.test("deleteRoleAssignments()", function(assert) {
+ var c = new common(assert, openbis);
+ testDeleteWithoutTrash(c, c.createRoleAssignment, c.findRoleAssignment, c.deleteRoleAssignment);
+ });
+
QUnit.test("deleteOperationExecutions()", function(assert) {
var c = new common(assert, openbis);
--
GitLab