@sapui5/sap.fe.test 1.116.0 → 1.118.0

package/src/sap/fe/test/library-preload.js

@@ -509,12 +509,27 @@ sap.ui.predefine("sap/fe/test/CollaborationClient", ["sap/fe/core/controllerexte
         },
         iCheckDefaultUserRemovedLock: function (sPropertyPath) {
           return OpaBuilder.create(this).check(function () {
-            return CollaborationAPI.checkReceived({
+            // Check that we have received an UNLOCK without a CHANGE
+            return !CollaborationAPI.checkReceived({
+              userID: "DEFAULT_USER",
+              userAction: Activity.Change,
+              clientContent: sPropertyPath
+            }, false) && CollaborationAPI.checkReceived({
               userID: "DEFAULT_USER",
               userAction: Activity.Unlock,
               clientContent: sPropertyPath
             });
-          }).description(`Remote session received unlock  notification for${sPropertyPath}`).execute();
+          }).description(`Remote session received unlock without change notification for${sPropertyPath}`).execute();
+        },
+        iCheckValueIsLockedByDefaultUser: function (sPropertyPath) {
+          return OpaBuilder.create(this).check(function () {
+            return CollaborationAPI.checkLockedByOther(sPropertyPath);
+          }).description(`On remote session, property ${sPropertyPath} is currently locked by another user`).execute();
+        },
+        iCheckValueIsNotLockedByDefaultUser: function (sPropertyPath) {
+          return OpaBuilder.create(this).check(function () {
+            return !CollaborationAPI.checkLockedByOther(sPropertyPath);
+          }).description(`On remote session, property ${sPropertyPath} is not locked by another user`).execute();
         },
         iCheckDefaultUserLeftDraft: function () {
           return OpaBuilder.create(this).check(function () {
@@ -712,6 +727,7 @@ sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "
   function mockListReportController() {
     // manually add ListReportController.controller functions since I am unable to import the prototype
     const listReport = {
+      _getApplyAutomaticallyOnVariant: jest.fn(),
       _getFilterBarControl: jest.fn(),
       _getControls: jest.fn(),
       _isFilterBarHidden: jest.fn(),
@@ -722,6 +738,7 @@ sap.ui.predefine("sap/fe/test/FeMocks", ["@sap-ux/jest-mock-ui5/dist/generic", "
       _shouldAutoTriggerSearch: jest.fn(),
       _getTable: jest.fn(),
       getExtensionAPI: jest.fn(),
+      getFilterBarSelectionVariant: jest.fn(),
       getChartControl: jest.fn(),
       editFlow: mock(EditFlow)
     };
@@ -1788,12 +1805,13 @@ sap.ui.predefine("sap/fe/test/JestFlexibilityHelper", [], function () {
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs", "@prettier/plugin-xml", "path", "prettier", "sap/base/Log", "sap/base/util/LoaderExtensions", "sap/base/util/merge", "sap/fe/core/converters/ConverterContext", "sap/fe/core/services/SideEffectsServiceFactory", "sap/fe/core/TemplateModel", "sap/fe/test/UI5MockHelper", "sap/ui/base/BindingParser", "sap/ui/base/ManagedObjectMetadata", "sap/ui/core/Component", "sap/ui/core/InvisibleText", "sap/ui/core/util/serializer/Serializer", "sap/ui/core/util/XMLPreprocessor", "sap/ui/fl/apply/_internal/flexState/FlexState", "sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor", "sap/ui/fl/initial/_internal/Storage", "sap/ui/fl/Utils", "sap/ui/model/json/JSONModel", "sap/ui/model/odata/v4/lib/_MetadataRequestor", "sap/ui/model/odata/v4/ODataMetaModel", "xpath", "./JestFlexibilityHelper"], function (compiler, fs, plugin, path, prettier, Log, LoaderExtensions, merge, ConverterContext, SideEffectsFactory, TemplateModel, UI5MockHelper, BindingParser, ManagedObjectMetadata, Component, InvisibleText, Serializer, XMLPreprocessor, FlexState, XmlPreprocessor, AppStorage, Utils, JSONModel, _MetadataRequestor, ODataMetaModel, xpath, JestFlexibilityHelper) {
+sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs", "@prettier/plugin-xml", "path", "prettier", "sap/base/Log", "sap/base/util/LoaderExtensions", "sap/base/util/merge", "sap/fe/core/buildingBlocks/BuildingBlockTemplateProcessor", "sap/fe/core/converters/ConverterContext", "sap/fe/core/services/SideEffectsServiceFactory", "sap/fe/core/TemplateModel", "sap/fe/test/UI5MockHelper", "sap/ui/base/BindingParser", "sap/ui/base/ManagedObject", "sap/ui/base/ManagedObjectMetadata", "sap/ui/core/Component", "sap/ui/core/InvisibleText", "sap/ui/core/util/serializer/Serializer", "sap/ui/core/util/XMLPreprocessor", "sap/ui/core/XMLTemplateProcessor", "sap/ui/fl/apply/_internal/flexState/FlexState", "sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor", "sap/ui/fl/initial/_internal/Storage", "sap/ui/fl/Utils", "sap/ui/model/json/JSONModel", "sap/ui/model/odata/v4/lib/_MetadataRequestor", "sap/ui/model/odata/v4/ODataMetaModel", "xpath", "./JestFlexibilityHelper"], function (compiler, fs, plugin, path, prettier, Log, LoaderExtensions, merge, BuildingBlockTemplateProcessor, ConverterContext, SideEffectsFactory, TemplateModel, UI5MockHelper, BindingParser, ManagedObject, ManagedObjectMetadata, Component, InvisibleText, Serializer, XMLPreprocessor, XMLTemplateProcessor, FlexState, XmlPreprocessor, AppStorage, Utils, JSONModel, _MetadataRequestor, ODataMetaModel, xpath, JestFlexibilityHelper) {
   "use strict";
 
   var _exports = {};
   var createFlexibilityChangesObject = JestFlexibilityHelper.createFlexibilityChangesObject;
   var createMockResourceModel = UI5MockHelper.createMockResourceModel;
+  var parseXMLString = BuildingBlockTemplateProcessor.parseXMLString;
   var format = prettier.format;
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const formatXml = require("xml-formatter");
@@ -2409,6 +2427,36 @@ sap.ui.predefine("sap/fe/test/JestTemplatingHelper", ["@sap/cds-compiler", "fs",
     };
   }
   _exports.createAwaiter = createAwaiter;
+  function renderBuildingBlockWithModels(buildingBlock, models) {
+    return ManagedObject.runWithPreprocessors(() => {
+      return buildingBlock.getContent();
+    }, {
+      settings: function (controlSettings) {
+        controlSettings.models = models;
+        return controlSettings;
+      }
+    });
+  }
+  _exports.renderBuildingBlockWithModels = renderBuildingBlockWithModels;
+  function registerMockFragments() {
+    for (var _len2 = arguments.length, fragments = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      fragments[_key2] = arguments[_key2];
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const originalLoadTemplate = XMLTemplateProcessor.loadTemplatePromise;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const loadTemplateStub = jest.spyOn(XMLTemplateProcessor, "loadTemplatePromise");
+    loadTemplateStub.mockImplementation((templateName, extension) => {
+      for (const fragment of fragments) {
+        if (fragment.name === templateName) {
+          return parseXMLString(fragment.content)[0];
+        }
+      }
+      return originalLoadTemplate(templateName, extension);
+    });
+    return loadTemplateStub;
+  }
+  _exports.registerMockFragments = registerMockFragments;
   return _exports;
 }, false);
 /*!
@@ -5701,6 +5749,9 @@ sap.ui.predefine("sap/fe/test/UI5MockHelper", ["@sap-ux/jest-mock-ui5/dist/gener
 
     // Default behavior
     mocked.mock.getParameter.mockImplementation(name => mocked._params[name]);
+    mocked.mock.getParameters.mockImplementation(() => {
+      return mocked._params;
+    });
     return mocked;
   }
   /**
@@ -6131,14 +6182,13 @@ sap.ui.predefine(
 					}
 				});
 			}
-
 			var uri = new URL(oTargetManifest["sap.app"].dataSources.mainService.uri, document.location);
 			var sUser = oUriParams.get("user");
 			if (sUser) {
 				uri.searchParams.set("user", sUser);
 			}
 
-			oTargetManifest["sap.app"].dataSources.mainService.uri = uri.toString();
+			oTargetManifest["sap.app"].dataSources.mainService.uri = uri.toString().replace(document.location, "");
 
 			return oTargetManifest;
 		};
@@ -7053,6 +7103,7 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
     _oModel: undefined,
     _lockedPropertyPath: "",
     _internalModel: undefined,
+    _receivedLocks: [],
     /**
      * Open an existing collaborative draft with a new user, and creates a 'ghost client' for this user.
      *
@@ -7073,7 +7124,7 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
         id: userID,
         name: userName,
         initialName: userName
-      }, webSocketBaseURL, sDraftUUID, serviceUrl, this._internalModel, this._onMessageReceived.bind(this), true);
+      }, webSocketBaseURL, sDraftUUID, serviceUrl, this._internalModel, this._onMessageReceived.bind(this), {}, true);
       this._rootPath = oContext.getPath();
       this._oModel = oContext.getModel();
     },
@@ -7081,16 +7132,20 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
      * Checks if the ghost client has received a given message.
      *
      * @param message The message content to be looked for
+     * @param resetHistory If true, reset history of received messages
      * @returns True if a previously received message matches the content
      */
     checkReceived: function (message) {
+      let resetHistory = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       if (this._lastReceivedMessages.length === 0) {
         return false;
       }
       const found = this._lastReceivedMessages.some(receivedMessage => {
         return (!message.userID || message.userID === receivedMessage.userID) && (!message.userAction || message.userAction === receivedMessage.userAction) && (!message.clientContent || message.clientContent === receivedMessage.clientContent);
       });
-      this._lastReceivedMessages = []; // reset history to avoid finding the same message twice
+      if (resetHistory) {
+        this._lastReceivedMessages = []; // by default, reset history to avoid finding the same message twice
+      }
 
       return found;
     },
@@ -7140,6 +7195,7 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
           oPropertyBinding.setValue(value);
           oContextBinding.attachEventOnce("patchCompleted", () => {
             broadcastCollaborationMessage(Activity.Change, `${this._rootPath}/${sPropertyPath}`, this._internalModel);
+            this.unlockField();
             this._lockedPropertyPath = "";
           });
         }).catch(function (err) {
@@ -7189,6 +7245,15 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
         });
       }
     },
+    /**
+     * Checks if a property has been locked by another user.
+     *
+     * @param objectPath
+     * @returns True if locked
+     */
+    checkLockedByOther: function (objectPath) {
+      return this._receivedLocks.includes(objectPath);
+    },
     // /////////////////////////////
     // Private methods
 
@@ -7209,9 +7274,25 @@ sap.ui.predefine("sap/fe/test/api/CollaborationAPI", ["sap/base/Log", "sap/fe/co
      */
     _onMessageReceived: function (message) {
       message.userAction = message.userAction || message.clientAction;
+      if (!message.clientContent) {
+        message.clientContent = "";
+      }
       this._lastReceivedMessages.push(message);
-      if (message.userAction === Activity.Join) {
-        broadcastCollaborationMessage(Activity.JoinEcho, this._lockedPropertyPath ? `${this._rootPath}/${this._lockedPropertyPath}` : undefined, this._internalModel);
+      switch (message.userAction) {
+        case Activity.Join:
+          broadcastCollaborationMessage(Activity.JoinEcho, this._lockedPropertyPath ? `${this._rootPath}/${this._lockedPropertyPath}` : undefined, this._internalModel);
+          break;
+        case Activity.JoinEcho:
+        case Activity.Lock:
+          this._receivedLocks.push(...message.clientContent.split("|"));
+          break;
+        case Activity.Unlock:
+          this._receivedLocks = this._receivedLocks.filter(lock => {
+            return !message.clientContent.split("|").includes(lock);
+          });
+          break;
+        default:
+        // Nothing
       }
     }
   };
@@ -15627,8 +15708,8 @@ sap.ui.predefine(
 	
  */
 sap.ui.predefine(
-	"sap/fe/test/builder/MdcFieldBuilder", ["./FEBuilder", "sap/ui/test/OpaBuilder", "sap/ui/mdc/enum/FieldDisplay", "sap/fe/test/Utils", "sap/ui/mdc/enum/ConditionValidated"],
-	function (FEBuilder, OpaBuilder, FieldDisplay, Utils, ConditionValidated) {
+	"sap/fe/test/builder/MdcFieldBuilder", ["./FEBuilder", "sap/ui/mdc/enums/FieldDisplay", "sap/fe/test/Utils", "sap/ui/mdc/enums/ConditionValidated"],
+	function (FEBuilder, FieldDisplay, Utils, ConditionValidated) {
 		"use strict";
 
 		var VALUE_DESCRIPTION_PATTERN = /(.+?) \((.+?)\)/;
@@ -15655,7 +15736,7 @@ sap.ui.predefine(
 		/**
 		 * This function checks the current value against expected values with respect to the display type.
 		 *
-		 * @param {sap.ui.mdc.enum.FieldDisplay} sDisplay The type of display
+		 * @param {sap.ui.mdc.enums.FieldDisplay} sDisplay The type of display
 		 * @param {any} oExpectedValue
 		 * @param {any} oExpectedDescription
 		 * @param {any} vActualValue
@@ -17085,6 +17166,10 @@ sap.ui.predefine(
 				},
 				cellValue: function (vColumn, vExpectedValue) {
 					return function (oRow) {
+						if (oRow.isA("sap.m.GroupHeaderListItem")) {
+							// don´t check grouping rows
+							return null;
+						}
 						var oCellField = TableBuilder.Row.Matchers.cell(vColumn)(oRow);
 						while (oCellField.isA("sap.fe.macros.MacroAPI")) {
 							oCellField = oCellField.getContent();
@@ -18151,12 +18236,12 @@ sap.ui.predefine("sap/fe/test/library", ["sap/ui/core/Core", "sap/ui/core/librar
     controls: [],
     elements: [],
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.116.0",
+    version: "1.118.0",
     noLibraryCSS: true
   });
   return thisLib;
 }, false);
 sap.ui.require.preload({
-	"sap/fe/test/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"sap.fe.test","type":"library","embeds":[],"applicationVersion":{"version":"1.116.0"},"title":"UI5 library: sap.fe.test","description":"UI5 library: sap.fe.test","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"libs":{"sap.ui.core":{}}},"library":{"i18n":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}'
+	"sap/fe/test/manifest.json":'{"_version":"1.21.0","sap.app":{"id":"sap.fe.test","type":"library","embeds":[],"applicationVersion":{"version":"1.118.0"},"title":"UI5 library: sap.fe.test","description":"UI5 library: sap.fe.test","resources":"resources.json","offline":true},"sap.ui":{"technology":"UI5","supportedThemes":[]},"sap.ui5":{"dependencies":{"libs":{"sap.ui.core":{}}},"library":{"i18n":false,"content":{"controls":[],"elements":[],"types":[],"interfaces":[]}}}}'
 });
 //# sourceMappingURL=library-preload.js.map