@openui5/sap.ui.core 1.120.0 → 1.120.2

package/test/sap/ui/core/qunit/odata/ODataTreeBindingAdapter.qunit.js

@@ -2135,7 +2135,7 @@ sap.ui.define([
 			"sap/ui/model/odata/v2/ODataTreeBinding", "sap/ui/model/odata/ODataTreeBindingAdapter"],
 			function(ODataTreeBinding, ODataTreeBindingAdapter) {
 				var oBinding = new ODataTreeBinding({
-					checkFilterOperation: function() { }
+					checkFilter: function() { }
 				}, "/");
 				ODataTreeBindingAdapter.apply(oBinding);
 

package/test/sap/ui/core/qunit/odata/v2/ODataListBindingNoFakeService.qunit.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		var oBinding, oRemoveExpectation, oResetDataExpectation,
 			oContext = {},
 			oModel = {
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				read : function () {},
 				resolveDeep : function () {}
@@ -51,7 +51,7 @@ sap.ui.define([
 		this.mock(oModel).expects("resolveDeep")
 			.withExactArgs("path", sinon.match.same(oContext))
 			.returns("~deep");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList")
 			.withExactArgs()
 			.returns(false);
@@ -708,7 +708,7 @@ sap.ui.define([
 		var oBinding,
 			oModel = {
 				read : function () {},
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				resolve : function () {},
 				resolveDeep : function () {}
@@ -718,7 +718,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oFixture.parameters))
 			.returns("~custom");
 		this.mock(oModel).expects("resolveDeep").withExactArgs("path", "context").returns("~deep");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList").withExactArgs()
 			.returns(true);
 		this.mock(ODataListBinding.prototype).expects("_reassignCreateActivate").withExactArgs();
@@ -735,14 +735,14 @@ sap.ui.define([
 	QUnit.test("constructor: remove persisted created contexts without expanded list",
 			function (assert) {
 		var oModel = {
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				resolveDeep : function () {}
 			};
 
 		this.mock(oModel).expects("createCustomParams").withExactArgs(undefined).returns("~custom");
 		this.mock(oModel).expects("resolveDeep").withExactArgs("path", "context").returns("~deep");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList")
 			.withExactArgs()
 			.returns(false);
@@ -766,7 +766,7 @@ sap.ui.define([
 		var oBinding,
 			oModel = {
 				read : function () {},
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				resolve : function () {},
 				resolveDeep : function () {}
@@ -776,7 +776,7 @@ sap.ui.define([
 			.withExactArgs(sinon.match.same(oFixture.parameters))
 			.returns("~custom");
 		this.mock(oModel).expects("resolveDeep").withExactArgs("path", "context").returns("~deep");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList").withExactArgs()
 			.returns(true);
 		this.mock(ODataListBinding.prototype).expects("_reassignCreateActivate").withExactArgs();
@@ -796,7 +796,7 @@ sap.ui.define([
 				sDefaultCountMode : "~sDefaultCountMode",
 				sDefaultOperationMode : "~sDefaultOperationMode",
 				bPreliminaryContext : "~bPreliminaryContext",
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				resolveDeep : function () {}
 			};
@@ -805,7 +805,7 @@ sap.ui.define([
 		this.mock(oModel).expects("resolveDeep")
 			.withExactArgs("~sPath", "~oContext")
 			.returns("~sDeepPath");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList")
 			.withExactArgs()
 			.returns(true);
@@ -864,7 +864,7 @@ sap.ui.define([
 				isPreliminary : function () {}
 			},
 			oModel = {
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () {},
 				resolve : function () {},
 				resolveDeep : function () {}
@@ -876,7 +876,7 @@ sap.ui.define([
 		this.mock(oModel).expects("resolveDeep")
 			.withExactArgs("relativePath", bUsePreliminary ? sinon.match.same(oContext) : undefined)
 			.returns("~deepPath"); // resolveDeep returns undefined for oContext === undefined
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oModel).expects("checkFilter").withExactArgs([]);
 		this.mock(ODataListBinding.prototype).expects("checkExpandedList").withExactArgs().returns(true);
 		this.mock(ODataListBinding.prototype).expects("_reassignCreateActivate").withExactArgs();
 
@@ -3364,7 +3364,7 @@ sap.ui.define([
 			oBinding = {
 				aApplicationFilters : aApplicationFilters,
 				bInitial : false,
-				oModel : {checkFilterOperation : function () {}},
+				oModel : {checkFilter : function () {}},
 				_fireRefresh : function () {},
 				_removePersistedCreatedContexts : function () {},
 				addComparators : function () {},
@@ -3376,7 +3376,7 @@ sap.ui.define([
 			oBindingMock = this.mock(oBinding),
 			aFilters = bFilterNone ? [Filter.NONE] : [];
 
-		this.mock(oBinding.oModel).expects("checkFilterOperation")
+		this.mock(oBinding.oModel).expects("checkFilter")
 			.withExactArgs(sinon.match.same(aFilters));
 		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		(function() {
@@ -3416,7 +3416,7 @@ sap.ui.define([
 		var oBinding = {
 				aAllKeys : [],
 				bInitial : false,
-				oModel : {checkFilterOperation : function () {}},
+				oModel : {checkFilter : function () {}},
 				_moveCreatedPersistedToAllKeys : function () {},
 				_fireChange : function () {},
 				addComparators : function () {},
@@ -3425,7 +3425,7 @@ sap.ui.define([
 				useClientMode : function () {}
 			};
 
-		this.mock(oBinding.oModel).expects("checkFilterOperation").withExactArgs([]);
+		this.mock(oBinding.oModel).expects("checkFilter").withExactArgs([]);
 		/** @deprecated As of version 1.22.0, reason sap.ui.model.odata.Filter.js */
 		(function() {
 			oBinding.convertFilters = function () {};

package/test/sap/ui/core/qunit/odata/v2/ODataModel.integration.qunit.js

@@ -6952,6 +6952,68 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: The key predicate of an entity contains an encoded * character (='%2A'). Ensure
+	// that the message targets (target and full target) are normalized in the same way as the
+	// enitity key.
+	// BCP: 2370146338
+	QUnit.test("Messages: normalize target and full target paths", function (assert) {
+		const oModel = createSalesOrdersModel();
+		const sView = '\
+<FlexBox id="flexbox">\
+	<Table id="table" growing="true" items="{ToLineItems}">\
+		<Text id="itemPosition" text="{ItemPosition}"/>\
+		<Input id="note" value="{Note}"/>\
+	</Table>\
+</FlexBox>';
+
+		return this.createView(assert, sView, oModel).then(() => {
+			this.expectHeadRequest()
+				.expectRequest({
+					deepPath : "/BusinessPartnerSet('4711')/ToSalesOrders('42')/ToLineItems",
+					method : "GET",
+					requestUri : "SalesOrderSet('42')/ToLineItems?$skip=0&$top=20"
+				}, {
+					results : [{
+						__metadata : {
+							uri : "/SalesOrderLineItemSet(SalesOrderID='42',ItemPosition='1%2A%30%2F')"
+						},
+						ItemPosition : "1*0/",
+						Note : "Position 10",
+						SalesOrderID : "42"
+					}]
+				}, {"sap-message" : getMessageHeader(this.createResponseMessage(
+					"(SalesOrderID='42',ItemPosition='1%2A%30%2F')/Note", "Foo"))})
+				.expectMessages([{
+					code : "code-0",
+					fullTarget : "/BusinessPartnerSet('4711')/ToSalesOrders('42')"
+						+ "/ToLineItems(SalesOrderID='42',ItemPosition='1*0%2F')/Note",
+					message : "Foo",
+					persistent : false,
+					target : "/SalesOrderLineItemSet(SalesOrderID='42',ItemPosition='1*0%2F')/Note",
+					technical : false,
+					type : "Error"
+				}])
+				.expectValue("itemPosition", ["1*0/"])
+				.expectValue("note", ["Position 10"]);
+
+			// code under test - relative binding context
+			this.oView.byId("flexbox").setBindingContext(new Context(oModel, "/SalesOrderSet('42')",
+				"/BusinessPartnerSet('4711')/ToSalesOrders('42')"));
+
+			return this.waitForChanges(assert);
+		}).then(() => {
+			const oInput = this.oView.byId("table").getItems()[0].getCells()[1];
+			this.expectValueState(oInput, "Error", "Foo");
+
+			assert.strictEqual(oInput.getBinding("value").oContext.getDeepPath(),
+				"/BusinessPartnerSet('4711')/ToSalesOrders('42')/ToLineItems(SalesOrderID='42',ItemPosition='1*0%2F')");
+			assert.strictEqual(oInput.getBinding("value").getResolvedPath(),
+				"/SalesOrderLineItemSet(SalesOrderID='42',ItemPosition='1*0%2F')/Note");
+			return this.waitForChanges(assert);
+		});
+	});
+
 	//*********************************************************************************************
 	// Scenario: Function import parameters need to be encoded when creating the default target
 	// path for for a function import. Otherwise messages cannot be assigned properly and it might
@@ -21197,6 +21259,8 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 	// BCP: 2370088390
 	// When the list is filtered only the transient entry is shown and no entries are requested.
 	// JIRA: CPOUI5MODELS-1421
+	// BCP: 2380132519; it has to be possible to have control filters even if application filters are set to
+	// Filter.NONE and vice versa.
 	QUnit.test("Filter table where only transient items have messages", function (assert) {
 		let oCreatedContext, oRowsBinding;
 		const oModel = createSalesOrdersModel({preliminaryContext : true});
@@ -21263,6 +21327,11 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 
 			oRowsBinding.filter(aResults[0], FilterType.Application);
 
+			return this.waitForChanges(assert);
+		}).then(() => {
+			// code under test - adding a control filter does not lead to an error and still no request is needed
+			oRowsBinding.filter(new Filter("itemPosition", FilterOperator.GE, "10"), FilterType.Control);
+
 			return this.waitForChanges(assert);
 		});
 	});

package/test/sap/ui/core/qunit/odata/v2/ODataModelNoFakeService.qunit.js

@@ -4796,7 +4796,7 @@ sap.ui.define([
 					}
 				},
 				bFunctionHasParameter
-					? {"~name0" : "~defaultValue0", "~name1" : "foo"}
+					? {"~name0" : undefined, "~name1" : "foo"}
 					: undefined),
 			oMetadata = {
 				_getCanonicalPathOfFunctionImport : function () {},
@@ -4810,7 +4810,6 @@ sap.ui.define([
 				bUseBatch : "~bUseBatch",
 				sServiceUrl : "/service/url",
 				_addEntity : function () {},
-				_createPropertyValue : function () {},
 				_createRequest : function () {},
 				_createRequestUrlWithNormalizedPath : function () {},
 				_getHeaders : function () {},
@@ -4867,20 +4866,12 @@ sap.ui.define([
 			.returns(oFunctionMetadataFixture.oFunctionMetadata);
 
 		if (bFunctionHasParameter) {
-			oModelMock.expects("_createPropertyValue")
-				.withExactArgs("~type0")
-				.returns("~defaultValue0");
-			oModelMock.expects("_createPropertyValue")
-				.withExactArgs("~type1")
-				.returns("~defaultValue1");
 			this.oLogMock.expects("warning")
 				.withExactArgs("No value given for parameter '~name0' of function import"
 					+ " '/~sFunctionName'", sinon.match.same(oModel), sClassName);
 			this.mock(ODataUtils).expects("formatValue")
 				.withExactArgs("foo", "~type1")
 				.returns("~value1");
-		} else {
-			oModelMock.expects("_createPropertyValue").never();
 		}
 
 		oModelMock.expects("_addEntity").withExactArgs(oExpectedOData)
@@ -5290,7 +5281,7 @@ sap.ui.define([
 			oModel = {
 				// used by ODataListBinding and ODataTreeBinding
 				_getCreatedContextsCache : function () {},
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				createCustomParams : function () { return {}; }, // used by ODataListBinding
 				resolveDeep : function () {},
 				resolveFromCache : function () {}

package/test/sap/ui/core/qunit/odata/v2/ODataTreeBindingNoFakeService.qunit.js

@@ -32,7 +32,7 @@ sap.ui.define([
 			oBinding,
 			oContext = {},
 			oModel = {
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				bPreliminaryContext : "bPreliminaryContextFromModel"
 			},
 			mParameters = {
@@ -48,7 +48,7 @@ sap.ui.define([
 			},
 			aSorters = [new Sorter("propertyPath")];
 
-		this.mock(oModel).expects("checkFilterOperation")
+		this.mock(oModel).expects("checkFilter")
 			.withExactArgs(sinon.match.same(aApplicationFilters));
 
 		// code under test
@@ -102,19 +102,19 @@ sap.ui.define([
 			oBinding,
 			oContext = {},
 			oModel = {
-				checkFilterOperation : function () {}
+				checkFilter : function () {}
 			},
 			oModelMock = this.mock(oModel),
 			oNotAFilter = {/*not a Filter*/};
 
-		oModelMock.expects("checkFilterOperation").withExactArgs([oApplicationFilter]);
+		oModelMock.expects("checkFilter").withExactArgs([oApplicationFilter]);
 
 		// code under test
 		oBinding = new ODataTreeBinding(oModel, "path", oContext, oApplicationFilter);
 
 		assert.deepEqual(oBinding.aApplicationFilters, [oApplicationFilter]);
 
-		oModelMock.expects("checkFilterOperation").withExactArgs(sinon.match.same(oNotAFilter));
+		oModelMock.expects("checkFilter").withExactArgs(sinon.match.same(oNotAFilter));
 
 		// code under test
 		oBinding = new ODataTreeBinding(oModel, "path", oContext, oNotAFilter);
@@ -126,12 +126,12 @@ sap.ui.define([
 	QUnit.test("constructor: multiple Application filters are grouped", function (assert) {
 		var oBinding,
 			aFilters = ["~filter0", "~filter1"],
-			oModel = {checkFilterOperation: function () {}};
+			oModel = {checkFilter: function () {}};
 
 		this.mock(FilterProcessor).expects("groupFilters")
 			.withExactArgs(sinon.match.same(aFilters))
 			.returns("~groupedFilters");
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs(["~groupedFilters"]);
+		this.mock(oModel).expects("checkFilter").withExactArgs(["~groupedFilters"]);
 
 		// code under test
 		oBinding = new ODataTreeBinding(oModel, "path", /*oContext*/{}, aFilters);
@@ -144,14 +144,14 @@ sap.ui.define([
 		var oBinding,
 			oContext = {},
 			oModel = {
-				checkFilterOperation : function () {},
+				checkFilter : function () {},
 				sDefaultCountMode : "ModelDefaultCountMode",
 				sDefaultOperationMode : OperationMode.Default,
 				bPreliminaryContext : "bPreliminaryContext"
 			},
 			oModelMock = this.mock(oModel);
 
-		oModelMock.expects("checkFilterOperation").withExactArgs([]);
+		oModelMock.expects("checkFilter").withExactArgs([]);
 
 		// code under test
 		oBinding = new ODataTreeBinding(oModel, "path", oContext);
@@ -171,7 +171,7 @@ sap.ui.define([
 		assert.strictEqual(oBinding.bUsePreliminaryContext, "bPreliminaryContext");
 		assert.strictEqual(oBinding.bTransitionMessagesOnly, false);
 
-		oModelMock.expects("checkFilterOperation").withExactArgs([]);
+		oModelMock.expects("checkFilter").withExactArgs([]);
 
 		// code under test
 		oBinding = new ODataTreeBinding(oModel, "path", oContext, undefined,
@@ -179,7 +179,7 @@ sap.ui.define([
 
 		assert.strictEqual(oBinding.sGroupId, "group");
 
-		oModelMock.expects("checkFilterOperation").withExactArgs([]);
+		oModelMock.expects("checkFilter").withExactArgs([]);
 		this.oLogMock.expects("fatal").withExactArgs("To use an ODataTreeBinding at least "
 			+ "one CountMode must be supported by the service!");
 
@@ -1179,12 +1179,12 @@ sap.ui.define([
 	QUnit.test("filter: group filters of type Application #" + i, function (assert) {
 		var oBinding = {
 				aApplicationFilters: "~oldFilters",
-				oModel: {checkFilterOperation: function () {}},
+				oModel: {checkFilter: function () {}},
 				_fireRefresh: function () {},
 				resetData: function () {}
 			};
 
-		this.mock(oBinding.oModel).expects("checkFilterOperation").withExactArgs(oFixture.filter);
+		this.mock(oBinding.oModel).expects("checkFilter").withExactArgs(oFixture.filter);
 		this.mock(FilterProcessor).expects("groupFilters")
 			.withExactArgs(sinon.match.same(oFixture.filter))
 			.exactly(oFixture.groupFilter ? 1 : 0)
@@ -1227,11 +1227,11 @@ sap.ui.define([
 			oBinding,
 			oContext = {},
 			oModel = {
-				checkFilterOperation : function () {}
+				checkFilter : function () {}
 			},
 			oModelMock = this.mock(oModel);
 
-		oModelMock.expects("checkFilterOperation").withExactArgs([oApplicationFilter]);
+		oModelMock.expects("checkFilter").withExactArgs([oApplicationFilter]);
 
 		oBinding = new ODataTreeBinding(oModel, "path", oContext, oApplicationFilter);
 
@@ -1245,7 +1245,7 @@ sap.ui.define([
 		assert.deepEqual(oBinding.aApplicationFilters, [oApplicationFilter]);
 
 		oApplicationFilter = new Filter("propertyPath", "LE", "bar");
-		oModelMock.expects("checkFilterOperation").withExactArgs(oApplicationFilter);
+		oModelMock.expects("checkFilter").withExactArgs(oApplicationFilter);
 
 		oBinding.filter(oApplicationFilter, FilterType.Application);
 
@@ -1258,7 +1258,7 @@ sap.ui.define([
 		});
 		assert.deepEqual(oBinding.aApplicationFilters, [oApplicationFilter]);
 
-		oModelMock.expects("checkFilterOperation").withExactArgs(undefined);
+		oModelMock.expects("checkFilter").withExactArgs(undefined);
 
 		oBinding.filter(undefined, FilterType.Application);
 

package/test/sap/ui/core/qunit/odata/v2/ODataV2Model.qunit.js

@@ -3083,21 +3083,17 @@ sap.ui.define([
 	});
 
 	QUnit.test("createEntry with complex types which have namespace with . characters", function(assert) {
-		var done = assert.async();
-		var oModel = initModel(sURI, {metadataUrlParams : {test: "complex"}});
-		oModel.metadataLoaded().then(function() {
-			var oContext = oModel.createEntry("BusinessPartnerSet");
+		const oModel = initModel(sURI, {metadataUrlParams: {test: "complex"}});
+		return oModel.metadataLoaded().then(function() {
+			const oContext = oModel.createEntry("BusinessPartnerSet");
 			assert.ok(oContext, "context should be created");
-			var oData = oContext.getObject();
-			assert.ok(oData, " check context data");
-			assert.ok(oData.Address, " check context data");
-			assert.ok(oData.Address.hasOwnProperty('AddressType'), " check context data");
-			assert.ok(oData.Address.hasOwnProperty('Building'), " check context data");
-			assert.ok(oData.Address.hasOwnProperty('City'), " check context data");
-			assert.ok(oData.Address.hasOwnProperty('Country'), " check context data");
-			assert.ok(oData.Address.hasOwnProperty('Street'), " check context data");
+			assert.ok(oContext.getObject(), "Entity has been created");
+			// properties of complex type can be accessed
+			assert.strictEqual(oContext.getObject("Address"), undefined);
+			assert.strictEqual(oContext.getObject("Address/City"), undefined);
+			oModel.setProperty("Address/City", "Walldorf", oContext);
+			assert.strictEqual(oContext.getObject("Address/City"), "Walldorf");
 			oModel.destroy();
-			done();
 		});
 	});
 
@@ -6716,17 +6712,17 @@ sap.ui.define([
 	});
 
 	QUnit.test("Empty Arguments", function(assert) {
-		this.oModel.checkFilterOperation();
+		this.oModel.checkFilter();
 		assert.ok(true, "No arguments lead to a positive result");
 
-		this.oModel.checkFilterOperation([]);
+		this.oModel.checkFilter([]);
 		assert.ok(true, "Empty array lead to a positive result");
 	});
 
 	QUnit.test("Simple Filters - Supported are OK", function(assert) {
 		// comma separated syntax
 		var oSupported = new Filter("x", FilterOperator.NE, "Foo");
-		this.oModel.checkFilterOperation(oSupported);
+		this.oModel.checkFilter(oSupported);
 		assert.ok(true, "Valid operators are supported");
 
 		// object syntax
@@ -6735,12 +6731,12 @@ sap.ui.define([
 			operator: FilterOperator.NE,
 			value1: "FooBar"
 		});
-		this.oModel.checkFilterOperation(oSupported2);
+		this.oModel.checkFilter(oSupported2);
 		assert.ok(true, "Valid operators are supported");
 
 		// local fnTest - comma separated (should be ignored)
 		var oSupported3 = new Filter("z", function() {});
-		this.oModel.checkFilterOperation(oSupported3);
+		this.oModel.checkFilter(oSupported3);
 		assert.ok(true, true, "local fnTest is ignored (comma separated syntax)");
 
 		// local fnTest - object syntax (should be ignored)
@@ -6748,7 +6744,7 @@ sap.ui.define([
 			path: "z",
 			test: function() {}
 		});
-		this.oModel.checkFilterOperation(oSupported4);
+		this.oModel.checkFilter(oSupported4);
 		assert.ok(true, "local fnTest is ignored (object syntax)");
 	});
 
@@ -6762,7 +6758,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported3);
+				this.oModel.checkFilter(oUnsupported3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators are not supported (object syntax)"
@@ -6777,7 +6773,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported4);
+				this.oModel.checkFilter(oUnsupported4);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators are not supported (object syntax)"
@@ -6794,7 +6790,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported3);
+				this.oModel.checkFilter(oUnsupported3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators are not supported (object syntax)"
@@ -6809,7 +6805,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oUnsupported4);
+				this.oModel.checkFilter(oUnsupported4);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators are not supported (object syntax)"
@@ -6822,7 +6818,7 @@ sap.ui.define([
 
 		// Comma separated syntax
 		var oMultiFilter2 = new Filter([oFilter1, oFilter2], false);
-		this.oModel.checkFilterOperation(oMultiFilter2);
+		this.oModel.checkFilter(oMultiFilter2);
 		assert.ok(true, "Valid operators in multi-filter are supported (comma separated syntax)");
 
 		// Object Syntax
@@ -6831,7 +6827,7 @@ sap.ui.define([
 			and: true
 		});
 
-		this.oModel.checkFilterOperation(oMultiFilter);
+		this.oModel.checkFilter(oMultiFilter);
 		assert.ok(true, "Valid operators in multi-filter are supported (object syntax)");
 	});
 
@@ -6847,7 +6843,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -6860,7 +6856,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -6870,7 +6866,7 @@ sap.ui.define([
 		var oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -6884,7 +6880,7 @@ sap.ui.define([
 		oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -6903,7 +6899,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -6916,7 +6912,7 @@ sap.ui.define([
 		});
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter);
+				this.oModel.checkFilter(oMultiFilter);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (object syntax)"
@@ -6926,7 +6922,7 @@ sap.ui.define([
 		var oMultiFilter2 = new Filter([oFilter1, oFilter2], true);
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -6941,7 +6937,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter2);
+				this.oModel.checkFilter(oMultiFilter2);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.Any),
 			"Invalid operators in multi-filter are unsupported (comma separated syntax)"
@@ -6962,7 +6958,7 @@ sap.ui.define([
 
 		var oMultiFilter3 = new Filter([oMultiFilter2, oFilter4]);
 
-		this.oModel.checkFilterOperation(oMultiFilter3);
+		this.oModel.checkFilter(oMultiFilter3);
 		assert.ok(true, "Valid operators in multi-filter are supported");
 	});
 
@@ -6985,7 +6981,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter3);
+				this.oModel.checkFilter(oMultiFilter3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported"
@@ -7019,7 +7015,7 @@ sap.ui.define([
 
 		assert.throws(
 			function() {
-				this.oModel.checkFilterOperation(oMultiFilter3);
+				this.oModel.checkFilter(oMultiFilter3);
 			}.bind(this),
 			this.getErrorWithMessage(FilterOperator.All),
 			"Invalid operators in multi-filter are unsupported"