@sapui5/sap.fe.test 1.102.3 → 1.105.0

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

@@ -1,23 +1,34 @@
-import { AnyAnnotation, ConverterOutput, EntitySet, Property } from "@sap-ux/annotation-converter";
+import type { AnyAnnotation, ConvertedMetadata, EntitySet, Property } from "@sap-ux/vocabularies-types";
 import compiler from "@sap/cds-compiler";
 import * as fs from "fs";
 import * as path from "path";
-import { format, RequiredOptions } from "prettier";
+import type { RequiredOptions } from "prettier";
+import { format } from "prettier";
 import Log from "sap/base/Log";
 import merge from "sap/base/util/merge";
+import AppComponent from "sap/fe/core/AppComponent";
 import { registerBuildingBlock } from "sap/fe/core/buildingBlocks/BuildingBlockRuntime";
 import ConverterContext from "sap/fe/core/converters/ConverterContext";
-import { IssueCategory, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
-import { ListReportManifestSettings, ObjectPageManifestSettings } from "sap/fe/core/converters/ManifestSettings";
-import { IDiagnostics } from "sap/fe/core/converters/TemplateConverter";
+import type { IssueCategory, IssueSeverity } from "sap/fe/core/converters/helpers/IssueManager";
+import type { ListReportManifestSettings, ObjectPageManifestSettings } from "sap/fe/core/converters/ManifestSettings";
+import type { IDiagnostics } from "sap/fe/core/converters/TemplateConverter";
 import SideEffectsFactory from "sap/fe/core/services/SideEffectsServiceFactory";
 import TemplateModel from "sap/fe/core/TemplateModel";
-import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
+import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import BindingParser from "sap/ui/base/BindingParser";
+import ManagedObject from "sap/ui/base/ManagedObject";
+import Component from "sap/ui/core/Component";
+import Control from "sap/ui/core/Control";
 import InvisibleText from "sap/ui/core/InvisibleText";
+import Serializer from "sap/ui/core/util/serializer/Serializer";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
-import Context from "sap/ui/model/Context";
+import FlexState from "sap/ui/fl/apply/_internal/flexState/FlexState";
+import XmlPreprocessor from "sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor";
+import AppStorage from "sap/ui/fl/initial/_internal/Storage";
+import Utils from "sap/ui/fl/Utils";
+import type Context from "sap/ui/model/Context";
 import JSONModel from "sap/ui/model/json/JSONModel";
+import MetaModel from "sap/ui/model/MetaModel";
 import _MetadataRequestor from "sap/ui/model/odata/v4/lib/_MetadataRequestor";
 import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import xpath from "xpath";
@@ -90,7 +101,7 @@ export const formatBuildingBlockXML = function (xmlString: string | string[]) {
 		xmlString = xmlString.join("");
 	}
 	let xmlFormatted = formatXML(xmlString);
-	xmlFormatted = xmlFormatted.replace(/uid--id-[0-9]{13}-[0-9]/g, "uid--id");
+	xmlFormatted = xmlFormatted.replace(/uid--id-[0-9]{13}-[0-9]{1,2}/g, "uid--id");
 	return xmlFormatted;
 };
 
