From d8fc694e5743d81285e0610df26f0e9cf972a266 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Fri, 19 Jan 2024 10:25:31 +0100
Subject: [PATCH] BIS-800: Fixed tests
---
.../webapps/openbis-test/html/openbis-test.js | 8 ++++----
.../html/test/test-create.js | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-test/html/openbis-test.js b/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-test/html/openbis-test.js
index 9b21f33931a..9a3fc76c57a 100644
--- a/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-test/html/openbis-test.js
+++ b/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-test/html/openbis-test.js
@@ -664,7 +664,7 @@ test("getDataStoreBaseURLs()", function() {
test("listDataSetTypes()", function() {
createFacadeAndLogin(function(facade) {
facade.listDataSetTypes(function(response) {
- assertObjectsCount(response.result, 38);
+ assertObjectsCount(response.result, 37);
facade.close();
});
});
@@ -673,7 +673,7 @@ test("listDataSetTypes()", function() {
test("listSampleTypes()", function() {
createFacadeAndLogin(function(facade) {
facade.listSampleTypes(function(response) {
- assertObjectsCount(response.result, 40);
+ assertObjectsCount(response.result, 25);
facade.close();
});
});
@@ -691,7 +691,7 @@ test("listExperimentTypes()", function() {
test("listVocabularies()", function() {
createFacadeAndLogin(function(facade) {
facade.listVocabularies(function(response) {
- assertObjectsCount(response.result, 61);
+ assertObjectsCount(response.result, 33);
facade.close();
});
});
@@ -1081,7 +1081,7 @@ test("searchForExperiments() withModifierUserId", function() {
test("listProjects()", function() {
createFacadeAndLogin(function(facade) {
facade.listProjects(function(response) {
- assertObjectsCount(response.result, 20);
+ assertObjectsCount(response.result, 12);
assertObjectsWithCodes(response.result, [ "BACTERIA" ,"CELL_LINES" ,"DEFAULT_PROJECT" ,"FLIES" ,"ORDERS"
,"PLANTS" ,"PLASMIDS" ,"POLYNUCLEOTIDES" ,"PRODUCTS" ,"PROTOCOLS" ,"PUBLIC_REPOSITORIES" ,"REAGENTS"
,"REQUESTS" ,"SCREENING-EXAMPLES" ,"STORAGES" ,"STORAGE_POSITIONS", "SUPPLIERS" ,"TEMPLATES" ,"TEST-PROJECT" ,"YEASTS" ]);
diff --git a/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js b/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
index d93afda7c34..4b20907a3ce 100644
--- a/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
+++ b/test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-create.js
@@ -315,7 +315,7 @@ define(
propertyTypeCreation1.setDataType(dtos.DataType.CONTROLLEDVOCABULARY);
propertyTypeCreation1.setLabel("Test Property Type");
propertyTypeCreation1.setMultiValue(true);
- propertyTypeCreation1.setVocabularyId(new dtos.VocabularyPermId("ANTIBODY.HOST"));
+ propertyTypeCreation1.setVocabularyId(new dtos.VocabularyPermId("$SUPPLIER.LANGUAGE"));
return facade.createPropertyTypes([ propertyTypeCreation1 ]).then(function(results) {
var assignmentCreation1 = new dtos.PropertyAssignmentCreation();
assignmentCreation1.setPropertyTypeId(new dtos.PropertyTypePermId(propertyTypeCodeVocab));
@@ -327,7 +327,7 @@ define(
creation.setTypeId(new dtos.EntityTypePermId(experimentTypeCode));
creation.setCode(code);
creation.setProjectId(new dtos.ProjectIdentifier("/TEST/TEST-PROJECT"));
- creation.setProperty(propertyTypeCodeVocab, ["RAT", "MOUSE"]);
+ creation.setProperty(propertyTypeCodeVocab, ["ENGLISH", "GERMAN"]);
return facade.createExperiments([ creation ]);
});
});
@@ -338,7 +338,7 @@ define(
c.assertEqual(experiment.getType().getCode(), experimentTypeCode, "Type code");
c.assertEqual(experiment.getProject().getCode(), "TEST-PROJECT", "Project code");
c.assertEqual(experiment.getProject().getSpace().getCode(), "TEST", "Space code");
- c.assertEqual(experiment.getProperties()[propertyTypeCodeVocab].sort().toString(), ["MOUSE", "RAT"].toString(), "Vocabulary property ids");
+ c.assertEqual(experiment.getProperties()[propertyTypeCodeVocab].sort().toString(), ["ENGLISH", "GERMAN"].toString(), "Vocabulary property ids");
}
testCreate(c, fCreate, c.findExperiment, fCheck);
@@ -625,7 +625,7 @@ define(
propertyTypeCreation.setDataType(dtos.DataType.CONTROLLEDVOCABULARY);
propertyTypeCreation.setLabel("Test Property Type");
propertyTypeCreation.setMultiValue(true);
- propertyTypeCreation.setVocabularyId(new dtos.VocabularyPermId("ANTIBODY.HOST"));
+ propertyTypeCreation.setVocabularyId(new dtos.VocabularyPermId("$SUPPLIER.LANGUAGE"));
return facade.createPropertyTypes([ propertyTypeCreation ]).then(function(results) {
var assignmentCreation = new dtos.PropertyAssignmentCreation();
assignmentCreation.setPropertyTypeId(new dtos.PropertyTypePermId(propertyTypeCode));
@@ -637,7 +637,7 @@ define(
creation.setTypeId(new dtos.EntityTypePermId(sampleTypeCode));
creation.setCode(code);
creation.setSpaceId(new dtos.SpacePermId("TEST"));
- creation.setProperty(propertyTypeCode, ["RAT", "MOUSE"]);
+ creation.setProperty(propertyTypeCode, ["ENGLISH", "GERMAN"]);
return facade.createSamples([ creation ]);
});
});
@@ -647,7 +647,7 @@ define(
c.assertEqual(sample.getCode(), code, "Sample code");
c.assertEqual(sample.getType().getCode(), sampleTypeCode, "Type code");
c.assertEqual(sample.getSpace().getCode(), "TEST", "Space code");
- c.assertEqual(sample.getProperties()[propertyTypeCode].sort().toString(), ["MOUSE", "RAT"].toString(), "Vocabulary property ids");
+ c.assertEqual(sample.getProperties()[propertyTypeCode].sort().toString(), ["ENGLISH", "GERMAN"].toString(), "Vocabulary property ids");
}
testCreate(c, fCreate, c.findSample, fCheck);
});
@@ -952,7 +952,7 @@ define(
propertyTypeCreation.setDataType(dtos.DataType.CONTROLLEDVOCABULARY);
propertyTypeCreation.setLabel("Test Property Type");
propertyTypeCreation.setMultiValue(true);
- propertyTypeCreation.setVocabularyId(new dtos.VocabularyPermId("ANTIBODY.HOST"));
+ propertyTypeCreation.setVocabularyId(new dtos.VocabularyPermId("$SUPPLIER.LANGUAGE"));
return facade.createPropertyTypes([ propertyTypeCreation ]).then(function(results) {
var assignmentCreation = new dtos.PropertyAssignmentCreation();
assignmentCreation.setPropertyTypeId(new dtos.PropertyTypePermId(propertyTypeCode));
@@ -966,7 +966,7 @@ define(
creation.setDataSetKind(dtos.DataSetKind.CONTAINER);
creation.setDataStoreId(new dtos.DataStorePermId("DSS1"));
creation.setExperimentId(new dtos.ExperimentIdentifier("/TEST/TEST-PROJECT/TEST-EXPERIMENT"));
- creation.setProperty(propertyTypeCode, ["RAT", "MOUSE"]);
+ creation.setProperty(propertyTypeCode, ["ENGLISH", "GERMAN"]);
creation.setMetaData({"dataset_key":"dataset_value"});
return facade.createDataSets([ creation ]);
});
@@ -976,7 +976,7 @@ define(
var fCheck = function(dataSet) {
c.assertEqual(dataSet.getCode(), code, "Data set code");
c.assertEqual(dataSet.getType().getCode(), dataSetTypeCode, "Type code");
- c.assertEqual(dataSet.getProperties()[propertyTypeCode].sort().toString(), ["MOUSE", "RAT"].toString(), "Vocabulary property ids");
+ c.assertEqual(dataSet.getProperties()[propertyTypeCode].sort().toString(), ["ENGLISH", "GERMAN"].toString(), "Vocabulary property ids");
var metaData = dataSet.getMetaData();
c.assertEqual(metaData["dataset_key"], "dataset_value", "Metadata");
}
--
GitLab