@openui5/sap.ui.core 1.120.0 → 1.120.1

package/test/sap/ui/core/qunit/model/ClientTreeBinding.qunit.js

@@ -178,10 +178,10 @@ sap.ui.define([
 			aFilters = ["~anyFilter"],
 			oModel = {
 				_getObject : function () {},
-				checkFilterOperation : function () {}
+				checkFilter : function () {}
 			};
 
-		this.mock(oModel).expects("checkFilterOperation").withExactArgs(sinon.match.same(aFilters));
+		this.mock(oModel).expects("checkFilter").withExactArgs(sinon.match.same(aFilters));
 		this.mock(oModel).expects("_getObject")
 			.withExactArgs("~path", "~oContext")
 			.returns({/*any data*/});

package/test/sap/ui/core/qunit/model/FilterProcessor.qunit.js

@@ -402,38 +402,66 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("groupFilters with Filter.NONE", function(assert) {
-		const aFilters = [new Filter({path: 'Price', operator: FilterOperator.EQ, value1: 100}), Filter.NONE];
+	QUnit.test("groupFilters: early exit wíthout grouping, check Filter.NONE", function (assert) {
+		// code under test: early exit
+		assert.strictEqual(FilterProcessor.groupFilters(), undefined);
+		assert.strictEqual(FilterProcessor.groupFilters([]), undefined);
 
 		// code under test
-		assert.strictEqual(FilterProcessor.groupFilters(aFilters), Filter.NONE);
+		assert.strictEqual(FilterProcessor.groupFilters(["~oFilter"]), "~oFilter");
+
+		const aFilters = ["~oFilter", Filter.NONE];
+		const oError = new Error("~Filter.NONE error");
+		this.mock(Filter).expects("checkFilterNone").withExactArgs(sinon.match.same(aFilters)).throws(oError);
+
+		// code under test
+		assert.throws(() => {
+			FilterProcessor.groupFilters(aFilters);
+		}, oError);
+
 	});
 
 	//*********************************************************************************************
-	QUnit.test("combineFilters with application Filter.NONE", function(assert) {
-		const aApplicationFilters = [Filter.NONE];
-		const aControlFilters = [new Filter({path: 'Price', operator: FilterOperator.EQ, value1: 100})];
+	QUnit.test("combineFilters: filter c'tor throws error", function (assert) {
+		// code under test
+		assert.throws(() => {
+			FilterProcessor.combineFilters([Filter.NONE], [Filter.NONE]);
+		}, new Error("Filter.NONE not allowed in multiple filter"));
+	});
+
+	//*********************************************************************************************
+	QUnit.test("combineFilters: groupFilter throws error", function (assert) {
+		const aApplicationFilters = "~ApplicationFilters";
+		const oError = new Error("~Filter.NONE error");
+		const aFilters = "~Filters";
 		const oFilterProcessorMock = this.mock(FilterProcessor);
 
-		oFilterProcessorMock.expects("groupFilters").withExactArgs(aControlFilters).returns("~oGroupedFilter");
-		oFilterProcessorMock.expects("groupFilters").withExactArgs(aApplicationFilters).returns(Filter.NONE);
+		oFilterProcessorMock.expects("groupFilters").withExactArgs(aFilters).throws(oError);
+
+		// code under test
+		assert.throws(() => {
+			FilterProcessor.combineFilters(aFilters, aApplicationFilters);
+		}, oError);
+
+		oFilterProcessorMock.expects("groupFilters").withExactArgs(aFilters).returns("~someGroupedFilter");
+		oFilterProcessorMock.expects("groupFilters").withExactArgs(aApplicationFilters).throws(oError);
 
 		// code under test
-		assert.strictEqual(FilterProcessor.combineFilters(aControlFilters, aApplicationFilters), Filter.NONE);
+		assert.throws(() => {
+			FilterProcessor.combineFilters(aFilters, aApplicationFilters);
+		}, oError);
 	});
 
 	//*********************************************************************************************
-	QUnit.test("combineFilters with control Filter.NONE", function(assert) {
-		const aApplicationFilters = [new Filter({path: 'Price', operator: FilterOperator.EQ, value1: 100})];
-		const aControlFilters = [Filter.NONE];
-		const oFilterProcessorMock = this.mock(FilterProcessor);
-
-		oFilterProcessorMock.expects("groupFilters").withExactArgs(aControlFilters).returns(Filter.NONE);
-		oFilterProcessorMock.expects("groupFilters").withExactArgs(aApplicationFilters)
-			.returns("~oGroupedApplicationFilter");
+	QUnit.test("apply: propagates error from groupFilters", function (assert) {
+		const aFilters = ["~oFilter", Filter.NONE];
+		const oError = new Error("~Filter.NONE error");
+		this.mock(FilterProcessor).expects("groupFilters").withExactArgs(sinon.match.same(aFilters)).throws(oError);
 
 		// code under test
-		assert.strictEqual(FilterProcessor.combineFilters(aControlFilters, aApplicationFilters), Filter.NONE);
+		assert.throws(() => {
+			FilterProcessor.apply([/*aData*/], aFilters);
+		}, oError);
 	});
 
 	QUnit.test("apply: values contain 'toString' value", function (assert) {

package/test/sap/ui/core/qunit/model/Model.qunit.js

@@ -5,9 +5,11 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/BindingMode",
+	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
 	"sap/ui/model/Model"
-], function (Log, Message, BindingMode, Model) {
-	/*global QUnit, Set*/
+], function (Log, Message, BindingMode, Filter, FilterOperator, Model) {
+	/*global QUnit, sinon*/
 	/*eslint max-nested-callbacks: 0*/
 	"use strict";
 
@@ -241,4 +243,43 @@ sap.ui.define([
 		assert.strictEqual(oModel.bForceUpdate, undefined);
 		assert.strictEqual(oModel.sUpdateTimer, null);
 	});
+
+	//*********************************************************************************************
+	QUnit.test("checkFilter: success", function (assert) {
+		const oFilter = new Filter({path: 'Price', operator: FilterOperator.EQ, value1: 100});
+		this.mock(Filter).expects("checkFilterNone").withExactArgs(sinon.match.same(oFilter));
+		const oModel = new Model();
+		this.mock(Model).expects("_traverseFilter").withExactArgs(sinon.match.same(oFilter), sinon.match.func)
+			.callsArgOnWith(1, oModel, oFilter);
+
+		// code under test
+		oModel.checkFilter(oFilter);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("checkFilter: throws error", function (assert) {
+		const oError = new Error("~Error");
+		const oFilter = new Filter({path: 'Price', operator: FilterOperator.EQ, value1: 100});
+		const oFilterMock = this.mock(Filter);
+		oFilterMock.expects("checkFilterNone").withExactArgs(sinon.match.same(oFilter))
+			.throws(oError);
+		const oModelMock = this.mock(Model);
+		oModelMock.expects("_traverseFilter").never();
+
+		const oModel = new Model();
+		// code under test
+		assert.throws(function () {
+			oModel.checkFilter(oFilter);
+		}, oError);
+
+		oModel.mUnsupportedFilterOperators["EQ"] = true;
+		oFilterMock.expects("checkFilterNone").withExactArgs(sinon.match.same(oFilter));
+		oModelMock.expects("_traverseFilter").withExactArgs(oFilter, sinon.match.func)
+			.callsArgOnWith(1, oModel, oFilter);
+
+		// code under test
+		assert.throws(function () {
+			oModel.checkFilter(oFilter);
+		}, new Error("Filter instances contain an unsupported FilterOperator: EQ"));
+	});
 });

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

@@ -1939,17 +1939,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
@@ -1958,12 +1958,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)
@@ -1971,7 +1971,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)");
 	});
 
@@ -1985,7 +1985,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)"
@@ -2000,7 +2000,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)"
@@ -2017,7 +2017,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)"
@@ -2032,7 +2032,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)"
@@ -2049,7 +2049,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)");
 	});
 
@@ -2065,7 +2065,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)"
@@ -2078,7 +2078,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)"
@@ -2088,7 +2088,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)"
@@ -2102,7 +2102,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)"
@@ -2121,7 +2121,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)"
@@ -2134,7 +2134,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)"
@@ -2144,7 +2144,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)"
@@ -2159,7 +2159,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)"
@@ -2180,7 +2180,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");
 	});
 
@@ -2203,7 +2203,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"
@@ -2237,7 +2237,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"

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/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);