SSDM-2130 : V3 AS API - finish up js tests - delete, listDeletions,...

SSDM-2130 : V3 AS API - finish up js tests - delete, listDeletions, revertDeletions, confirmDeletions for data sets

SVN: 34376

js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/deletion.js

 define([ 'jquery', 'underscore', 'openbis', 'test/common', 'dto/id/entitytype/EntityTypePermId', 'dto/entity/space/SpaceCreation', 'dto/entity/project/ProjectCreation',
 		'dto/entity/experiment/ExperimentCreation', 'dto/entity/sample/SampleCreation', 'dto/entity/material/MaterialCreation', 'dto/deletion/space/SpaceDeletionOptions',
-		'dto/deletion/project/ProjectDeletionOptions', 'dto/deletion/experiment/ExperimentDeletionOptions', 'dto/deletion/sample/SampleDeletionOptions',
+		'dto/deletion/project/ProjectDeletionOptions', 'dto/deletion/experiment/ExperimentDeletionOptions', 'dto/deletion/sample/SampleDeletionOptions', 'dto/deletion/dataset/DataSetDeletionOptions',
 		'dto/deletion/material/MaterialDeletionOptions', 'dto/fetchoptions/deletion/DeletionFetchOptions' ], function($, _, openbis, common, EntityTypePermId, SpaceCreation, ProjectCreation,
-		ExperimentCreation, SampleCreation, MaterialCreation, SpaceDeletionOptions, ProjectDeletionOptions, ExperimentDeletionOptions, SampleDeletionOptions, MaterialDeletionOptions,
-		DeletionFetchOptions) {
+		ExperimentCreation, SampleCreation, MaterialCreation, SpaceDeletionOptions, ProjectDeletionOptions, ExperimentDeletionOptions, SampleDeletionOptions, DataSetDeletionOptions,
+		MaterialDeletionOptions, DeletionFetchOptions) {
 	return function() {
 		QUnit.module("Deletion tests");
 
@@ -64,6 +64,23 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'dto/id/entitytype/En
 			});
 		};
 
+		var createDataSet = function(c, facade) {
+			return $.ajax({
+				"url" : "http://localhost:20001/datastore_server/rmi-dss-api-v1.json",
+				"type" : "POST",
+				"processData" : false,
+				"dataType" : "json",
+				"data" : JSON.stringify({
+					"method" : "createReportFromAggregationService",
+					"params" : [ facade._private.sessionToken, "js-test", {} ],
+					"id" : "1",
+					"jsonrpc" : "2.0"
+				})
+			}).then(function(response) {
+				return c.createDataSetPermId(response.result.rows[0][0].value);
+			});
+		};
+
 		var createMaterial = function(c, facade) {
 			var creation = new MaterialCreation();
 			creation.setCode("CREATE_JSON_MATERIAL_" + (new Date().getTime()));
@@ -108,6 +125,14 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'dto/id/entitytype/En
 			});
 		};
 
+		var findDataSet = function(c, facade, id) {
+			return $.when(c.createDataSetFetchOptions()).then(function(fetchOptions) {
+				return facade.mapDataSets([ id ], fetchOptions).then(function(dataSets) {
+					return dataSets[id];
+				});
+			});
+		};
+
 		var findMaterial = function(c, facade, id) {
 			return $.when(c.createMaterialFetchOptions()).then(function(fetchOptions) {
 				return facade.mapMaterials([ id ], fetchOptions).then(function(materials) {
@@ -140,6 +165,12 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'dto/id/entitytype/En
 			return facade.deleteSamples([ id ], options);
 		};
 
+		var deleteDataSet = function(c, facade, id) {
+			var options = new DataSetDeletionOptions();
+			options.setReason("test reason");
+			return facade.deleteDataSets([ id ], options);
+		};
+
 		var deleteMaterial = function(c, facade, id) {
 			var options = new MaterialDeletionOptions();
 			options.setReason("test reason");
@@ -280,6 +311,14 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common', 'dto/id/entitytype/En
 			testDeleteWithTrashAndConfirm(assert, createSample, findSample, deleteSample);
 		});
 
+		QUnit.test("deleteDataSets() with revert", function(assert) {
+			testDeleteWithTrashAndRevert(assert, createDataSet, findDataSet, deleteDataSet);
+		});
+
+		QUnit.test("deleteDataSets() with confirm", function(assert) {
+			testDeleteWithTrashAndConfirm(assert, createDataSet, findDataSet, deleteDataSet);
+		});
+
 		QUnit.test("deleteMaterials()", function(assert) {
 			testDeleteWithoutTrash(assert, createMaterial, findMaterial, deleteMaterial);
 		});

js-test/servers/common/core-plugins/tests/1/dss/reporting-plugins/js-test/js-test.py

+#
+# Copyright 2014 ETH Zuerich, Scientific IT Services
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import sys
+
+from ch.systemsx.cisd.openbis.generic.shared.api.v1.dto import SearchCriteria
+from ch.systemsx.cisd.openbis.generic.shared.api.v1.dto import SearchSubCriteria
+from ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria import MatchClause
+from ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria import MatchClauseAttribute
+from ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria import SearchOperator
+
+reload(sys)
+sys.setdefaultencoding('UTF8')
+
+def process(tr, parameters, tableBuilder):
+	sample = findSample(tr)
+	dataSet = createDataSet(tr, sample)
+	
+	tableBuilder.addHeader("DATA_SET_CODE")
+	row = tableBuilder.addRow()
+	row.setCell("DATA_SET_CODE", dataSet.getDataSetCode())
+
+def findSample(tr):
+	criteria = SearchCriteria()
+	criteria.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.PERM_ID, "20130412140147736-21")) # /PLATONIC/PLATE-2
+	samples = tr.getSearchService().searchForSamples(criteria)
+	return samples[0]
+	
+def createDataSet(tr, sample):
+	dataSet = tr.createNewDataSet("TSV")
+	dataSet.setSample(sample)
+	tr.createNewFile(dataSet, "test")
+	return dataSet

js-test/servers/common/core-plugins/tests/1/dss/reporting-plugins/js-test/plugin.properties

+label = js-test
+class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.JythonIngestionService
+script-path = js-test.py