@@ -115,7 +126,8 @@ export const formatXML = function (xmlString: string) {
 /**
  * Compile a CDS file into an EDMX file.
  *
- * @param cdsUrl The path to the file containing the CDS definition. This file must declare the namespace sap.fe.test and a service JestService
+ * @param cdsUrl The path to the file containing the CDS definition. This file must declare the namespace
+ * sap.fe.test and a service JestService
  * @param options Options for creating the EDMX output
  * @param edmxFileName Allows you to override the name of the compiled EDMX metadata file
  * @returns The path of the generated EDMX
@@ -199,14 +211,14 @@ export const getFakeDiagnostics = function (): IDiagnostics {
 		},
 		checkIfIssueExists(issueCategory: IssueCategory, issueSeverity: IssueSeverity, details: string): boolean {
 			return issues.find((issue) => {
-				issue.issueCategory === issueCategory && issue.issueSeverity === issueSeverity && issue.details === details;
+				return issue.issueCategory === issueCategory && issue.issueSeverity === issueSeverity && issue.details === details;
 			});
 		}
 	};
 };
 
 export const getConverterContextForTest = function (
-	convertedTypes: ConverterOutput,
+	convertedTypes: ConvertedMetadata,
 	manifestSettings: ListReportManifestSettings | ObjectPageManifestSettings
 ) {
 	const entitySet = convertedTypes.entitySets.find((es) => es.name === manifestSettings.entitySet);
@@ -227,7 +239,7 @@ export const getMetaModel = async function (sMetadataUrl: string) {
 
 export const getDataModelObjectPathForProperty = function (
 	entitySet: EntitySet,
-	convertedTypes: ConverterOutput,
+	convertedTypes: ConvertedMetadata,
 	property?: Property | EntitySet | AnyAnnotation
 ): DataModelObjectPath {
 	const targetPath: DataModelObjectPath = {
@@ -283,11 +295,60 @@ export function evaluateBindingWithModel(
 	return text.getText();
 }
 
+const TESTVIEWID = "testViewId";
+
+export const applyFlexChanges = async function (
+	aVariantDependentControlChanges: any[],
+	oMetaModel: MetaModel,
+	resultXML: any,
+	createChangesObject: Function
+) {
+	const changes = createChangesObject(TESTVIEWID, aVariantDependentControlChanges);
+	const appId = "someComponent";
+	const oManifest = {
+		"sap.app": {
+			id: appId,
+			type: "application",
+			crossNavigation: {
+				outbounds: []
+			}
+		}
+	};
+	const oAppComponent: AppComponent = {
+		getDiagnostics: jest.fn().mockReturnValue(getFakeDiagnostics()),
+		getModel: jest.fn().mockReturnValue({
+			getMetaModel: jest.fn().mockReturnValue(oMetaModel)
+		}),
+		getComponentData: jest.fn().mockReturnValue({}),
+		getManifestObject: jest.fn().mockReturnValue({
+			getEntry: function (name: string) {
+				return (oManifest as any)[name];
+			}
+		})
+	} as unknown as AppComponent;
+	//fake changes
+	jest.spyOn(AppStorage, "loadFlexData").mockReturnValue(Promise.resolve(changes));
+	jest.spyOn(Component, "get").mockReturnValue(oAppComponent);
+	jest.spyOn(Utils, "getAppComponentForControl").mockReturnValue(oAppComponent);
+	await FlexState.initialize({
+		componentId: appId
+	});
+	resultXML = await XmlPreprocessor.process(resultXML, { name: "Test Fragment", componentId: appId, id: TESTVIEWID });
+	return resultXML;
+};
+
+export const getChangesFromXML = (xml: any) =>
+	[...xml.querySelectorAll("*")]
+		.flatMap((e) => [...e.attributes].map((a) => a.name))
+		.filter((attr) => attr.includes("sap.ui.fl.appliedChanges"));
+
 export const getTemplatingResult = async function (
 	xmlInput: string,
 	sMetadataUrl: string,
 	mBindingContexts: { [x: string]: any; entitySet?: string },
-	mModels: { [x: string]: any }
+	mModels: { [x: string]: any },
+	aVariantDependentControlChanges?: any[],
+	createChangesObject?: Function
 ) {
 	const templatedXml = `<root>${xmlInput}</root>`;
 	const parser = new window.DOMParser();
@@ -330,24 +391,46 @@ export const getTemplatingResult = async function (
 		oPreprocessorSettings.bindingContexts["this"] = oPreprocessorSettings.models["this"].createBindingContext("/");
 	}
 
-	return XMLPreprocessor.process(xmlDoc.firstElementChild!, { name: "Test Fragment" }, oPreprocessorSettings);
+	let resultXML = await XMLPreprocessor.process(xmlDoc.firstElementChild!, { name: "Test Fragment" }, oPreprocessorSettings);
+
+	if (aVariantDependentControlChanges && createChangesObject) {
+		// prefix Ids
+		[...resultXML.querySelectorAll("[id]")].forEach((node) => {
+			node.id = `${TESTVIEWID}--${node.id}`;
+		});
+		// apply flex changes
+		resultXML = await applyFlexChanges(aVariantDependentControlChanges, oMetaModel, resultXML, createChangesObject);
+		//Assert that all changes have been applied
+		const changesApplied = getChangesFromXML(resultXML);
+		expect(changesApplied.length).toBe(aVariantDependentControlChanges.length);
+	}
+	return resultXML;
 };
 
 export const getTemplatedXML = async function (
 	xmlInput: string,
 	sMetadataUrl: string,
 	mBindingContexts: { [x: string]: any; entitySet?: string },
-	mModels: { [x: string]: any }
+	mModels: { [x: string]: any },
+	aVariantDependentControlChanges?: any[],
+	createChangesObject?: Function
 ) {
-	const templatedXML = await getTemplatingResult(xmlInput, sMetadataUrl, mBindingContexts, mModels);
+	const templatedXML = await getTemplatingResult(
+		xmlInput,
+		sMetadataUrl,
+		mBindingContexts,
+		mModels,
+		aVariantDependentControlChanges,
+		createChangesObject
+	);
 	return serializeXML(templatedXML);
 };
 
 /**
  * Process the requested XML fragment with the provided data.
  *
- * @param {string} name Fully qualified name of the fragment to be tested.
- * @param {object} testData Test data consisting
+ * @param name Fully qualified name of the fragment to be tested.
+ * @param testData Test data consisting
  * @returns Templated fragment as string
  */
 export async function processFragment(name: string, testData: { [model: string]: object }): Promise<string> {
@@ -385,3 +468,75 @@ export async function processFragment(name: string, testData: { [model: string]:
 		filter: (node: any) => node.type !== "Comment"
 	});
 }
+
+export function serializeControl(controlToSerialize: Control | Control[]) {
+	let tabCount = 0;
+	function getTab(toAdd: number = 0) {
+		let tab = "";
+		for (let i = 0; i < tabCount + toAdd; i++) {
+			tab += "\t";
+		}
+		return tab;
+	}
+	const serializeDelegate = {
+		start: function (control: Control, sAggregationName: string) {
+			let controlDetail = "";
+			if (sAggregationName) {
+				const indexInParent = (control.getParent()!.getAggregation(sAggregationName) as ManagedObject[]).indexOf(control);
+				if (indexInParent > 0) {
+					controlDetail += `,\n${getTab()}`;
+				}
+			}
+			controlDetail += `${control.getMetadata().getName()}(`;
+			return controlDetail;
+		},
+		end: function () {
+			return "})";
+		},
+		middle: function (control: any) {
+			let data = `{id: ${control.getId()}`;
+			for (const oControlKey in control.mProperties) {
+				if (control.mProperties.hasOwnProperty(oControlKey)) {
+					data += `,\n${getTab()} ${oControlKey}: ${control.mProperties[oControlKey]}`;
+				} else if (control.mBindingInfos.hasOwnProperty(oControlKey)) {
+					const bindingDetail = control.mBindingInfos[oControlKey];
+					data += `,\n${getTab()} ${oControlKey}: formatter(${bindingDetail.parts.map(
+						(bindingInfo: any) => `\n${getTab(1)}${bindingInfo.model ? bindingInfo.model : ""}>${bindingInfo.path}`
+					)})`;
+				}
+			}
+			for (const oControlKey in control.mAssociations) {
+				if (control.mAssociations.hasOwnProperty(oControlKey)) {
+					data += `,\n${getTab()} ${oControlKey}: ${control.mAssociations[oControlKey][0]}`;
+				}
+			}
+			data += ``;
+			return data;
+		},
+		startAggregation: function (control: Control, sName: string) {
+			let out = `,\n${getTab()}${sName}`;
+			tabCount++;
+			out += `=[\n${getTab()}`;
+			return out;
+		},
+		endAggregation: function () {
+			tabCount--;
+			return `\n${getTab()}]`;
+		}
+	};
+	if (Array.isArray(controlToSerialize)) {
+		return controlToSerialize.map((controlToRender: Control) => {
+			return new Serializer(controlToRender, serializeDelegate).serialize();
+		});
+	} else {
+		return new Serializer(controlToSerialize, serializeDelegate).serialize();
+	}
+}
+
+export function createAwaiter() {
+	let fnResolve!: Function;
+	const myPromise = new Promise((resolve) => {
+		fnResolve = resolve;
+	});
+	return { promise: myPromise, resolve: fnResolve };
+}

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

@@ -17,7 +17,7 @@ sap.ui.define(
 		"sap/base/Log",
 		"sap/base/util/ObjectPath"
 	],
-	function(BaseObject, Opa5, Utils, BaseArrangements, BaseActions, BaseAssertions, Shell, opaQunit, Log, ObjectPath) {
+	function (BaseObject, Opa5, Utils, BaseArrangements, BaseActions, BaseAssertions, Shell, opaQunit, Log, ObjectPath) {
 		"use strict";
 
 		/**
@@ -34,19 +34,17 @@ sap.ui.define(
 		 * Constructs a new JourneyRunner instance.
 		 *
 		 * @class A JourneyRunner for executing integration tests with given settings.
-		 *
 		 * @param {object} [mSettings] The settings object
 		 * @param {object} [mSettings.pages] The available Opa pages
 		 * @param {object} [mSettings.opaConfig] The Opa configuration applied via {@link sap.ui.test.Opa5#sap.ui.test.Opa5.extendConfig}
 		 * @param {string} [mSettings.launchUrl] The URL to the launching page (usually a FLP.html)
 		 * @param {object} [mSettings.launchParameters] The URL launch parameters
 		 * @param {boolean} [mSettings.async] If false (default), only one JourneyRunner is executed at a time
-		 *
 		 * @alias sap.fe.test.JourneyRunner
 		 * @public
 		 */
 		var JourneyRunner = BaseObject.extend("sap.fe.test.JourneyRunner", {
-			constructor: function(mSettings) {
+			constructor: function (mSettings) {
 				BaseObject.apply(this);
 				// store a copy of the settings object
 				this._mInstanceSettings = Utils.mergeObjects(
@@ -72,15 +70,14 @@ sap.ui.define(
 			 * @param {boolean} [mSettings.async] If false (default), only one JourneyRunner is executed at a time
 			 * @param {Function[] | string[]} vJourneys The journeys to be executed. If a journey is represented as a string, it will be interpreted
 			 * as a module path to the file that should be loaded. Else it is expected to be a function.
-			 * Alternatively, instead of being wrapped in an array, the journeys can also be given as separate parameters: 
+			 * Alternatively, instead of being wrapped in an array, the journeys can also be given as separate parameters:
 			 * <pre>.run(mSettings, Journey1, Journey2, ...)</pre>
 			 * @returns {object} A <code>Promise</code> that is resolved after all tests have been executed
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#run
 			 * @public
 			 */
-			run: function(mSettings, vJourneys) {
+			run: function (mSettings, vJourneys) {
 				var iJourneyParameterIndex = 1;
 				if (!Utils.isOfType(mSettings, Object)) {
 					iJourneyParameterIndex = 0;
@@ -90,7 +87,8 @@ sap.ui.define(
 				}
 
 				var aJourneys = Array.prototype.slice.call(arguments, iJourneyParameterIndex); // journey-related parameter(s) as array
-				if (aJourneys && aJourneys.length && Array.isArray(aJourneys[0])) { // if the first journey parameter is an array...
+				if (aJourneys && aJourneys.length && Array.isArray(aJourneys[0])) {
+					// if the first journey parameter is an array...
 					aJourneys = aJourneys[0]; // ...then unwrap it, to use this array itself
 				}
 				var bAsync = mSettings.async,
@@ -106,7 +104,7 @@ sap.ui.define(
 					.then(this._preRunActions.bind(this, mSettings))
 					.then(this._runActions.bind(this, aJourneys))
 					.then(this._postRunActions.bind(this, mSettings))
-					.catch(function(oError) {
+					.catch(function (oError) {
 						Log.error("JourneyRunner.run failed", oError);
 					});
 
@@ -127,12 +125,11 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base actions
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseActions
 			 * @protected
 			 */
-			getBaseActions: function(mSettings) {
+			getBaseActions: function (mSettings) {
 				return new BaseActions();
 			},
 
@@ -146,12 +143,11 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base assertions
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseAssertions
 			 * @protected
 			 */
-			getBaseAssertions: function(mSettings) {
+			getBaseAssertions: function (mSettings) {
 				return new BaseAssertions();
 			},
 
@@ -165,83 +161,83 @@ sap.ui.define(
 			 *
 			 * @param {object} mSettings The settings object of the runner instance
 			 * @returns {sap.ui.test.Opa} An Opa instance for the base arrangements
-			 *
 			 * @function
 			 * @name sap.fe.test.JourneyRunner#getBaseArrangements
 			 * @protected
 			 */
-			getBaseArrangements: function(mSettings) {
+			getBaseArrangements: function (mSettings) {
 				return new BaseArrangements(mSettings);
 			},
 
-			_preRunActions: function(mSettings) {
+			_preRunActions: function (mSettings) {
 				Opa5.extendConfig(this._getOpaConfig(mSettings));
 				Opa5.createPageObjects(mSettings.pages);
 			},
 
-			_runActions: function(aJourneys) {
+			_runActions: function (aJourneys) {
 				var that = this,
 					pPromiseChain = Promise.resolve(),
 					fnRunnerResolve,
-					pRunnerEnds = new Promise(function(resolve) {
+					pRunnerEnds = new Promise(function (resolve) {
 						fnRunnerResolve = resolve;
 					});
 
 				Log.info("JourneyRunner started");
 
-				QUnit.done(function() {
+				QUnit.done(function () {
 					Log.info("JourneyRunner ended");
 					fnRunnerResolve();
 				});
 
-				aJourneys.forEach(function(vJourney) {
+				aJourneys.forEach(function (vJourney) {
 					if (Utils.isOfType(vJourney, String)) {
-						pPromiseChain = pPromiseChain.then(function() {
-							return new Promise(function(resolve, reject) {
-								sap.ui.require([vJourney], function(oJourney) {
+						pPromiseChain = pPromiseChain.then(function () {
+							return new Promise(function (resolve, reject) {
+								sap.ui.require([vJourney], function (oJourney) {
 									resolve(oJourney);
 								});
 							});
 						});
 					} else {
-						pPromiseChain = pPromiseChain.then(function() {
+						pPromiseChain = pPromiseChain.then(function () {
 							return vJourney;
 						});
 					}
 					pPromiseChain = pPromiseChain.then(that._runJourney);
 				});
-				return pPromiseChain.then(function() {
+				return pPromiseChain.then(function () {
 					return pRunnerEnds;
 				});
 			},
 
-			_runJourney: function(vJourney) {
+			_runJourney: function (vJourney) {
 				if (Utils.isOfType(vJourney, Function)) {
 					vJourney.call();
 				}
 			},
 
-			_postRunActions: function(mSettings) {
+			_postRunActions: function (mSettings) {
 				this._removePages(mSettings.pages);
 				Opa5.resetConfig();
 			},
 
-			_removePages: function(mPages) {
+			_removePages: function (mPages) {
 				var that = this;
-				mPages &&
-					Object.keys(mPages).forEach(function(sPageName) {
+				if (mPages) {
+					Object.keys(mPages).forEach(function (sPageName) {
 						var mPage = mPages[sPageName],
 							sClassName = that._createClassName(mPage.namespace || "sap.ui.test.opa.pageObject", sPageName);
 						// remove path entry to avoid error log flooding from OPA5 - it is newly created anyways
 						ObjectPath.set(sClassName, undefined);
 					});
+				}
 			},
 
-			_createClassName: function(sNameSpace, sName) {
+			_createClassName: function (sNameSpace, sName) {
 				return sNameSpace + "." + sName;
 			},
 
-			_getOpaConfig: function(mSettings) {
+			_getOpaConfig: function (mSettings) {
 				var oConfig = Object.assign(
 					{
 						viewNamespace: "sap.fe.templates",
@@ -272,12 +268,11 @@ sap.ui.define(
 		 * Gets the global journey runner instance.
 		 *
 		 * @returns {object} The global default {@link sap.fe.test.JourneyRunner} instance
-		 *
 		 * @function
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.getDefaultRunner = function() {
+		JourneyRunner.getDefaultRunner = function () {
 			if (!_oDefaultRunner) {
 				_oDefaultRunner = new JourneyRunner();
 			}
@@ -288,12 +283,11 @@ sap.ui.define(
 		 * Sets the global journey runner instance.
 		 *
 		 * @param {sap.fe.test.JourneyRunner} oDefaultRunner Defines the global default {@link sap.fe.test.JourneyRunner} instance
-		 *
 		 * @function
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.setDefaultRunner = function(oDefaultRunner) {
+		JourneyRunner.setDefaultRunner = function (oDefaultRunner) {
 			if (_oDefaultRunner) {
 				_oDefaultRunner.destroy();
 			}
@@ -309,7 +303,7 @@ sap.ui.define(
 		 * @public
 		 * @static
 		 */
-		JourneyRunner.run = function() {
+		JourneyRunner.run = function () {
 			var oRunner = JourneyRunner.getDefaultRunner();
 			oRunner.run.apply(oRunner, arguments);
 		};

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

@@ -61,19 +61,18 @@ sap.ui.define(
 		 * <code><pre>
 		 * var oListReportDefinition = new ListReport({ appId: "MyApp", componentId: "MyListReportId", entitySet: "MyEntitySet" });
 		 * </pre></code>
-		 *
 		 * @param {object} oPageDefinition The required parameters
 		 * @param {string} oPageDefinition.appId The app id (defined in the manifest root)
 		 * @param {string} oPageDefinition.componentId The component id (defined in the target section for the list report within the manifest)
 		 * @param {string} oPageDefinition.entitySet The entitySet (optional)(defined in the settings of the corresponding target component within the manifest)
 		 * @param {string} oPageDefinition.contextPath The contextPath (optional)(defined in the settings of the corresponding target component within the manifest)
-		 * @param {...object} [aAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
+		 * @param {...object} [aInAdditionalPageDefinitions] Additional custom page functions, provided in an object containing <code>actions</code> and <code>assertions</code>
 		 * @returns {sap.fe.test.ListReport} A list report page definition
 		 * @name sap.fe.test.ListReport
 		 * @extends sap.fe.test.TemplatePage
 		 * @public
 		 */
-		function ListReport(oPageDefinition, aAdditionalPageDefinitions) {
+		function ListReport(oPageDefinition, aInAdditionalPageDefinitions) {
 			var sAppId = oPageDefinition.appId,
 				sComponentId = oPageDefinition.componentId,
 				sContextPath = oPageDefinition.contextPath,
@@ -164,7 +163,6 @@ sap.ui.define(
 							 *
 							 * @param {boolean} [bCollapse] Defines whether the header should be collapsed, else it is expanded (default)
 							 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
-							 *
 							 * @function
 							 * @name sap.fe.test.ListReport.actions#iCollapseExpandPageHeader
 							 * @public
@@ -181,6 +179,27 @@ sap.ui.define(
 									.description("Pressing dialog button '" + sText + "'")
 									.execute();
 							},
+							iCheckLinksCount: function (count) {
+								return OpaBuilder.create(this)
+									.hasType("sap.m.ColumnListItem")
+									.check(function (targets) {
+										if (targets.length === count) {
+											return true;
+										} else {
+											return false;
+										}
+									}, true)
+									.description("Seeing QuickView Card with " + count + " target applications in ObjectPage")
+									.execute();
+							},
+							iClickQuickViewMoreLinksButton: function () {
+								return OpaBuilder.create(this)
+									.hasType("sap.m.Button")
+									.has(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "info.POPOVER_DEFINE_LINKS"))
+									.doPress()
+									.description("Pressing 'More Links' button")
+									.execute();
+							},
 							iClickLinkWithText: function (sText) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Link")
@@ -422,9 +441,7 @@ sap.ui.define(
 									.execute();
 							},
 							iSeeDeleteConfirmation: function () {
-								return this._iSeeTheMessageToast(
-									oResourceBundleCore.getText("C_TRANSACTION_HELPER_OBJECT_PAGE_DELETE_TOAST_SINGULAR")
-								);
+								return this._iSeeTheMessageToast(oResourceBundleCore.getText("C_TRANSACTION_HELPER_DELETE_TOAST_SINGULAR"));
 							},
 							iSeePageTitle: function (sTitle) {
 								return OpaBuilder.create(this)
@@ -436,7 +453,7 @@ sap.ui.define(
 							iSeeVariantTitle: function (sTitle) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId("fe::PageVariantManagement-text")
+									.hasId("fe::PageVariantManagement-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -444,7 +461,7 @@ sap.ui.define(
 							iSeeControlVMFilterBarTitle: function (sTitle) {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId(FilterBarId + "::VariantManagement-text")
+									.hasId(FilterBarId + "::VariantManagement-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -453,7 +470,7 @@ sap.ui.define(
 								var sTableId = sIconTabProperty ? getTableId(sIconTabProperty) : SingleTableId;
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Title")
-									.hasId(sTableId + "::VM-text")
+									.hasId(sTableId + "::VM-vm-text")
 									.hasProperties({ text: sTitle })
 									.description("Seeing variant title '" + sTitle + "'")
 									.execute();
@@ -461,15 +478,15 @@ sap.ui.define(
 							iSeeVariantModified: function (bIsModified, bControl) {
 								var sLabelId;
 								if (bControl) {
-									sLabelId = FilterBarId + "::VariantManagement-modified";
+									sLabelId = FilterBarId + "::VariantManagement-vm-modified";
 								} else {
-									sLabelId = "fe::PageVariantManagement-modified";
+									sLabelId = "fe::PageVariantManagement-vm-modified";
 								}
 
 								bIsModified = bIsModified === undefined ? true : bIsModified;
 								if (bIsModified) {
 									return OpaBuilder.create(this)
-										.hasType("sap.m.Label")
+										.hasType("sap.m.Text")
 										.hasId(sLabelId)
 										.hasProperties({ text: "*" })
 										.description("Seeing variant state as 'modified'")