@openui5/sap.ui.core 1.126.1 → 1.127.0

package/test/sap/ui/core/qunit/odata/v4/lib/_Helper.qunit.js

@@ -839,6 +839,8 @@ sap.ui.define([
 			mChangeListeners = {},
 			oHelperMock = this.mock(_Helper);
 
+		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
+			"SO_2_BP/Address", sinon.match.same(oCacheData.Address));
 		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
 			"SO_2_BP/Address/City", "Heidelberg");
 
@@ -857,6 +859,8 @@ sap.ui.define([
 			}
 		});
 
+		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
+			"SO_2_BP/Address", sinon.match.same(oCacheData.Address));
 		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
 			"SO_2_BP/Address/PostalCode", "69115");
 		oHelperMock.expects("fireChanges").withExactArgs(sinon.match.same(mChangeListeners),
@@ -889,6 +893,8 @@ sap.ui.define([
 			mChangeListeners = {},
 			oHelperMock = this.mock(_Helper);
 
+		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
+			"SO_2_BP/#foo.bar.AcBaz", sinon.match.same(oAdvertisedAction));
 		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
 			"SO_2_BP/#foo.bar.AcBaz/title", "My New Title");
 		oHelperMock.expects("fireChanges").never();
@@ -923,7 +929,8 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	QUnit.test("updateExisting: collection valued properties (messages)", function (assert) {
-		var aNoMessages = [],
+		var oHelperMock = this.mock(_Helper),
+			aNoMessages = [],
 			aMessages = [{
 				code : "42",
 				longtextUrl : "any/URL",
@@ -951,8 +958,13 @@ sap.ui.define([
 		aMessages.$count = aMessages.length;
 		sMessages = JSON.stringify(aMessages);
 
+		oHelperMock.expects("fireChange").withExactArgs("~mChangeListeners~0~",
+			"SO_2_BP/__CT__FAKE__Message", sinon.match.same(oCacheData.__CT__FAKE__Message));
+		oHelperMock.expects("fireChange").withExactArgs("~mChangeListeners~0~",
+			"SO_2_BP/__CT__FAKE__Message/__FAKE__Messages", sinon.match.same(aMessages));
+
 		// code under test
-		_Helper.updateExisting(null, "SO_2_BP", oCacheData, {
+		_Helper.updateExisting("~mChangeListeners~0~", "SO_2_BP", oCacheData, {
 			__CT__FAKE__Message : {
 				__FAKE__Messages : aMessages
 			}
@@ -962,8 +974,13 @@ sap.ui.define([
 			sMessages);
 		assert.strictEqual(oCacheData["__CT__FAKE__Message"]["__FAKE__Messages"].$count, 2);
 
+		oHelperMock.expects("fireChange").withExactArgs("~mChangeListeners~1~",
+			"SO_2_BP/__CT__FAKE__Message", sinon.match.same(oCacheData.__CT__FAKE__Message));
+		oHelperMock.expects("fireChange").withExactArgs("~mChangeListeners~1~",
+			"SO_2_BP/__CT__FAKE__Message/__FAKE__Messages", sinon.match.same(aNoMessages));
+
 		// code under test
-		_Helper.updateExisting({}, "SO_2_BP", oCacheData, {
+		_Helper.updateExisting("~mChangeListeners~1~", "SO_2_BP", oCacheData, {
 			__CT__FAKE__Message : {
 				__FAKE__Messages : aNoMessages
 			}
@@ -971,8 +988,6 @@ sap.ui.define([
 
 		assert.deepEqual(oCacheData["__CT__FAKE__Message"]["__FAKE__Messages"], []);
 		assert.strictEqual(oCacheData["__CT__FAKE__Message"]["__FAKE__Messages"].$count, 0);
-
-		//TODO change handling for collection valued properties (not supported yet)
 	});
 
 	//*********************************************************************************************
@@ -1870,11 +1885,11 @@ sap.ui.define([
 			};
 
 		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
-			"path/#added", sinon.match.same(oSource["#added"]));
+			"path/#added", oSource["#added"]); // Note: no sinon.match.same, deep copy involved
 		oHelperMock.expects("fireChange")
 			.withExactArgs(sinon.match.same(mChangeListeners), "path/#added/value", "new");
 		oHelperMock.expects("fireChange").withExactArgs(sinon.match.same(mChangeListeners),
-			"path/#changed", sinon.match.same(oSource["#changed"]));
+			"path/#changed", sinon.match.same(oTarget["#changed"]));
 		oHelperMock.expects("fireChange")
 			.withExactArgs(sinon.match.same(mChangeListeners), "path/#changed/value", "new");
 
@@ -2477,14 +2492,42 @@ sap.ui.define([
 	//*********************************************************************************************
 [false, true].forEach(function (bClientSide) {
 	QUnit.test("publicClone: bClientSide=" + bClientSide, function (assert) {
-		var oCloneMock = this.mock(_Helper).expects("clone")
-				.withExactArgs("~value~", sinon.match.func, "~bAsString~"),
+		var vValue = {}, // use object, not string here (no #slice)
+			oCloneMock = this.mock(_Helper).expects("clone")
+				.withExactArgs(sinon.match.same(vValue), sinon.match.func, "~bAsString~"),
 			fnReplacer;
 
 		oCloneMock.returns("~clone~");
 
 		// code under test
-		assert.strictEqual(_Helper.publicClone("~value~", bClientSide, "~bAsString~"), "~clone~");
+		assert.strictEqual(_Helper.publicClone(vValue, bClientSide, "~bAsString~"), "~clone~");
+
+		fnReplacer = oCloneMock.getCall(0).args[1];
+
+		// Check:
+		//   - sKey === "@$ui5._" => fnReplacer(sKey, vValue) === undefined for each vValue
+		//   - sKey !== "@$ui5._" => fnReplacer(sKey, vValue) === vValue for each vValue
+		// code under test
+		assert.strictEqual(fnReplacer("@$ui5._", 42), undefined);
+		assert.strictEqual(fnReplacer("@$ui5.node.level", 2), bClientSide ? undefined : 2);
+		assert.strictEqual(fnReplacer("@$ui5.transient", true), bClientSide ? undefined : true);
+		assert.strictEqual(fnReplacer("ui5._", "bar"), "bar");
+	});
+});
+
+	//*********************************************************************************************
+[false, true].forEach(function (bClientSide) {
+	QUnit.test("publicClone: array, bClientSide=" + bClientSide, function (assert) {
+		var oCloneMock = this.mock(_Helper).expects("clone")
+				.withExactArgs(["a",, "z"], sinon.match.func, "~bAsString~"),
+			fnReplacer,
+			vValue = ["a",, "z"];
+
+		oCloneMock.returns("~clone~");
+		vValue.$foo = "bar";
+
+		// code under test
+		assert.strictEqual(_Helper.publicClone(vValue, bClientSide, "~bAsString~"), "~clone~");
 
 		fnReplacer = oCloneMock.getCall(0).args[1];
 

package/test/sap/ui/core/qunit/odata/v4/lib/_Requestor.qunit.js

@@ -3836,6 +3836,12 @@ sap.ui.define([
 		}, {
 			o : {$select : ["Name", "ID"]},
 			s : "$select=ID,Name"
+		}, { // "path prefix rules": ComplexType absorbs its properties
+			o : {$select : ["NameSuffix", "ComplexType/A", "Name", "ComplexType", "ComplexType/B"]},
+			s : "$select=ComplexType,Name,NameSuffix"
+		}, { // "path prefix rules": ComplexType absorbs its properties
+			o : {$select : ["Prefix/Complex/A", "Prefix/Complex", "Prefix/Complex/B/C"]},
+			s : "$select=Prefix/Complex"
 		}, {
 			o : {$expand : {SO_2_SOITEM : true, SO_2_BP : true}},
 			s : "$expand=SO_2_BP,SO_2_SOITEM"

package/test/sap/ui/core/qunit/odata/v4/lib/_TreeState.qunit.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("expand/collapse", function (assert) {
+	QUnit.test("expand/collapse: default level", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");
 
 		this.mock(_Helper).expects("getPrivateAnnotation").thrice()
@@ -61,6 +61,35 @@ sap.ui.define([
 		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
 	});
 
+	//*********************************************************************************************
+[
+	{iLevels : 1, vResult : 1},
+	{iLevels : 42, vResult : 42},
+	{iLevels : Number.MAX_SAFE_INTEGER, vResult : null},
+	{iLevels : 1e16, vResult : null}
+].forEach(function (oFixture) {
+	QUnit.test("expand by levels: " + oFixture.iLevels, function (assert) {
+		const oTreeState = new _TreeState("~sNodeProperty~");
+
+		this.mock(_Helper).expects("getPrivateAnnotation").twice()
+			.withExactArgs("~oNode~", "predicate").returns("~predicate~");
+		this.mock(_Helper).expects("drillDown")
+			.withExactArgs("~oNode~", "~sNodeProperty~")
+			.returns("~sNodeId~");
+
+		// code under test
+		oTreeState.expand("~oNode~", oFixture.iLevels);
+
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels,
+			{"~predicate~" : {NodeID : "~sNodeId~", Levels : oFixture.vResult}});
+
+		// code under test
+		oTreeState.collapse("~oNode~");
+
+		assert.deepEqual(oTreeState.mPredicate2ExpandLevels, {});
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("collapse/expand", function (assert) {
 		const oTreeState = new _TreeState("~sNodeProperty~");

package/test/sap/ui/core/qunit/opa/Opa5PageObject.qunit.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/test/PageObjectFactory",
 	"sap/base/Log",
 	"./utils/view",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (Opa, Opa5, PageObjectFactory, Log, viewUtils, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/OpaPlugin.qunit.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/View",
 	"sap/ui/core/mvc/XMLView",
 	"./utils/view",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/base/Log"
 ], function (OpaPlugin,
 			 Interactable,

package/test/sap/ui/core/qunit/opa/RecordReplay.qunit.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	'sap/m/App',
 	'sap/ui/core/mvc/XMLView',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (RecordReplay, _autoWaiter, _autoWaiterAsync, ListItem, Button, Input, MultiInput, OverflowToolbar, Popover, SearchField, $, App, XMLView, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/_ControlFinder.qunit.js

@@ -11,7 +11,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/test/matchers/PropertyStrictEquals",
 	"sap/ui/test/_LogCollector",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function ($, _ControlFinder,  mobileLibrary, Button, SearchField, List, ObjectListItem, Dialog, JSONModel, PropertyStrictEquals, _LogCollector, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/actions/Action.qunit.js

@@ -4,7 +4,7 @@
 sap.ui.define([
 	"sap/ui/test/actions/Action",
 	"sap/ui/core/Control",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function(Action, Control, nextUIUpdate){
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/actions/EnterText.qunit.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/strings/capitalize",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (
 	extend,
 	EnterText,

package/test/sap/ui/core/qunit/opa/actions/Press.qunit.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	"sap/m/Slider",
 	"sap/m/RatingIndicator",
 	"sap/ui/core/UIArea",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/m/OverflowToolbarLayoutData"
 ],
 function(Press,

package/test/sap/ui/core/qunit/opa/autowaiter/_cssAnimationWaiter.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	"sap/m/Toolbar",
 	"sap/ui/core/ControlBehavior",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter, _promiseWaiter,
 		DynamicPage,  Toolbar, ControlBehavior, jQuery, nextUIUpdate) {
 	"use strict";

package/test/sap/ui/core/qunit/opa/autowaiter/_cssTransitionWaiter.js

@@ -11,7 +11,7 @@ sap.ui.define([
 	"sap/base/strings/capitalize",
 	"sap/ui/core/ControlBehavior",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter, _promiseWaiter,
 		_navigationContainerWaiter, FlexibleColumnLayout, Page, capitalize, ControlBehavior, jQuery, nextUIUpdate) {
 	"use strict";

package/test/sap/ui/core/qunit/opa/autowaiter/_jsAnimationWaiter.js

@@ -8,7 +8,7 @@ sap.ui.define([
 	"sap/m/ScrollContainer",
 	"sap/m/Panel",
 	"sap/ui/core/ControlBehavior",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter, _promiseWaiter,
 	ScrollContainer, Panel, ControlBehavior, nextUIUpdate) {
 	"use strict";

package/test/sap/ui/core/qunit/opa/autowaiter/_navigationContainerWaiter.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/ui/test/opaQunit",
 	"sap/ui/test/Opa5",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/ui/core/IntervalTrigger",
 	"sap/ui/core/ResizeHandler"
 ], function (_LogCollector, _autoWaiter, _timeoutWaiter, _XHRWaiter,

package/test/sap/ui/core/qunit/opa/autowaiter/_resourceWaiter.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	"sap/ui/layout/BlockLayout",
 	"sap/ui/layout/BlockLayoutRow",
 	"sap/ui/layout/BlockLayoutCell",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_LogCollector, _OpaLogger, _resourceWaiter, Image, Text, Panel, BlockLayout, BlockLayoutRow, BlockLayoutCell, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/fixture/bindingPath.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	'sap/m/Input',
 	'sap/ui/layout/VerticalLayout',
 	'sap/ui/model/json/JSONModel',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (List, StandardListItem, Text, Input, VerticalLayout, JSONModel, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/matchers/Interactable.qunit.js

@@ -10,7 +10,7 @@ sap.ui.define([
 	'sap/ui/test/opaQunit',
 	'sap/ui/test/Opa5',
 	'sap/ui/test/_LogCollector',
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	'../utils/customQUnitAssertions'
 ], function (Interactable,
 			 $,

package/test/sap/ui/core/qunit/opa/matchers/LabelFor.qunit.js

@@ -10,7 +10,7 @@ sap.ui.define([
 	"sap/ui/layout/library",
 	"sap/ui/layout/form/SimpleForm",
 	"sap/m/Link",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/ui/test/OpaPlugin"
 ], function (LabelFor, Input, Label, Button, ResourceModel, App, Page, layoutLibrary, SimpleForm, Link, nextUIUpdate) {
 	"use strict";

package/test/sap/ui/core/qunit/opa/matchers/Sibling.qunit.js

@@ -7,7 +7,7 @@ sap.ui.define([
 	"sap/m/List",
 	"sap/m/StandardListItem",
 	"sap/m/Toolbar",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (Sibling, Button, HorizontalLayout, VerticalLayout, List, StandardListItem, Toolbar, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/matchers/Visible.qunit.js

@@ -2,7 +2,7 @@
 sap.ui.define([
 	'sap/ui/test/matchers/Visible',
 	'sap/m/Button',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (Visible, Button, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/matchers/_Busy.qunit.js

@@ -7,7 +7,7 @@ sap.ui.define([
 	'sap/m/Page',
 	'sap/m/VBox',
 	"sap/ui/core/mvc/XMLView",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	"sap/ui/test/OpaPlugin"
 ], function (_Busy, Button, Dialog, Toolbar, Page, VBox, XMLView, nextUIUpdate) {
 	"use strict";

package/test/sap/ui/core/qunit/opa/matchers/_Editable.qunit.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	'sap/m/Text',
 	'sap/ui/layout/library',
 	'sap/ui/layout/form/SimpleForm',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_Editable, Input, Text, layoutLibrary, SimpleForm, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/matchers/_Enabled.qunit.js

@@ -4,7 +4,7 @@ sap.ui.define([
 	'sap/m/Button',
 	'sap/m/Page',
 	'sap/m/Toolbar',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_Enabled, Button, Page, Toolbar, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/matchers/_Visitor.qunit.js

@@ -4,7 +4,7 @@ sap.ui.define([
 	'sap/m/Button',
 	'sap/m/Toolbar',
 	'sap/m/Page',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_Visitor, Button, Toolbar, Page, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/opa5/actions.qunit.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/test/autowaiter/_timeoutWaiter",
 	"sap/m/Button",
 	"sap/ui/test/autowaiter/_autoWaiter",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (Opa5, opaTest, _timeoutWaiter, Button, _autoWaiter, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/opa5/basics.qunit.js

@@ -11,7 +11,7 @@ sap.ui.define([
 	"sap/ui/test/_OpaUriParameterParser",
 	"sap/ui/test/autowaiter/_autoWaiter",
 	"../utils/sinon",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (XMLView, Opa, Opa5, opaTest, $, Button, URI, _OpaLogger, _OpaUriParameterParser, _autoWaiter, sinonUtils, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/opa5/logging.qunit.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/test/Opa",
 	"sap/ui/test/_LogCollector",
 	"../utils/sinon",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (XMLView, Opa5, Opa, _LogCollector, sinonUtils, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/opa5/matchers.qunit.js

@@ -9,7 +9,7 @@ sap.ui.define([
 	"sap/ui/test/matchers/Descendant",
 	"sap/ui/test/matchers/MatcherFactory",
 	"sap/ui/layout/HorizontalLayout",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (Opa, Opa5, Button, Input, PropertyStrictEquals, Ancestor, Descendant, MatcherFactory, HorizontalLayout, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_BindingPath.js

@@ -4,7 +4,7 @@ sap.ui.define([
 	"sap/ui/model/resource/ResourceModel",
 	"sap/m/Text",
 	"../fixture/bindingPath",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_ControlSelectorGenerator, ResourceModel, Text, fixture, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_ControlSelectorGenerator.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	"sap/ui/layout/HorizontalLayout",
 	"sap/m/Toolbar",
 	"sap/ui/test/_ControlFinder",
-	"sap/ui/qunit/utils/nextUIUpdate",
+	"sap/ui/test/utils/nextUIUpdate",
 	// only selector generators below; import in priority order
 	"sap/ui/test/selectors/_GlobalID",
 	"sap/ui/test/selectors/_ViewID",

package/test/sap/ui/core/qunit/opa/selectors/_ControlSelectorValidator.js

@@ -7,7 +7,7 @@ sap.ui.define([
 	"sap/m/List",
 	"sap/m/StandardListItem",
 	"sap/m/Text",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (extend, _ControlSelectorValidator, _ControlFinder, JSONModel, List, StandardListItem, Text, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_DropdownItem.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/m/Select",
 	"sap/ui/core/Item",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_DropdownItem, _ControlSelectorGenerator, JSONModel, Select, Item, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_GlobalID.js

@@ -2,7 +2,7 @@
 sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/m/Button",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_ControlSelectorGenerator, Button, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_LabelFor.js

@@ -3,7 +3,7 @@ sap.ui.define([
 	"sap/ui/test/selectors/_ControlSelectorGenerator",
 	"sap/m/Label",
 	"sap/m/Input",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_ControlSelectorGenerator, Label, Input, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_Properties.js

@@ -4,7 +4,7 @@ sap.ui.define([
 	"sap/m/Input",
 	"sap/m/Image",
 	"sap/ui/core/Icon",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_ControlSelectorGenerator, Input, Image, Icon, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_Selector.js

@@ -6,7 +6,7 @@ sap.ui.define([
 	"sap/ui/core/mvc/XMLView",
 	"sap/m/Button",
 	"sap/m/Dialog",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_Selector, Element, View, XMLView, Button, Dialog, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_TableRowItem.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ui/core/Element",
 	"sap/ui/core/mvc/XMLView",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_TableRowItem, _ControlSelectorGenerator, Element, XMLView, JSONModel, nextUIUpdate) {
 	"use strict";
 

package/test/sap/ui/core/qunit/opa/selectors/_ViewID.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/m/Button",
 	'sap/ui/core/Element',
 	'sap/ui/core/mvc/XMLView',
-	"sap/ui/qunit/utils/nextUIUpdate"
+	"sap/ui/test/utils/nextUIUpdate"
 ], function (_ControlSelectorGenerator, $, Button, Element, XMLView, nextUIUpdate) {
 	"use strict";