@sapui5/sap.fe.test 1.100.0 → 1.101.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.test",
-	"version": "1.100.0",
+	"version": "1.101.0",
 	"description": "SAPUI5 Library sap.fe.test",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -22,8 +22,7 @@
 		"@ui5/cli": "^2.14.0",
 		"copyfiles": "2.2.0",
 		"mkdirp": "^1.0.4",
-		"xpath": "0.0.27",
 		"xml-formatter": "2.4.0",
-		"@sap-ux/jest-mock-ui5": "2.0.5"
+		"xpath": "0.0.27"
 	}
 }

package/src/sap/fe/test/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.100.0</version>
+    <version>1.101.0</version>
 
     <documentation>UI5 library: sap.fe.test</documentation>
 

package/src/sap/fe/test/BaseArrangements.js

@@ -5,7 +5,7 @@
  */
 sap.ui.define(
 	["sap/ui/test/Opa5", "sap/ui/test/OpaBuilder", "sap/ui/thirdparty/jquery", "sap/base/util/UriParameters", "./Utils", "./Stubs"],
-	function(Opa5, OpaBuilder, jQuery, UriParameters, Utils, Stubs) {
+	function (Opa5, OpaBuilder, jQuery, UriParameters, Utils, Stubs) {
 		"use strict";
 
 		/**
@@ -22,7 +22,7 @@ sap.ui.define(
 		 * @public
 		 */
 		var BaseArrangements = Opa5.extend("sap.fe.test.BaseArrangements", {
-			constructor: function(mSettings) {
+			constructor: function (mSettings) {
 				Opa5.apply(this);
 				var oUriParams = new UriParameters(window.location.href),
 					mDefaultLaunchParameters = {
@@ -51,10 +51,10 @@ sap.ui.define(
 			 * @name sap.fe.test.BaseArrangements#iStartMyApp
 			 * @public
 			 */
-			iStartMyApp: function(sAppHash, mUrlParameters) {
+			iStartMyApp: function (sAppHash, mUrlParameters) {
 				var sLaunchUrl = this._mSettings.launchUrl,
 					mUrlParameters = Utils.mergeObjects(this._mSettings.launchParameters, mUrlParameters),
-					sUrlParameters = Object.keys(mUrlParameters).reduce(function(sCurrent, sKey) {
+					sUrlParameters = Object.keys(mUrlParameters).reduce(function (sCurrent, sKey) {
 						return sCurrent + "&" + sKey + "=" + mUrlParameters[sKey];
 					}, ""),
 					sStartupUrl = sLaunchUrl + (sUrlParameters ? "?" + sUrlParameters.substring(1) : "") + (sAppHash ? "#" + sAppHash : "");
@@ -66,7 +66,7 @@ sap.ui.define(
 				// (they are overridden in OPA by the iFrameLauncher)
 				// We also need to override the native confirm dialog, as it blocks the test
 				return OpaBuilder.create(this)
-					.success(function() {
+					.success(function () {
 						var oWindow = Opa5.getWindow();
 
 						Stubs.stubAll(oWindow);
@@ -87,9 +87,9 @@ sap.ui.define(
 			 * @name sap.fe.test.BaseArrangements#resetTestData
 			 * @protected
 			 */
-			resetTestData: function() {
+			resetTestData: function () {
 				function _deleteDatabase(sName) {
-					return new Promise(function(resolve, reject) {
+					return new Promise(function (resolve, reject) {
 						var oRequest = indexedDB.deleteDatabase(sName);
 						oRequest.onsuccess = resolve;
 						oRequest.onerror = reject;
@@ -102,9 +102,9 @@ sap.ui.define(
 				if (indexedDB) {
 					if (typeof indexedDB.databases === "function") {
 						// browser supports enumerating existing databases - wipe all.
-						return indexedDB.databases().then(function(aDatabases) {
+						return indexedDB.databases().then(function (aDatabases) {
 							return Promise.all(
-								aDatabases.map(function(oDatabase) {
+								aDatabases.map(function (oDatabase) {
 									return _deleteDatabase(oDatabase.name);
 								})
 							);
@@ -128,23 +128,23 @@ sap.ui.define(
 			 * @name sap.fe.test.BaseArrangements#iResetTestData
 			 * @public
 			 */
-			iResetTestData: function() {
+			iResetTestData: function () {
 				var that = this,
 					bSuccess = false;
 
 				return OpaBuilder.create(this)
-					.success(function() {
+					.success(function () {
 						//clear local storage so no flex change / variant management zombies exist
 						that.resetTestData()
-							.finally(function() {
+							.finally(function () {
 								bSuccess = true;
 							})
-							.catch(function(oError) {
+							.catch(function (oError) {
 								throw oError;
 							});
 
 						return OpaBuilder.create(this)
-							.check(function() {
+							.check(function () {
 								return bSuccess;
 							})
 							.execute();
@@ -153,6 +153,53 @@ sap.ui.define(
 					.execute();
 			},
 
+			/**
+			 * Resets the mock data.
+			 *
+			 * @param {object} [oAppInfo] The application id or a uri pointing to the service. One of the following properties needs to be provided within the parameter:
+			 * <code><pre>
+			 * 	{
+			 * 		<ServiceUri>: <uri of the service like listed in the manifest (sap.app.dataSources.mainService.uri)>
+			 * 		<AppId>: <application id like listed in the manifest (sap.app.id)>
+			 *  }
+			 * </pre></code>
+			 * NOTE: When passing the AppId, the application needs to be running already. Calling the function before the application is started can be done by passing the ServiceUri.
+			 *
+			 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+			 *
+			 * @function
+			 * @name sap.fe.test.BaseArrangements#iResetMockData
+			 * @public
+			 */
+			iResetMockData: function (oAppInfo) {
+				var bSuccess = false;
+				return OpaBuilder.create(this)
+					.success(function () {
+						var sServiceUri = oAppInfo.AppId
+								? Opa5.getWindow()[oAppInfo.AppId].Component.getMetadata().getManifest()["sap.app"]["dataSources"][
+										"mainService"
+								  ]["uri"]
+								: oAppInfo.ServiceUri,
+							oReloadMockData = jQuery.post(sServiceUri + "\\$metadata/reload");
+
+						Promise.all([oReloadMockData])
+							.finally(function () {
+								bSuccess = true;
+							})
+							.catch(function (oError) {
+								throw oError;
+							});
+
+						return OpaBuilder.create(this)
+							.check(function () {
+								return bSuccess;
+							})
+							.execute();
+					})
+					.description(Utils.formatMessage("Resetting mock data"))
+					.execute();
+			},
+
 			/**
 			 * Tears down the current application.
 			 *
@@ -162,9 +209,9 @@ sap.ui.define(
 			 * @name sap.fe.test.BaseArrangements#iTearDownMyApp
 			 * @public
 			 */
-			iTearDownMyApp: function() {
+			iTearDownMyApp: function () {
 				return OpaBuilder.create(this)
-					.do(function() {
+					.do(function () {
 						var oWindow = Opa5.getWindow();
 						Stubs.restoreAll(oWindow);
 					})
@@ -182,10 +229,10 @@ sap.ui.define(
 			 * @name sap.fe.test.BaseArrangements#iRestartMyApp
 			 * @public
 			 */
-			iRestartMyApp: function() {
+			iRestartMyApp: function () {
 				var that = this;
 				return OpaBuilder.create(this)
-					.success(function() {
+					.success(function () {
 						var sCurrentHash = Opa5.getWindow().location.hash.substring(1);
 						return that.iTearDownMyApp().and.iStartMyApp(sCurrentHash);
 					})

package/src/sap/fe/test/FeMocks.js

@@ -2,7 +2,7 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/PageController", "@sap-ux/jest-mock-ui5/dist/generic", "sap/ui/mdc/FilterBar", "sap/fe/core/controllerextensions/InternalEditFlow"], function (PageController, generic, FilterBar, InternalEditFlow) {
+sap.ui.define(["@sap-ux/jest-mock-ui5/dist/generic", "sap/fe/core/controllerextensions/InternalEditFlow", "sap/fe/core/PageController", "sap/ui/mdc/FilterBar"], function (generic, InternalEditFlow, PageController, FilterBar) {
   "use strict";
 
   var _exports = {};
@@ -56,11 +56,11 @@ sap.ui.define(["sap/fe/core/PageController", "@sap-ux/jest-mock-ui5/dist/generic
 
   function mockFilterBar() {
     var filterBar = mock(FilterBar);
-    filterBar.mock.initialized = jest.fn();
+    filterBar.mock.waitForInitialization = jest.fn();
     return filterBar;
   }
 
   _exports.mockFilterBar = mockFilterBar;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZlTW9ja3MudHMiXSwibmFtZXMiOlsibW9ja0xpc3RSZXBvcnRDb250cm9sbGVyIiwibGlzdFJlcG9ydCIsIl9nZXRGaWx0ZXJCYXJDb250cm9sIiwiamVzdCIsImZuIiwiX2dldENvbnRyb2xzIiwiX2lzRmlsdGVyQmFySGlkZGVuIiwiX2lzTXVsdGlNb2RlIiwiX3NldENvdW50c091dERhdGVkIiwiX2dldEN1cnJlbnRDb250cm9sIiwiX2dldE11bHRpTW9kZUNvbnRyb2wiLCJfaGFzTXVsdGlWaXN1YWxpemF0aW9ucyIsIl9zaG91bGRBdXRvVHJpZ2dlclNlYXJjaCIsIl9nZXRUYWJsZSIsImdldEV4dGVuc2lvbkFQSSIsIl9lZGl0RmxvdyIsIm1vY2siLCJJbnRlcm5hbEVkaXRGbG93IiwiT2JqZWN0IiwiYXNzaWduIiwiUGFnZUNvbnRyb2xsZXIiLCJtb2NrT2JqZWN0UGFnZUNvbnRyb2xsZXIiLCJvYmplY3RQYWdlIiwiZ2V0U3RpY2t5RWRpdE1vZGUiLCJtb2NrQ29udGV4dEZvckV4dGVuc2lvbiIsImV4dGVuc2lvbiIsImNvbnRyb2xsZXIiLCJiYXNlIiwidmlldyIsImdldFZpZXciLCJtb2NrZWRCYXNlIiwibW9ja0ZpbHRlckJhciIsImZpbHRlckJhciIsIkZpbHRlckJhciIsImluaXRpYWxpemVkIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7O0FBMEJPLFdBQVNBLHdCQUFULEdBQTZIO0FBQ25JO0FBQ0EsUUFBTUMsVUFBMkUsR0FBRztBQUNuRkMsTUFBQUEsb0JBQW9CLEVBQUVDLElBQUksQ0FBQ0MsRUFBTCxFQUQ2RDtBQUVuRkMsTUFBQUEsWUFBWSxFQUFFRixJQUFJLENBQUNDLEVBQUwsRUFGcUU7QUFHbkZFLE1BQUFBLGtCQUFrQixFQUFFSCxJQUFJLENBQUNDLEVBQUwsRUFIK0Q7QUFJbkZHLE1BQUFBLFlBQVksRUFBRUosSUFBSSxDQUFDQyxFQUFMLEVBSnFFO0FBS25GSSxNQUFBQSxrQkFBa0IsRUFBRUwsSUFBSSxDQUFDQyxFQUFMLEVBTCtEO0FBTW5GSyxNQUFBQSxrQkFBa0IsRUFBRU4sSUFBSSxDQUFDQyxFQUFMLEVBTitEO0FBT25GTSxNQUFBQSxvQkFBb0IsRUFBRVAsSUFBSSxDQUFDQyxFQUFMLEVBUDZEO0FBUW5GTyxNQUFBQSx1QkFBdUIsRUFBRVIsSUFBSSxDQUFDQyxFQUFMLEVBUjBEO0FBU25GUSxNQUFBQSx3QkFBd0IsRUFBRVQsSUFBSSxDQUFDQyxFQUFMLEVBVHlEO0FBVW5GUyxNQUFBQSxTQUFTLEVBQUVWLElBQUksQ0FBQ0MsRUFBTCxFQVZ3RTtBQVduRlUsTUFBQUEsZUFBZSxFQUFFWCxJQUFJLENBQUNDLEVBQUwsRUFYa0U7QUFZbkZXLE1BQUFBLFNBQVMsRUFBRUMsSUFBSSxDQUFDQyxnQkFBRDtBQVpvRSxLQUFwRjtBQWNBLFdBQU9DLE1BQU0sQ0FBQ0MsTUFBUCxDQUFjSCxJQUFJLENBQUNJLGNBQUQsQ0FBbEIsRUFBMkNuQixVQUEzQyxDQUFQO0FBR0E7Ozs7QUFFTSxXQUFTb0Isd0JBQVQsR0FBNkg7QUFDbkk7QUFDQSxRQUFNQyxVQUEyRSxHQUFHO0FBQ25GQyxNQUFBQSxpQkFBaUIsRUFBRXBCLElBQUksQ0FBQ0MsRUFBTCxFQURnRTtBQUVuRlUsTUFBQUEsZUFBZSxFQUFFWCxJQUFJLENBQUNDLEVBQUwsRUFGa0U7QUFHbkZXLE1BQUFBLFNBQVMsRUFBR0MsSUFBSSxDQUFDQyxnQkFBRDtBQUhtRSxLQUFwRjtBQUtBLFdBQU9DLE1BQU0sQ0FBQ0MsTUFBUCxDQUFjSCxJQUFJLENBQUNJLGNBQUQsQ0FBbEIsRUFBMkNFLFVBQTNDLENBQVA7QUFHQTs7OztBQUVNLFdBQVNFLHVCQUFULENBQ05DLFNBRE0sRUFFTkMsVUFGTSxFQUdOQyxJQUhNLEVBSWtDO0FBQ3hDLFFBQU1DLElBQUksR0FBR0YsVUFBVSxDQUFDRyxPQUFYLEVBQWI7O0FBQ0NKLElBQUFBLFNBQUQsQ0FBbUJJLE9BQW5CLEdBQTZCO0FBQUEsYUFBTUQsSUFBTjtBQUFBLEtBQTdCOztBQUNBLFFBQU1FLFVBQVUsR0FBR2QsSUFBSSxDQUFDVyxJQUFJLElBQUksRUFBVCxDQUF2QjtBQUNBLFdBQU9ULE1BQU0sQ0FBQ0MsTUFBUCxDQUFjVyxVQUFkLEVBQTBCTCxTQUExQixDQUFQO0FBQ0E7Ozs7QUFFTSxXQUFTTSxhQUFULEdBQXNHO0FBQzVHLFFBQU1DLFNBQVMsR0FBR2hCLElBQUksQ0FBQ2lCLFNBQUQsQ0FBdEI7QUFDQUQsSUFBQUEsU0FBUyxDQUFDaEIsSUFBVixDQUFla0IsV0FBZixHQUE2Qi9CLElBQUksQ0FBQ0MsRUFBTCxFQUE3QjtBQUNBLFdBQU80QixTQUFQO0FBQ0EiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBQYWdlQ29udHJvbGxlciBmcm9tIFwic2FwL2ZlL2NvcmUvUGFnZUNvbnRyb2xsZXJcIjtcbmltcG9ydCB7IG1vY2ssIE1vY2tlZEluc3RhbmNlLCBVSTVJbnN0YW5jZVR5cGUsIFdpdGhNb2NrIH0gZnJvbSBcIkBzYXAtdXgvamVzdC1tb2NrLXVpNS9kaXN0L2dlbmVyaWNcIjtcbmltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IEZpbHRlckJhciBmcm9tIFwic2FwL3VpL21kYy9GaWx0ZXJCYXJcIjtcbmltcG9ydCBJbnRlcm5hbEVkaXRGbG93IGZyb20gXCJzYXAvZmUvY29yZS9jb250cm9sbGVyZXh0ZW5zaW9ucy9JbnRlcm5hbEVkaXRGbG93XCI7XG5cbmludGVyZmFjZSBDb21tb25Db250cm9sbGVyVHlwZSB7XG5cdGdldEV4dGVuc2lvbkFQSTogYW55O1xuXHRfZWRpdEZsb3c6IFdpdGhNb2NrPEludGVybmFsRWRpdEZsb3c+O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIExpc3RSZXBvcnRDb250cm9sbGVyVHlwZSB7XG5cdF9nZXRGaWx0ZXJCYXJDb250cm9sOiBhbnk7XG5cdF9nZXRDb250cm9sczogYW55O1xuXHRfaXNGaWx0ZXJCYXJIaWRkZW46IGFueTtcblx0X2lzTXVsdGlNb2RlOiBhbnk7XG5cdF9zZXRDb3VudHNPdXREYXRlZDogYW55O1xuXHRfZ2V0Q3VycmVudENvbnRyb2w6IGFueTtcblx0X2dldE11bHRpTW9kZUNvbnRyb2w6IGFueTtcblx0X2hhc011bHRpVmlzdWFsaXphdGlvbnM6IGFueTtcblx0X3Nob3VsZEF1dG9UcmlnZ2VyU2VhcmNoOiBhbnk7XG5cdF9nZXRUYWJsZTogYW55O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIE9iamVjdFBhZ2VDb250cm9sbGVyVHlwZSB7XG5cdGdldFN0aWNreUVkaXRNb2RlOiBhbnk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBtb2NrTGlzdFJlcG9ydENvbnRyb2xsZXIoKTogV2l0aE1vY2s8Q29udHJvbGxlciAmIFBhZ2VDb250cm9sbGVyICYgTGlzdFJlcG9ydENvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGU+IHtcblx0Ly8gbWFudWFsbHkgYWRkIExpc3RSZXBvcnRDb250cm9sbGVyLmNvbnRyb2xsZXIgZnVuY3Rpb25zIHNpbmNlIEkgYW0gdW5hYmxlIHRvIGltcG9ydCB0aGUgcHJvdG90eXBlXG5cdGNvbnN0IGxpc3RSZXBvcnQ6IE1vY2tlZEluc3RhbmNlPExpc3RSZXBvcnRDb250cm9sbGVyVHlwZSAmIENvbW1vbkNvbnRyb2xsZXJUeXBlPiA9IHtcblx0XHRfZ2V0RmlsdGVyQmFyQ29udHJvbDogamVzdC5mbigpLFxuXHRcdF9nZXRDb250cm9sczogamVzdC5mbigpLFxuXHRcdF9pc0ZpbHRlckJhckhpZGRlbjogamVzdC5mbigpLFxuXHRcdF9pc011bHRpTW9kZTogamVzdC5mbigpLFxuXHRcdF9zZXRDb3VudHNPdXREYXRlZDogamVzdC5mbigpLFxuXHRcdF9nZXRDdXJyZW50Q29udHJvbDogamVzdC5mbigpLFxuXHRcdF9nZXRNdWx0aU1vZGVDb250cm9sOiBqZXN0LmZuKCksXG5cdFx0X2hhc011bHRpVmlzdWFsaXphdGlvbnM6IGplc3QuZm4oKSxcblx0XHRfc2hvdWxkQXV0b1RyaWdnZXJTZWFyY2g6IGplc3QuZm4oKSxcblx0XHRfZ2V0VGFibGU6IGplc3QuZm4oKSxcblx0XHRnZXRFeHRlbnNpb25BUEk6IGplc3QuZm4oKSxcblx0XHRfZWRpdEZsb3c6IG1vY2soSW50ZXJuYWxFZGl0RmxvdykgYXMgYW55XG5cdH07XG5cdHJldHVybiBPYmplY3QuYXNzaWduKG1vY2soUGFnZUNvbnRyb2xsZXIpIGFzIGFueSwgbGlzdFJlcG9ydCkgYXMgV2l0aE1vY2s8XG5cdFx0Q29udHJvbGxlciAmIFBhZ2VDb250cm9sbGVyICYgTGlzdFJlcG9ydENvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGVcblx0Pjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tPYmplY3RQYWdlQ29udHJvbGxlcigpOiBXaXRoTW9jazxDb250cm9sbGVyICYgUGFnZUNvbnRyb2xsZXIgJiBPYmplY3RQYWdlQ29udHJvbGxlclR5cGUgJiBDb21tb25Db250cm9sbGVyVHlwZT4ge1xuXHQvLyBtYW51YWxseSBhZGQgTGlzdFJlcG9ydENvbnRyb2xsZXIuY29udHJvbGxlciBmdW5jdGlvbnMgc2luY2UgSSBhbSB1bmFibGUgdG8gaW1wb3J0IHRoZSBwcm90b3R5cGVcblx0Y29uc3Qgb2JqZWN0UGFnZTogTW9ja2VkSW5zdGFuY2U8T2JqZWN0UGFnZUNvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGU+ID0ge1xuXHRcdGdldFN0aWNreUVkaXRNb2RlOiBqZXN0LmZuKCksXG5cdFx0Z2V0RXh0ZW5zaW9uQVBJOiBqZXN0LmZuKCksXG5cdFx0X2VkaXRGbG93OiAobW9jayhJbnRlcm5hbEVkaXRGbG93KSBhcyBXaXRoTW9jazxJbnRlcm5hbEVkaXRGbG93PikgYXMgYW55XG5cdH07XG5cdHJldHVybiBPYmplY3QuYXNzaWduKG1vY2soUGFnZUNvbnRyb2xsZXIpIGFzIGFueSwgb2JqZWN0UGFnZSkgYXMgV2l0aE1vY2s8XG5cdFx0Q29udHJvbGxlciAmIFBhZ2VDb250cm9sbGVyICYgT2JqZWN0UGFnZUNvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGVcblx0Pjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tDb250ZXh0Rm9yRXh0ZW5zaW9uPEVYVCBleHRlbmRzIG9iamVjdCwgQkFTRSBleHRlbmRzIG9iamVjdD4oXG5cdGV4dGVuc2lvbjogRVhULFxuXHRjb250cm9sbGVyOiBXaXRoTW9jazxDb250cm9sbGVyPixcblx0YmFzZT86IEJBU0Vcbik6IFdpdGhNb2NrPEVYVCAmIFVJNUluc3RhbmNlVHlwZTxCQVNFPj4ge1xuXHRjb25zdCB2aWV3ID0gY29udHJvbGxlci5nZXRWaWV3KCk7XG5cdChleHRlbnNpb24gYXMgYW55KS5nZXRWaWV3ID0gKCkgPT4gdmlldztcblx0Y29uc3QgbW9ja2VkQmFzZSA9IG1vY2soYmFzZSB8fCB7fSk7XG5cdHJldHVybiBPYmplY3QuYXNzaWduKG1vY2tlZEJhc2UsIGV4dGVuc2lvbikgYXMgV2l0aE1vY2s8RVhUICYgVUk1SW5zdGFuY2VUeXBlPEJBU0U+Pjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tGaWx0ZXJCYXIoKTogV2l0aE1vY2s8RmlsdGVyQmFyICYgeyBpbml0aWFsaXplZDogRnVuY3Rpb247IF9iU2VhcmNoVHJpZ2dlcmVkOiBCb29sZWFuIH0+IHtcblx0Y29uc3QgZmlsdGVyQmFyID0gbW9jayhGaWx0ZXJCYXIpIGFzIFdpdGhNb2NrPEZpbHRlckJhciAmIHsgaW5pdGlhbGl6ZWQ6IEZ1bmN0aW9uOyBfYlNlYXJjaFRyaWdnZXJlZDogQm9vbGVhbiB9Pjtcblx0ZmlsdGVyQmFyLm1vY2suaW5pdGlhbGl6ZWQgPSBqZXN0LmZuKCk7XG5cdHJldHVybiBmaWx0ZXJCYXI7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZlTW9ja3MudHMiXSwibmFtZXMiOlsibW9ja0xpc3RSZXBvcnRDb250cm9sbGVyIiwibGlzdFJlcG9ydCIsIl9nZXRGaWx0ZXJCYXJDb250cm9sIiwiamVzdCIsImZuIiwiX2dldENvbnRyb2xzIiwiX2lzRmlsdGVyQmFySGlkZGVuIiwiX2lzTXVsdGlNb2RlIiwiX3NldENvdW50c091dERhdGVkIiwiX2dldEN1cnJlbnRDb250cm9sIiwiX2dldE11bHRpTW9kZUNvbnRyb2wiLCJfaGFzTXVsdGlWaXN1YWxpemF0aW9ucyIsIl9zaG91bGRBdXRvVHJpZ2dlclNlYXJjaCIsIl9nZXRUYWJsZSIsImdldEV4dGVuc2lvbkFQSSIsIl9lZGl0RmxvdyIsIm1vY2siLCJJbnRlcm5hbEVkaXRGbG93IiwiT2JqZWN0IiwiYXNzaWduIiwiUGFnZUNvbnRyb2xsZXIiLCJtb2NrT2JqZWN0UGFnZUNvbnRyb2xsZXIiLCJvYmplY3RQYWdlIiwiZ2V0U3RpY2t5RWRpdE1vZGUiLCJtb2NrQ29udGV4dEZvckV4dGVuc2lvbiIsImV4dGVuc2lvbiIsImNvbnRyb2xsZXIiLCJiYXNlIiwidmlldyIsImdldFZpZXciLCJtb2NrZWRCYXNlIiwibW9ja0ZpbHRlckJhciIsImZpbHRlckJhciIsIkZpbHRlckJhciIsIndhaXRGb3JJbml0aWFsaXphdGlvbiJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7OztBQTBCTyxXQUFTQSx3QkFBVCxHQUE2SDtBQUNuSTtBQUNBLFFBQU1DLFVBQTJFLEdBQUc7QUFDbkZDLE1BQUFBLG9CQUFvQixFQUFFQyxJQUFJLENBQUNDLEVBQUwsRUFENkQ7QUFFbkZDLE1BQUFBLFlBQVksRUFBRUYsSUFBSSxDQUFDQyxFQUFMLEVBRnFFO0FBR25GRSxNQUFBQSxrQkFBa0IsRUFBRUgsSUFBSSxDQUFDQyxFQUFMLEVBSCtEO0FBSW5GRyxNQUFBQSxZQUFZLEVBQUVKLElBQUksQ0FBQ0MsRUFBTCxFQUpxRTtBQUtuRkksTUFBQUEsa0JBQWtCLEVBQUVMLElBQUksQ0FBQ0MsRUFBTCxFQUwrRDtBQU1uRkssTUFBQUEsa0JBQWtCLEVBQUVOLElBQUksQ0FBQ0MsRUFBTCxFQU4rRDtBQU9uRk0sTUFBQUEsb0JBQW9CLEVBQUVQLElBQUksQ0FBQ0MsRUFBTCxFQVA2RDtBQVFuRk8sTUFBQUEsdUJBQXVCLEVBQUVSLElBQUksQ0FBQ0MsRUFBTCxFQVIwRDtBQVNuRlEsTUFBQUEsd0JBQXdCLEVBQUVULElBQUksQ0FBQ0MsRUFBTCxFQVR5RDtBQVVuRlMsTUFBQUEsU0FBUyxFQUFFVixJQUFJLENBQUNDLEVBQUwsRUFWd0U7QUFXbkZVLE1BQUFBLGVBQWUsRUFBRVgsSUFBSSxDQUFDQyxFQUFMLEVBWGtFO0FBWW5GVyxNQUFBQSxTQUFTLEVBQUVDLElBQUksQ0FBQ0MsZ0JBQUQ7QUFab0UsS0FBcEY7QUFjQSxXQUFPQyxNQUFNLENBQUNDLE1BQVAsQ0FBY0gsSUFBSSxDQUFDSSxjQUFELENBQWxCLEVBQTJDbkIsVUFBM0MsQ0FBUDtBQUdBOzs7O0FBRU0sV0FBU29CLHdCQUFULEdBQTZIO0FBQ25JO0FBQ0EsUUFBTUMsVUFBMkUsR0FBRztBQUNuRkMsTUFBQUEsaUJBQWlCLEVBQUVwQixJQUFJLENBQUNDLEVBQUwsRUFEZ0U7QUFFbkZVLE1BQUFBLGVBQWUsRUFBRVgsSUFBSSxDQUFDQyxFQUFMLEVBRmtFO0FBR25GVyxNQUFBQSxTQUFTLEVBQUVDLElBQUksQ0FBQ0MsZ0JBQUQ7QUFIb0UsS0FBcEY7QUFLQSxXQUFPQyxNQUFNLENBQUNDLE1BQVAsQ0FBY0gsSUFBSSxDQUFDSSxjQUFELENBQWxCLEVBQTJDRSxVQUEzQyxDQUFQO0FBR0E7Ozs7QUFFTSxXQUFTRSx1QkFBVCxDQUNOQyxTQURNLEVBRU5DLFVBRk0sRUFHTkMsSUFITSxFQUlrQztBQUN4QyxRQUFNQyxJQUFJLEdBQUdGLFVBQVUsQ0FBQ0csT0FBWCxFQUFiOztBQUNDSixJQUFBQSxTQUFELENBQW1CSSxPQUFuQixHQUE2QjtBQUFBLGFBQU1ELElBQU47QUFBQSxLQUE3Qjs7QUFDQSxRQUFNRSxVQUFVLEdBQUdkLElBQUksQ0FBQ1csSUFBSSxJQUFJLEVBQVQsQ0FBdkI7QUFDQSxXQUFPVCxNQUFNLENBQUNDLE1BQVAsQ0FBY1csVUFBZCxFQUEwQkwsU0FBMUIsQ0FBUDtBQUNBOzs7O0FBRU0sV0FBU00sYUFBVCxHQUFnSDtBQUN0SCxRQUFNQyxTQUFTLEdBQUdoQixJQUFJLENBQUNpQixTQUFELENBQXRCO0FBQ0FELElBQUFBLFNBQVMsQ0FBQ2hCLElBQVYsQ0FBZWtCLHFCQUFmLEdBQXVDL0IsSUFBSSxDQUFDQyxFQUFMLEVBQXZDO0FBQ0EsV0FBTzRCLFNBQVA7QUFDQSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgbW9jaywgTW9ja2VkSW5zdGFuY2UsIFVJNUluc3RhbmNlVHlwZSwgV2l0aE1vY2sgfSBmcm9tIFwiQHNhcC11eC9qZXN0LW1vY2stdWk1L2Rpc3QvZ2VuZXJpY1wiO1xuaW1wb3J0IEludGVybmFsRWRpdEZsb3cgZnJvbSBcInNhcC9mZS9jb3JlL2NvbnRyb2xsZXJleHRlbnNpb25zL0ludGVybmFsRWRpdEZsb3dcIjtcbmltcG9ydCBQYWdlQ29udHJvbGxlciBmcm9tIFwic2FwL2ZlL2NvcmUvUGFnZUNvbnRyb2xsZXJcIjtcbmltcG9ydCBDb250cm9sbGVyIGZyb20gXCJzYXAvdWkvY29yZS9tdmMvQ29udHJvbGxlclwiO1xuaW1wb3J0IEZpbHRlckJhciBmcm9tIFwic2FwL3VpL21kYy9GaWx0ZXJCYXJcIjtcblxuaW50ZXJmYWNlIENvbW1vbkNvbnRyb2xsZXJUeXBlIHtcblx0Z2V0RXh0ZW5zaW9uQVBJOiBhbnk7XG5cdF9lZGl0RmxvdzogV2l0aE1vY2s8SW50ZXJuYWxFZGl0Rmxvdz47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgTGlzdFJlcG9ydENvbnRyb2xsZXJUeXBlIHtcblx0X2dldEZpbHRlckJhckNvbnRyb2w6IGFueTtcblx0X2dldENvbnRyb2xzOiBhbnk7XG5cdF9pc0ZpbHRlckJhckhpZGRlbjogYW55O1xuXHRfaXNNdWx0aU1vZGU6IGFueTtcblx0X3NldENvdW50c091dERhdGVkOiBhbnk7XG5cdF9nZXRDdXJyZW50Q29udHJvbDogYW55O1xuXHRfZ2V0TXVsdGlNb2RlQ29udHJvbDogYW55O1xuXHRfaGFzTXVsdGlWaXN1YWxpemF0aW9uczogYW55O1xuXHRfc2hvdWxkQXV0b1RyaWdnZXJTZWFyY2g6IGFueTtcblx0X2dldFRhYmxlOiBhbnk7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgT2JqZWN0UGFnZUNvbnRyb2xsZXJUeXBlIHtcblx0Z2V0U3RpY2t5RWRpdE1vZGU6IGFueTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tMaXN0UmVwb3J0Q29udHJvbGxlcigpOiBXaXRoTW9jazxDb250cm9sbGVyICYgUGFnZUNvbnRyb2xsZXIgJiBMaXN0UmVwb3J0Q29udHJvbGxlclR5cGUgJiBDb21tb25Db250cm9sbGVyVHlwZT4ge1xuXHQvLyBtYW51YWxseSBhZGQgTGlzdFJlcG9ydENvbnRyb2xsZXIuY29udHJvbGxlciBmdW5jdGlvbnMgc2luY2UgSSBhbSB1bmFibGUgdG8gaW1wb3J0IHRoZSBwcm90b3R5cGVcblx0Y29uc3QgbGlzdFJlcG9ydDogTW9ja2VkSW5zdGFuY2U8TGlzdFJlcG9ydENvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGU+ID0ge1xuXHRcdF9nZXRGaWx0ZXJCYXJDb250cm9sOiBqZXN0LmZuKCksXG5cdFx0X2dldENvbnRyb2xzOiBqZXN0LmZuKCksXG5cdFx0X2lzRmlsdGVyQmFySGlkZGVuOiBqZXN0LmZuKCksXG5cdFx0X2lzTXVsdGlNb2RlOiBqZXN0LmZuKCksXG5cdFx0X3NldENvdW50c091dERhdGVkOiBqZXN0LmZuKCksXG5cdFx0X2dldEN1cnJlbnRDb250cm9sOiBqZXN0LmZuKCksXG5cdFx0X2dldE11bHRpTW9kZUNvbnRyb2w6IGplc3QuZm4oKSxcblx0XHRfaGFzTXVsdGlWaXN1YWxpemF0aW9uczogamVzdC5mbigpLFxuXHRcdF9zaG91bGRBdXRvVHJpZ2dlclNlYXJjaDogamVzdC5mbigpLFxuXHRcdF9nZXRUYWJsZTogamVzdC5mbigpLFxuXHRcdGdldEV4dGVuc2lvbkFQSTogamVzdC5mbigpLFxuXHRcdF9lZGl0RmxvdzogbW9jayhJbnRlcm5hbEVkaXRGbG93KSBhcyBhbnlcblx0fTtcblx0cmV0dXJuIE9iamVjdC5hc3NpZ24obW9jayhQYWdlQ29udHJvbGxlcikgYXMgYW55LCBsaXN0UmVwb3J0KSBhcyBXaXRoTW9jazxcblx0XHRDb250cm9sbGVyICYgUGFnZUNvbnRyb2xsZXIgJiBMaXN0UmVwb3J0Q29udHJvbGxlclR5cGUgJiBDb21tb25Db250cm9sbGVyVHlwZVxuXHQ+O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbW9ja09iamVjdFBhZ2VDb250cm9sbGVyKCk6IFdpdGhNb2NrPENvbnRyb2xsZXIgJiBQYWdlQ29udHJvbGxlciAmIE9iamVjdFBhZ2VDb250cm9sbGVyVHlwZSAmIENvbW1vbkNvbnRyb2xsZXJUeXBlPiB7XG5cdC8vIG1hbnVhbGx5IGFkZCBMaXN0UmVwb3J0Q29udHJvbGxlci5jb250cm9sbGVyIGZ1bmN0aW9ucyBzaW5jZSBJIGFtIHVuYWJsZSB0byBpbXBvcnQgdGhlIHByb3RvdHlwZVxuXHRjb25zdCBvYmplY3RQYWdlOiBNb2NrZWRJbnN0YW5jZTxPYmplY3RQYWdlQ29udHJvbGxlclR5cGUgJiBDb21tb25Db250cm9sbGVyVHlwZT4gPSB7XG5cdFx0Z2V0U3RpY2t5RWRpdE1vZGU6IGplc3QuZm4oKSxcblx0XHRnZXRFeHRlbnNpb25BUEk6IGplc3QuZm4oKSxcblx0XHRfZWRpdEZsb3c6IG1vY2soSW50ZXJuYWxFZGl0RmxvdykgYXMgV2l0aE1vY2s8SW50ZXJuYWxFZGl0Rmxvdz4gYXMgYW55XG5cdH07XG5cdHJldHVybiBPYmplY3QuYXNzaWduKG1vY2soUGFnZUNvbnRyb2xsZXIpIGFzIGFueSwgb2JqZWN0UGFnZSkgYXMgV2l0aE1vY2s8XG5cdFx0Q29udHJvbGxlciAmIFBhZ2VDb250cm9sbGVyICYgT2JqZWN0UGFnZUNvbnRyb2xsZXJUeXBlICYgQ29tbW9uQ29udHJvbGxlclR5cGVcblx0Pjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tDb250ZXh0Rm9yRXh0ZW5zaW9uPEVYVCBleHRlbmRzIG9iamVjdCwgQkFTRSBleHRlbmRzIG9iamVjdD4oXG5cdGV4dGVuc2lvbjogRVhULFxuXHRjb250cm9sbGVyOiBXaXRoTW9jazxDb250cm9sbGVyPixcblx0YmFzZT86IEJBU0Vcbik6IFdpdGhNb2NrPEVYVCAmIFVJNUluc3RhbmNlVHlwZTxCQVNFPj4ge1xuXHRjb25zdCB2aWV3ID0gY29udHJvbGxlci5nZXRWaWV3KCk7XG5cdChleHRlbnNpb24gYXMgYW55KS5nZXRWaWV3ID0gKCkgPT4gdmlldztcblx0Y29uc3QgbW9ja2VkQmFzZSA9IG1vY2soYmFzZSB8fCB7fSk7XG5cdHJldHVybiBPYmplY3QuYXNzaWduKG1vY2tlZEJhc2UsIGV4dGVuc2lvbikgYXMgV2l0aE1vY2s8RVhUICYgVUk1SW5zdGFuY2VUeXBlPEJBU0U+Pjtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1vY2tGaWx0ZXJCYXIoKTogV2l0aE1vY2s8RmlsdGVyQmFyICYgeyB3YWl0Rm9ySW5pdGlhbGl6YXRpb246IEZ1bmN0aW9uOyBfYlNlYXJjaFRyaWdnZXJlZDogQm9vbGVhbiB9PiB7XG5cdGNvbnN0IGZpbHRlckJhciA9IG1vY2soRmlsdGVyQmFyKSBhcyBXaXRoTW9jazxGaWx0ZXJCYXIgJiB7IHdhaXRGb3JJbml0aWFsaXphdGlvbjogRnVuY3Rpb247IF9iU2VhcmNoVHJpZ2dlcmVkOiBCb29sZWFuIH0+O1xuXHRmaWx0ZXJCYXIubW9jay53YWl0Rm9ySW5pdGlhbGl6YXRpb24gPSBqZXN0LmZuKCk7XG5cdHJldHVybiBmaWx0ZXJCYXI7XG59XG4iXX0=

package/src/sap/fe/test/FeMocks.ts

@@ -1,8 +1,8 @@
-import PageController from "sap/fe/core/PageController";
 import { mock, MockedInstance, UI5InstanceType, WithMock } from "@sap-ux/jest-mock-ui5/dist/generic";
+import InternalEditFlow from "sap/fe/core/controllerextensions/InternalEditFlow";
+import PageController from "sap/fe/core/PageController";
 import Controller from "sap/ui/core/mvc/Controller";
 import FilterBar from "sap/ui/mdc/FilterBar";
-import InternalEditFlow from "sap/fe/core/controllerextensions/InternalEditFlow";
 
 interface CommonControllerType {
 	getExtensionAPI: any;
@@ -52,7 +52,7 @@ export function mockObjectPageController(): WithMock<Controller & PageController
 	const objectPage: MockedInstance<ObjectPageControllerType & CommonControllerType> = {
 		getStickyEditMode: jest.fn(),
 		getExtensionAPI: jest.fn(),
-		_editFlow: (mock(InternalEditFlow) as WithMock<InternalEditFlow>) as any
+		_editFlow: mock(InternalEditFlow) as WithMock<InternalEditFlow> as any
 	};
 	return Object.assign(mock(PageController) as any, objectPage) as WithMock<
 		Controller & PageController & ObjectPageControllerType & CommonControllerType
@@ -70,8 +70,8 @@ export function mockContextForExtension<EXT extends object, BASE extends object>
 	return Object.assign(mockedBase, extension) as WithMock<EXT & UI5InstanceType<BASE>>;
 }
 
-export function mockFilterBar(): WithMock<FilterBar & { initialized: Function; _bSearchTriggered: Boolean }> {
-	const filterBar = mock(FilterBar) as WithMock<FilterBar & { initialized: Function; _bSearchTriggered: Boolean }>;
-	filterBar.mock.initialized = jest.fn();
+export function mockFilterBar(): WithMock<FilterBar & { waitForInitialization: Function; _bSearchTriggered: Boolean }> {
+	const filterBar = mock(FilterBar) as WithMock<FilterBar & { waitForInitialization: Function; _bSearchTriggered: Boolean }>;
+	filterBar.mock.waitForInitialization = jest.fn();
 	return filterBar;
 }

package/src/sap/fe/test/FlexibleColumnLayout.js

@@ -3,147 +3,154 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/base/util/merge", "./TemplatePage", "sap/ui/test/OpaBuilder", "sap/m/library"], function(
-	mergeObjects,
-	TemplatePage,
-	OpaBuilder,
-	mLibrary
-) {
-	"use strict";
-	return {
-		create: function(sFlpAppName) {
-			return {
-				actions: {
-					iClickFirstColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midForward")
-							.description("Clicking the First Column Expand Button")
-							.doPress()
-							.execute();
+sap.ui.define(
+	["sap/base/util/merge", "./TemplatePage", "sap/ui/test/OpaBuilder", "sap/m/library"],
+	function (mergeObjects, TemplatePage, OpaBuilder, mLibrary) {
+		"use strict";
+		return {
+			create: function (sFlpAppName) {
+				return {
+					actions: {
+						iClickFirstColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midForward")
+								.description("Clicking the First Column Expand Button")
+								.doPress()
+								.execute();
+						},
+						iClickLastColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midBack")
+								.description("Clicking the Last Column Expand Button")
+								.doPress()
+								.execute();
+						},
+						iClickLastColumnCollapseButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-endForward")
+								.doPress()
+								.description("Seeing the Last Column Expand Button")
+								.execute();
+						},
+						iClickFirstColumnCollapseButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-beginBack")
+								.doPress()
+								.description("Seeing the Last Column Expand Button")
+								.execute();
+						}
 					},
-					iClickLastColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midBack")
-							.description("Clicking the Last Column Expand Button")
-							.doPress()
-							.execute();
-					},
-					iClickLastColumnCollapseButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-endForward")
-							.doPress()
-							.description("Seeing the Last Column Expand Button")
-							.execute();
-					},
-					iClickFirstColumnCollapseButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-beginBack")
-							.doPress()
-							.description("Seeing the Last Column Expand Button")
-							.execute();
-					}
-				},
-				assertions: {
-					iSeeFirstColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midForward")
-							.description("Seeing the First Column Expand Button")
-							.execute();
-					},
-					iDoNotSeeFirstColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasType("sap.m.Button")
-							.check(function(oButtons) {
-								var bFound = oButtons.some(function(oButton) {
-									return (
-										oButton.getId() === "application-" + sFlpAppName + "-component---appRootView--appContent-midForward"
-									);
-								});
-								return bFound === false;
-							}, true)
-							.description("Do not see the First Column Expand Button")
-							.execute();
-					},
-					iSeeFirstColumnCollapseButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-beginBack")
-							.description("Seeing the Last Column Expand Button")
-							.execute();
-					},
-					iClickLastColumnCollapseButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-endForward")
-							.description("Seeing the Last Column Expand Button")
-							.execute();
-					},
-					iSeeLastColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midBack")
-							.description("Seeing the Last Column Expand Button")
-							.execute();
-					},
-					iDoNotSeeLastColumnExpandButton: function() {
-						return OpaBuilder.create(this)
-							.hasType("sap.m.Button")
-							.check(function(oButtons) {
-								var bFound = oButtons.some(function(oButton) {
-									return (
-										oButton.getId() === "application-" + sFlpAppName + "-component---appRootView--appContent-midBack"
-									);
-								});
-								return bFound === false;
-							}, true)
-							.description("Do not see the Last Column Expand Button")
-							.execute();
-					},
-					iSeeNumberOfColumns: function(nCols) {
-						// Map to have the number of visible columns from the layout
-						// Hidden columns don't count, fullscreen is 1 column
-						var mLayoutToColumn = {
-							"OneColumn": 1,
-							"TwoColumnsMidExpanded": 2,
-							"TwoColumnsBeginExpanded": 2,
-							"MidColumnFullScreen": 1,
-							"ThreeColumnsMidExpanded": 3,
-							"ThreeColumnsEndExpanded": 3,
-							"ThreeColumnsMidExpandedEndHidden": 2,
-							"ThreeColumnsBeginExpandedEndHidden": 2,
-							"EndColumnFullScreen": 1
-						};
+					assertions: {
+						iSeeFirstColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midForward")
+								.description("Seeing the First Column Expand Button")
+								.execute();
+						},
+						iDoNotSeeFirstColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasType("sap.m.Button")
+								.check(function (oButtons) {
+									var bFound = oButtons.some(function (oButton) {
+										return (
+											oButton.getId() ===
+											"application-" + sFlpAppName + "-component---appRootView--appContent-midForward"
+										);
+									});
+									return bFound === false;
+								}, true)
+								.description("Do not see the First Column Expand Button")
+								.execute();
+						},
+						iSeeFirstColumnCollapseButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-beginBack")
+								.description("Seeing the Last Column Expand Button")
+								.execute();
+						},
+						iClickLastColumnCollapseButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-endForward")
+								.description("Seeing the Last Column Expand Button")
+								.execute();
+						},
+						iSeeLastColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent-midBack")
+								.description("Seeing the Last Column Expand Button")
+								.execute();
+						},
+						iDoNotSeeLastColumnExpandButton: function () {
+							return OpaBuilder.create(this)
+								.hasType("sap.m.Button")
+								.check(function (oButtons) {
+									var bFound = oButtons.some(function (oButton) {
+										return (
+											oButton.getId() ===
+											"application-" + sFlpAppName + "-component---appRootView--appContent-midBack"
+										);
+									});
+									return bFound === false;
+								}, true)
+								.description("Do not see the Last Column Expand Button")
+								.execute();
+						},
+						iSeeNumberOfColumns: function (nCols) {
+							// Map to have the number of visible columns from the layout
+							// Hidden columns don't count, fullscreen is 1 column
+							var mLayoutToColumn = {
+								"OneColumn": 1,
+								"TwoColumnsMidExpanded": 2,
+								"TwoColumnsBeginExpanded": 2,
+								"MidColumnFullScreen": 1,
+								"ThreeColumnsMidExpanded": 3,
+								"ThreeColumnsEndExpanded": 3,
+								"ThreeColumnsMidExpandedEndHidden": 2,
+								"ThreeColumnsBeginExpandedEndHidden": 2,
+								"EndColumnFullScreen": 1
+							};
 
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
-							.check(function(oFCL) {
-								return mLayoutToColumn[oFCL.getLayout()] === nCols;
-							}, true)
-							.description("FCL displays " + nCols + " columns")
-							.execute();
-					},
-					iSeeFullscreen: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
-							.check(function(oFCL) {
-								return oFCL.getLayout() === "MidColumnFullScreen" || oFCL.getLayout() === "EndColumnFullScreen";
-							}, true)
-							.description("FCL is in fullscreen")
-							.execute();
-					},
-					iGetDefaultLayoutOnFirstLevel: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
-							.hasProperties({ layout: "TwoColumnsMidExpanded" })
-							.description("Seeing default layout for FCL on first level: TwoColumnsMidExpanded ")
-							.execute();
-					},
-					iGetDefaultLayoutOnSecondLevel: function() {
-						return OpaBuilder.create(this)
-							.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
-							.hasProperties({ layout: "ThreeColumnsMidExpanded" })
-							.description("Seeing default layout for FCL on second level: ThreeColumnsMidExpanded ")
-							.execute();
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
+								.check(function (oFCL) {
+									return mLayoutToColumn[oFCL.getLayout()] === nCols;
+								}, true)
+								.description("FCL displays " + nCols + " columns")
+								.execute();
+						},
+						iSeeFullscreen: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
+								.check(function (oFCL) {
+									return oFCL.getLayout() === "MidColumnFullScreen" || oFCL.getLayout() === "EndColumnFullScreen";
+								}, true)
+								.description("FCL is in fullscreen")
+								.execute();
+						},
+						iSeeFCLLayout: function (sLayout) {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
+								.hasProperties({ layout: sLayout })
+								.description("Checking FCL layout: " + sLayout)
+								.execute();
+						},
+						iGetDefaultLayoutOnFirstLevel: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
+								.hasProperties({ layout: "TwoColumnsMidExpanded" })
+								.description("Seeing default layout for FCL on first level: TwoColumnsMidExpanded ")
+								.execute();
+						},
+						iGetDefaultLayoutOnSecondLevel: function () {
+							return OpaBuilder.create(this)
+								.hasId("application-" + sFlpAppName + "-component---appRootView--appContent")
+								.hasProperties({ layout: "ThreeColumnsMidExpanded" })
+								.description("Seeing default layout for FCL on second level: ThreeColumnsMidExpanded ")
+								.execute();
+						}
 					}
-				}
-			};
-		}
-	};
-});
+				};
+			}
+		};
+	}
+);