@openui5/sap.ui.core 1.112.2 → 1.114.0

package/src/sap/ui/test/gherkin/simpleGherkinParser.js

@@ -4,197 +4,199 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["jquery.sap.sjax"], function(jQuery) {
-  "use strict";
-
-  /**
-   * Parses Gherkin files to enable automated integration testing. This is a simple parser only meant to parse
-   * correctly formed Gherkin.
-   *
-   * @author Rodrigo Jordao
-   * @author Jonathan Benn
-   * @alias sap.ui.test.gherkin.simpleGherkinParser
-   * @namespace
-   * @static
-   * @since 1.40
-   * @private
-   */
-  var simpleGherkinParser = {
-
-    /**
-     * Parses correctly formed Gherkin. The parsed return object (a Gherkin feature!) looks like this:
-     *
-     * <pre>
-     * {
-     *   tags : ["@wip", "@integration"],
-     *   name : "Serve coffee",
-     *   background : {
-     *     name : "<background>",
-     *     steps : [
-     *       { text : "there are 1 coffees left in the machine", keyword : "Given" }
-     *     ]
-     *   },
-     *   scenarios : [
-     *     {
-     *       tags : ["@wip", "@integration", "@happy"],
-     *       name : "Buy last coffee",
-     *       steps : [
-     *         { text : "I have deposited 1$", keyword : "When" },
-     *         { text : "I press the coffee button", keyword : "And" },
-     *         { text : "I should be served a coffee", keyword : "Then" }
-     *       ],
-     *       examples : [
-     *         {
-     *           tags : ["@wip", "@integration", "@happy"],
-     *           name : "Coffee Types",
-     *           data : ["Java", "Capuccino"]
-     *         }
-     *       ]
-     *     }
-     *   ]
-     * }
-     * </pre>
-     *
-     * @param {string} sText - Gherkin text to parse
-     * @returns {object} parsed representation of the Gherkin feature
-     * @public
-     * @function
-     * @static
-     */
-    parse: function(sText) {
-
-      if (typeof sText !== "string" && !(sText instanceof String)) {
-        throw new Error("simpleGherkinParser.parse: parameter 'sText' must be a valid string");
-      }
-
-      var aLines =
-          sText.split("\n"). // get lines
-          map(function(s){return s.replace(/^\s*#.*/,"").trim();}); // remove comment lines and trim every line
-
-      var oFeature = null, oScenario = null, oStep = null, aTags = [], aFeatureTags = [], aScenarioTags = [];
-      for (var i = 0; i < aLines.length; ++i) {
-        var sLine = aLines[i];
-
-        var bTagsMatch = !!sLine.match(/^(?:@[^ @]+)(?:\s+@[^ @]+)*$/);
-        if (bTagsMatch) {
-          aTags = sLine.split(/\s+/);
-          continue;
-        }
-
-        var aFeatureMatch = sLine.match(/^Feature:(.+)$/);
-        if (aFeatureMatch) {
-          aFeatureTags = aTags;
-          oFeature = {tags: aFeatureTags, name: aFeatureMatch[1].trim(), scenarios: []};
-          aTags = [];
-          continue;
-        }
-
-        var bBackgroundMatch = !!sLine.match(/^Background:/);
-        if (bBackgroundMatch) {
-          oScenario = oFeature.background = {name: "<background>", steps: []};
-          continue;
-        }
-
-        var aScenarioOutlineMatch = sLine.match(/^Scenario Outline:(.+)/);
-        var aScenarioMatch = sLine.match(/^Scenario:(.+)/) || aScenarioOutlineMatch;
-        if (aScenarioMatch) {
-          aScenarioTags = aFeatureTags.concat(aTags);
-          oScenario = {tags: aScenarioTags, name: aScenarioMatch[1].trim(), steps: []};
-          if (aScenarioOutlineMatch) {
-            oScenario.examples = [];
-          }
-          oFeature.scenarios.push(oScenario);
-          aTags = [];
-          continue;
-        }
-
-        var aStepMatch = sLine.match(/^(Given|When|Then|And|But|\*)\s+(.+)$/);
-        if (aStepMatch) {
-          oStep = {text: aStepMatch[2].trim(), keyword: aStepMatch[1].trim()};
-          oScenario.steps.push(oStep);
-          continue;
-        }
-
-        var aExamplesMatch = sLine.match(/^Examples:(.+)?/);
-        if (aExamplesMatch) {
-          oScenario.examples.push({
-            tags: aScenarioTags.concat(aTags),
-            name: (aExamplesMatch[1]) ? aExamplesMatch[1].trim() : "",
-            data: []
-          });
-          aTags = [];
-          continue;
-        }
-
-        // Parse a data table
-        var aRowMatch = sLine.match(/^\|(.*)\|$/);
-        if (aRowMatch) {
-          var vData = aRowMatch[1].split("|").map(function(s){return s.trim();});
-
-          // if there is only one column in the row
-          if (vData.length === 1) {
-            // then don't create a matrix for nothing
-            vData = vData[0];
-          }
-
-          if (oScenario.examples) {
-            oScenario.examples[oScenario.examples.length - 1].data.push(vData);
-            continue;
-          }
-          oStep.data = oStep.data || [];
-          oStep.data.push(vData);
-        }
-
-      }
-
-      // Convert any one-row tables into 1D arrays
-      oFeature.scenarios.forEach(function(oScenario) {
-        oScenario.steps.forEach(function(oStep) {
-          // if the data table has only one row
-          if (Array.isArray(oStep.data) && (oStep.data.length === 1) && Array.isArray(oStep.data[0])) {
-            // then convert into a 1D array
-            oStep.data = oStep.data[0];
-          }
-        });
-      });
-
-      return oFeature;
-    },
-
-    /**
-     * Convenience function that loads the feature file at the given path and executes {@link #parse} on it, returning
-     * the result.
-     *
-     * @param {string} sPath - the path to the feature file to load, as an SAPUI5 module path. The ".feature" extension is
-     *                         assumed and should not be included.
-     * @returns {object} the parsed Gherkin feature object
-     * @see {@link #parse}
-     * @see {@link jQuery.sap.registerModulePath}
-     * @public
-     * @function
-     * @static
-     */
-    parseFile: function(sPath) {
-
-      if (typeof sPath !== "string" && !(sPath instanceof String)) {
-        throw new Error("simpleGherkinParser.parseFile: parameter 'sPath' must be a valid string");
-      }
-
-      // Interpret the path as a standard SAPUI5 module path
-      sPath = sap.ui.require.toUrl((sPath).replace(/\./g, "/")) + ".feature";
-
-      var oResult = jQuery.sap.sjax({
-        url: sPath,
-        dataType: "text"
-      });
-
-      if (!oResult.success) {
-        throw new Error("simpleGherkinParser.parseFile: error loading URL: " + sPath);
-      }
-
-      return this.parse(oResult.data);
-    }
-  };
-
-  return simpleGherkinParser;
+sap.ui.define([
+	"jquery.sap.sjax"
+], function(jQuery) {
+	"use strict";
+
+	/**
+	 * Parses Gherkin files to enable automated integration testing. This is a simple parser only meant to parse
+	 * correctly formed Gherkin.
+	 *
+	 * @author Rodrigo Jordao
+	 * @author Jonathan Benn
+	 * @alias sap.ui.test.gherkin.simpleGherkinParser
+	 * @namespace
+	 * @static
+	 * @since 1.40
+	 * @private
+	 */
+	var simpleGherkinParser = {
+
+		/**
+		 * Parses correctly formed Gherkin. The parsed return object (a Gherkin feature!) looks like this:
+		 *
+		 * <pre>
+		 * {
+		 *   tags : ["@wip", "@integration"],
+		 *   name : "Serve coffee",
+		 *   background : {
+		 *     name : "<background>",
+		 *     steps : [
+		 *       { text : "there are 1 coffees left in the machine", keyword : "Given" }
+		 *     ]
+		 *   },
+		 *   scenarios : [
+		 *     {
+		 *       tags : ["@wip", "@integration", "@happy"],
+		 *       name : "Buy last coffee",
+		 *       steps : [
+		 *         { text : "I have deposited 1$", keyword : "When" },
+		 *         { text : "I press the coffee button", keyword : "And" },
+		 *         { text : "I should be served a coffee", keyword : "Then" }
+		 *       ],
+		 *       examples : [
+		 *         {
+		 *           tags : ["@wip", "@integration", "@happy"],
+		 *           name : "Coffee Types",
+		 *           data : ["Java", "Capuccino"]
+		 *         }
+		 *       ]
+		 *     }
+		 *   ]
+		 * }
+		 * </pre>
+		 *
+		 * @param {string} sText - Gherkin text to parse
+		 * @returns {object} parsed representation of the Gherkin feature
+		 * @public
+		 * @function
+		 * @static
+		 */
+		parse: function(sText) {
+
+			if (typeof sText !== "string" && !(sText instanceof String)) {
+				throw new Error("simpleGherkinParser.parse: parameter 'sText' must be a valid string");
+			}
+
+			var aLines =
+					sText.split("\n"). // get lines
+					map(function(s){return s.replace(/^\s*#.*/,"").trim();}); // remove comment lines and trim every line
+
+			var oFeature = null, oScenario = null, oStep = null, aTags = [], aFeatureTags = [], aScenarioTags = [];
+			for (var i = 0; i < aLines.length; ++i) {
+				var sLine = aLines[i];
+
+				var bTagsMatch = !!sLine.match(/^(?:@[^ @]+)(?:\s+@[^ @]+)*$/);
+				if (bTagsMatch) {
+					aTags = sLine.split(/\s+/);
+					continue;
+				}
+
+				var aFeatureMatch = sLine.match(/^Feature:(.+)$/);
+				if (aFeatureMatch) {
+					aFeatureTags = aTags;
+					oFeature = {tags: aFeatureTags, name: aFeatureMatch[1].trim(), scenarios: []};
+					aTags = [];
+					continue;
+				}
+
+				var bBackgroundMatch = !!sLine.match(/^Background:/);
+				if (bBackgroundMatch) {
+					oScenario = oFeature.background = {name: "<background>", steps: []};
+					continue;
+				}
+
+				var aScenarioOutlineMatch = sLine.match(/^Scenario Outline:(.+)/);
+				var aScenarioMatch = sLine.match(/^Scenario:(.+)/) || aScenarioOutlineMatch;
+				if (aScenarioMatch) {
+					aScenarioTags = aFeatureTags.concat(aTags);
+					oScenario = {tags: aScenarioTags, name: aScenarioMatch[1].trim(), steps: []};
+					if (aScenarioOutlineMatch) {
+						oScenario.examples = [];
+					}
+					oFeature.scenarios.push(oScenario);
+					aTags = [];
+					continue;
+				}
+
+				var aStepMatch = sLine.match(/^(Given|When|Then|And|But|\*)\s+(.+)$/);
+				if (aStepMatch) {
+					oStep = {text: aStepMatch[2].trim(), keyword: aStepMatch[1].trim()};
+					oScenario.steps.push(oStep);
+					continue;
+				}
+
+				var aExamplesMatch = sLine.match(/^Examples:(.+)?/);
+				if (aExamplesMatch) {
+					oScenario.examples.push({
+						tags: aScenarioTags.concat(aTags),
+						name: (aExamplesMatch[1]) ? aExamplesMatch[1].trim() : "",
+						data: []
+					});
+					aTags = [];
+					continue;
+				}
+
+				// Parse a data table
+				var aRowMatch = sLine.match(/^\|(.*)\|$/);
+				if (aRowMatch) {
+					var vData = aRowMatch[1].split("|").map(function(s){return s.trim();});
+
+					// if there is only one column in the row
+					if (vData.length === 1) {
+						// then don't create a matrix for nothing
+						vData = vData[0];
+					}
+
+					if (oScenario.examples) {
+						oScenario.examples[oScenario.examples.length - 1].data.push(vData);
+						continue;
+					}
+					oStep.data = oStep.data || [];
+					oStep.data.push(vData);
+				}
+
+			}
+
+			// Convert any one-row tables into 1D arrays
+			oFeature.scenarios.forEach(function(oScenario) {
+				oScenario.steps.forEach(function(oStep) {
+					// if the data table has only one row
+					if (Array.isArray(oStep.data) && (oStep.data.length === 1) && Array.isArray(oStep.data[0])) {
+						// then convert into a 1D array
+						oStep.data = oStep.data[0];
+					}
+				});
+			});
+
+			return oFeature;
+		},
+
+		/**
+		 * Convenience function that loads the feature file at the given path and executes {@link #parse} on it, returning
+		 * the result.
+		 *
+		 * @param {string} sPath - the path to the feature file to load, as an SAPUI5 module path. The ".feature" extension is
+		 *                         assumed and should not be included.
+		 * @returns {object} the parsed Gherkin feature object
+		 * @see {@link #parse}
+		 * @see {@link sap.ui.loader.config}
+		 * @public
+		 * @function
+		 * @static
+		 */
+		parseFile: function(sPath) {
+
+			if (typeof sPath !== "string" && !(sPath instanceof String)) {
+				throw new Error("simpleGherkinParser.parseFile: parameter 'sPath' must be a valid string");
+			}
+
+			// Interpret the path as a standard SAPUI5 module path
+			sPath = sap.ui.require.toUrl((sPath).replace(/\./g, "/")) + ".feature";
+
+			var oResult = jQuery.sap.sjax({
+				url: sPath,
+				dataType: "text"
+			});
+
+			if (!oResult.success) {
+				throw new Error("simpleGherkinParser.parseFile: error loading URL: " + sPath);
+			}
+
+			return this.parse(oResult.data);
+		}
+	};
+
+	return simpleGherkinParser;
 }, /* bExport= */ true);

package/src/sap/ui/test/launchers/componentLauncher.js

@@ -4,16 +4,15 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'sap/ui/core/ComponentContainer', // sap.ui.component
 	"sap/base/util/uid",
-	"sap/ui/thirdparty/jquery",
-	'sap/ui/core/Component'
-], function(ComponentContainer, uid, jQueryDOM, Component) {
+	"sap/ui/core/Component",
+	"sap/ui/core/ComponentContainer"
+], function(uid, Component, ComponentContainer) {
 	"use strict";
 
 	var _loadingStarted = false,
 		_oComponentContainer = null,
-		_$Component = null;
+		_oComponentDOM = null;
 
 	/**
 	 * By using start launcher will instantiate and place the component into html.
@@ -39,8 +38,11 @@ sap.ui.define([
 				var sId = uid();
 
 				// create and add div to html
-				_$Component = jQueryDOM('<div id="' + sId + '" class="sapUiOpaComponent"></div>');
-				jQueryDOM("body").append(_$Component).addClass("sapUiOpaBodyComponent");
+				_oComponentDOM = document.createElement("div");
+				_oComponentDOM.id = sId;
+				_oComponentDOM.className = "sapUiOpaComponent";
+				document.body.appendChild(_oComponentDOM);
+				document.body.classList.add("sapUiOpaBodyComponent");
 
 				// create and place the component into html
 				_oComponentContainer = new ComponentContainer({
@@ -64,9 +66,9 @@ sap.ui.define([
 				throw new Error("sap.ui.test.launchers.componentLauncher: Teardown was called before start. No component was started.");
 			}
 			_oComponentContainer.destroy();
-			_$Component.remove();
+			_oComponentDOM.remove();
 			_loadingStarted = false;
-			jQueryDOM("body").removeClass("sapUiOpaBodyComponent");
+			document.body.classList.remove("sapUiOpaBodyComponent");
 		}
 	};
 

package/src/sap/ui/test/launchers/iFrameLauncher.js

@@ -4,13 +4,12 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-		'sap/ui/thirdparty/URI',
+		"sap/base/Log",
+		"sap/base/util/ObjectPath",
 		'sap/ui/Device',
 		'sap/ui/test/_LogCollector',
-		"sap/base/Log",
-		"sap/ui/thirdparty/jquery",
-		'sap/base/util/ObjectPath'
-	], function (URI, Device, _LogCollector, Log, jQueryDOM, ObjectPath) {
+		"sap/ui/thirdparty/jquery"
+	], function (Log, ObjectPath, Device, _LogCollector, jQuery) {
 	"use strict";
 
 	/*global CollectGarbage */
@@ -136,10 +135,10 @@ sap.ui.define([
 		}
 	}
 
-	function afterModulesLoaded () {
+	function afterModulesLoaded (oFrameLog) {
 		// forward OPA log messages from the inner iframe to the Log listener of the outer frame
 		// the listener should already be created and started by OPA
-		oFrameJQuery.sap.log.addLogListener(_LogCollector.getInstance()._oListener);
+		oFrameLog.addLogListener(_LogCollector.getInstance()._oListener);
 
 		bUi5Loaded = true;
 	}
@@ -265,6 +264,7 @@ sap.ui.define([
 
 	function loadFrameModules() {
 		oFrameWindow.sap.ui.require([
+			"sap/base/Log",
 			"sap/ui/test/OpaPlugin",
 			"sap/ui/test/autowaiter/_autoWaiter",
 			"sap/ui/test/_OpaLogger",
@@ -273,6 +273,7 @@ sap.ui.define([
 			"sap/ui/core/routing/History",
 			"sap/ui/core/routing/HashChanger"
 		], function (
+			Log,
 			OpaPlugin,
 			_autoWaiter,
 			_OpaLogger,
@@ -289,25 +290,38 @@ sap.ui.define([
 				modifyIFrameNavigation(hasher, History, HashChanger);
 			}
 			FrameHashChanger = HashChanger;
-			afterModulesLoaded();
+			afterModulesLoaded(Log);
 		});
 	}
 
+	function getAbsolutePath(sResource) {
+		var sResourceURL = sap.ui.require.toUrl(sResource);
+		var oURL = new URL(sResourceURL, document.baseURI);
+		oURL.search = oURL.hash = "";
+		return oURL.href;
+	}
+
 	function registerAbsoluteResourcePathInIframe(sResource) {
-		var sOpaLocation = sap.ui.require.toUrl(sResource);
-		var sAbsoluteOpaPath = new URI(sOpaLocation).absoluteTo(document.baseURI).search("").toString();
-		var fnConfig = ObjectPath.get("sap.ui._ui5loader.config", oFrameWindow) || ObjectPath.get("sap.ui.loader.config", oFrameWindow);
+		var sAbsoluteOpaPath = getAbsolutePath(sResource);
+		var fnConfig = ObjectPath.get("sap.ui.loader.config", oFrameWindow);
 		if (fnConfig) {
 			var paths = {};
 			paths[sResource] = sAbsoluteOpaPath;
 			fnConfig({
 				paths: paths
 			});
-		} else if (oFrameJQuery && oFrameJQuery.sap && oFrameJQuery.sap.registerResourcePath) {
+			return;
+		}
+
+		/**
+		 * @deprecated since 1.58 as jQuery.sap.registerResourcePath has been deprecated.
+		 */
+		if (oFrameJQuery && oFrameJQuery.sap && oFrameJQuery.sap.registerResourcePath) {
 			oFrameJQuery.sap.registerResourcePath(sResource, sAbsoluteOpaPath);
-		} else {
-			throw new Error("iFrameLauncher.js: UI5 module system not found.");
+			return;
 		}
+
+		throw new Error("iFrameLauncher.js: UI5 module system not found.");
 	}
 
 	function destroyFrame () {
@@ -315,7 +329,7 @@ sap.ui.define([
 			throw new Error("sap.ui.test.launchers.iFrameLauncher: Teardown was called before launch. No iFrame was loaded.");
 		}
 		// Workaround for IE - there are errors even after removing the frame so setting the onerror to noop again seems to be fine
-		oFrameWindow.onerror = jQueryDOM.noop;
+		oFrameWindow.onerror = jQuery.noop;
 		for (var i = 0; i < $Frame.length; i++) {
 			$Frame[0].src = "about:blank";
 			$Frame[0].contentWindow.document.write('');
@@ -349,19 +363,19 @@ sap.ui.define([
 			}
 
 			//invalidate the cache
-			$Frame = jQueryDOM("#" + options.frameId);
+			$Frame = jQuery("#" + options.frameId);
 
 			if ($Frame.length) {
-				$FrameContainer = jQueryDOM(".opaFrameContainer");
+				$FrameContainer = jQuery(".opaFrameContainer");
 			} else {
 				if (!options.source) {
 					Log.error("No source was given to launch the IFrame", this);
 				}
 				//invalidate other caches
-				$FrameContainer = jQueryDOM("<div class='opaFrameContainer'></div>");
-				$Frame = jQueryDOM('<IFrame id="' + options.frameId + '" class="opaFrame" src="' + options.source + '"></IFrame>');
+				$FrameContainer = jQuery("<div class='opaFrameContainer'></div>");
+				$Frame = jQuery('<IFrame id="' + options.frameId + '" class="opaFrame" src="' + options.source + '"></IFrame>');
 				$FrameContainer.append($Frame);
-				jQueryDOM("body").append($FrameContainer);
+				jQuery("body").append($FrameContainer);
 				setFrameSize(options.width, options.height);
 			}
 

package/src/sap/ui/test/matchers/Descendant.js

@@ -42,7 +42,7 @@ sap.ui.define([
 			var oDescendantControl;
 			if (typeof vDescendantControl === "string") {
 				var oAppWindow = oVisitor._getApplicationWindow();
-				oDescendantControl = oAppWindow.sap.ui.getCore().byId(vDescendantControl);
+				oDescendantControl = oAppWindow.sap.ui.require("sap/ui/core/Core").byId(vDescendantControl);
 			} else {
 				oDescendantControl = vDescendantControl;
 			}

package/src/sap/ui/test/matchers/Interactable.js

@@ -71,7 +71,7 @@ sap.ui.define([
 			}
 
 			var bInAreaForRerendering = oVisitor.isMatching(oControl, function (oControl) {
-				return oControl.getMetadata().getName() === "sap.ui.core.UIArea" && oControl.bNeedsRerendering;
+				return oControl.isA("sap.ui.core.UIArea") && oControl.bNeedsRerendering;
 			});
 
 			if (bInAreaForRerendering) {
@@ -80,7 +80,7 @@ sap.ui.define([
 			}
 
 			var oAppWindowJQuery = this._getApplicationWindow().jQuery;
-			var oStaticArea = this._getApplicationWindow().sap.ui.getCore().getStaticAreaRef();
+			var oStaticArea = this._getApplicationWindow().sap.ui.require("sap/ui/core/Core").getStaticAreaRef();
 			var bControlIsInStaticArea = oAppWindowJQuery.contains(oStaticArea, oControl.getDomRef());
 			var bOpenStaticBlockingLayer = oAppWindowJQuery("#sap-ui-blocklayer-popup").is(":visible");
 

package/src/sap/ui/test/matchers/LabelFor.js

@@ -154,8 +154,8 @@ sap.ui.define([
 				return false;
 			}
 
-			var fnLabelType = this._getApplicationWindow().jQuery.sap.getObject("sap.m.Label");
-			var aLabelsInPage = this._getApplicationWindow().sap.ui.core.Element.registry.filter(function (oElement) {
+			var fnLabelType = this._getApplicationWindow().sap.ui.require("sap/m/Label");
+			var aLabelsInPage = this._getApplicationWindow().sap.ui.require("sap/ui/core/Element").registry.filter(function (oElement) {
 				return oElement instanceof fnLabelType;
 			});