@openui5/sap.ui.core 1.119.1 → 1.120.1

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 = {
@@ -42,12 +42,13 @@ sap.ui.define([
 				operationMode : OperationMode.Client,
 				rootLevel : 23,
 				threshold : 77,
+				transitionMessagesOnly : "truthy",
 				usePreliminaryContext : "bUsePreliminaryContext",
 				useServersideApplicationFilters : "bUseServersideApplicationFilters"
 			},
 			aSorters = [new Sorter("propertyPath")];
 
-		this.mock(oModel).expects("checkFilterOperation")
+		this.mock(oModel).expects("checkFilter")
 			.withExactArgs(sinon.match.same(aApplicationFilters));
 
 		// code under test
@@ -92,28 +93,28 @@ sap.ui.define([
 		assert.strictEqual(oBinding.bUseServersideApplicationFilters,
 			"bUseServersideApplicationFilters");
 		assert.strictEqual(oBinding.bUsePreliminaryContext, "bUsePreliminaryContext");
+		assert.strictEqual(oBinding.bTransitionMessagesOnly, true);
 	});
 
-
 	//*********************************************************************************************
 	QUnit.test("constructor: with single Filter object", function (assert) {
 		var oApplicationFilter = new Filter("propertyPath", "GE", "foo"),
 			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);
@@ -125,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);
@@ -143,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);
@@ -168,8 +169,9 @@ sap.ui.define([
 		assert.strictEqual(oBinding.iThreshold, 0);
 		assert.strictEqual(oBinding.bUseServersideApplicationFilters, false);
 		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,
@@ -177,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!");
 
@@ -543,10 +545,12 @@ sap.ui.define([
 		var oBinding = {
 				oModel : {read : function () {}},
 				mRequestHandles : {},
+				_getHeaders() {},
 				getResolvedPath : function () {}
 			};
 
 		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~resolvedPath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		this.mock(oBinding.oModel).expects("read")
 			.withExactArgs("~resolvedPath", sinon.match.object.and(sinon.match.has("groupId"))
 				.and(sinon.match.has("success")).and(sinon.match.has("error")))
@@ -733,6 +737,7 @@ sap.ui.define([
 			oBinding = {
 				sGroupId : "~sGroupId",
 				oModel : oModel,
+				_getHeaders() {},
 				_getNavPath : function () {},
 				_processODataObject : function () {},
 				getPath : function () {},
@@ -745,8 +750,9 @@ sap.ui.define([
 			};
 
 		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~resolvedPath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		oExpectation = this.mock(oModel).expects("read").withExactArgs("~resolvedPath", {
-			error : sinon.match.func, groupId : "~sGroupId", success : sinon.match.func
+			error : sinon.match.func, groupId : "~sGroupId", headers : "~headers", success : sinon.match.func
 		}).returns("~readHandle");
 
 		// code under test
@@ -783,6 +789,7 @@ sap.ui.define([
 				oModel : oModel,
 				oRootContext : "~oldRootContext",
 				mRequestHandles : {},
+				_getHeaders() {},
 				fireDataReceived : function () {},
 				getResolvedPath : function () {}
 			},
@@ -790,8 +797,9 @@ sap.ui.define([
 			oExpectation;
 
 		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~resolvedPath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		oExpectation = this.mock(oModel).expects("read").withExactArgs("~resolvedPath", {
-			error : sinon.match.func, groupId : "~sGroupId", success : sinon.match.func
+			error : sinon.match.func, groupId : "~sGroupId", headers : "~headers", success : sinon.match.func
 		}).returns("~readHandle");
 
 		// code under test
@@ -1098,13 +1106,16 @@ sap.ui.define([
 				bSkipDataEvents : true,
 				aSorters : "~sorters",
 				iTotalCollectionCount : "~count",
+				_getHeaders() {},
 				getResolvedPath : function () {}
 			},
 			aUrlParams = ["~custom"];
 
 		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~resolvedPath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		this.mock(oBinding.oModel).expects("read")
 			.withExactArgs("~resolvedPath", {
+				headers : "~headers",
 				urlParameters : sinon.match.same(aUrlParams)
 					.and(sinon.match(["~custom", "$top=~count"])),
 				success : sinon.match.func,
@@ -1130,13 +1141,16 @@ sap.ui.define([
 				bSkipDataEvents : true,
 				aSorters : "~sorters",
 				iTotalCollectionCount : vTotalCollectionCount,
+				_getHeaders() {},
 				getResolvedPath : function () {}
 			},
 			aUrlParams = ["~custom"];
 
 		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~resolvedPath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
 		this.mock(oBinding.oModel).expects("read")
 			.withExactArgs("~resolvedPath", {
+				headers : "~headers",
 				urlParameters : sinon.match.same(aUrlParams)
 					.and(sinon.match(["~custom"])),
 				success : sinon.match.func,
@@ -1165,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)
@@ -1213,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);
 
@@ -1231,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);
 
@@ -1244,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);
 
@@ -1252,4 +1266,181 @@ sap.ui.define([
 		assert.deepEqual(oBinding.getFilterInfo(), null);
 		assert.deepEqual(oBinding.aApplicationFilters, []);
 	});
+
+	//*********************************************************************************************
+	QUnit.test("_loadSubTree: success case", function (assert) {
+		var oLoadSubTreePromise, oReadExpectation,
+			oBinding = {
+				bHasTreeAnnotations: true,
+				oModel: {
+					callAfterUpdate: function () {},
+					getKey: function () {},
+					read: function () {}
+				},
+				mRequestHandles: {},
+				bSkipDataEvents: true,
+				aSorters: "~aSorters",
+				_createKeyMap: function () {},
+				_getHeaders() {},
+				_importCompleteKeysHierarchy: function () {},
+				_updateNodeKey: function () {},
+				getResolvedPath: function () {}
+			},
+			oBindingMock = this.mock(oBinding),
+			oData = {results: ["~oData"]},
+			oModelMock = this.mock(oBinding.oModel),
+			aParams = ["~sTreeBindingParams"];
+
+		oBindingMock.expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		oBindingMock.expects("_getHeaders").withExactArgs().returns("~headers");
+		oReadExpectation = oModelMock.expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: sinon.match.func,
+				groupId: undefined,
+				headers: "~headers",
+				sorters: "~aSorters",
+				success: sinon.match.func,
+				urlParameters: sinon.match.same(aParams)
+			})
+			.returns("~oReadHandle");
+
+		// code under test
+		oLoadSubTreePromise = ODataTreeBinding.prototype._loadSubTree.call(oBinding, "~oNode", aParams);
+
+		assert.deepEqual(oBinding.mRequestHandles, {"loadSubTree-~sTreeBindingParams": "~oReadHandle"});
+
+		oModelMock.expects("getKey").withExactArgs("~oData").returns("~sParentKey");
+		oBindingMock.expects("_updateNodeKey").withExactArgs("~oNode", "~sParentKey");
+		oBindingMock.expects("_createKeyMap").withExactArgs(sinon.match.same(oData.results), true).returns("~mKeys");
+		oBindingMock.expects("_importCompleteKeysHierarchy").withExactArgs("~mKeys");
+		oModelMock.expects("callAfterUpdate").withExactArgs(sinon.match.func);
+
+		// code under test
+		oReadExpectation.args[0][1].success(oData);
+
+		assert.deepEqual(oBinding.mRequestHandles, {});
+		assert.deepEqual(oBinding.bNeedsUpdate, true);
+
+		return oLoadSubTreePromise.then(function (oData0) {
+			assert.strictEqual(oData0, oData);
+		});
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_loadSubNodes: calls _getHeaders", function (assert) {
+		const oBinding = {
+			oFinalLengths: {"~sNodeId": 5},
+			oModel: {
+				read() {}
+			},
+			mRequestHandles: {},
+			bSkipDataEvents: true,
+			_getHeaders() {}
+		};
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
+		this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sNodeId", {
+				error: sinon.match.func,
+				groupId: undefined, // not relevant for this test
+				headers: "~headers",
+				sorters: undefined, // not relevant for this test
+				success: sinon.match.func,
+				urlParameters: "~aParams"
+			})
+			.returns("~oReadHandle");
+
+		// code under test - start index, length and threshold are not relevant for this use case
+		ODataTreeBinding.prototype._loadSubNodes.call(oBinding, "~sNodeId", /*iStartIndex*/undefined,
+			/*iLength*/undefined, /*iThreshold*/undefined, "~aParams");
+
+		assert.strictEqual(oBinding.bSkipDataEvents, false);
+		assert.deepEqual(oBinding.mRequestHandles, {"~sNodeId-undefined-undefined-undefined": "~oReadHandle"});
+	});
+	/** @deprecated As of version 1.120.0, reason OperationMode.Auto */
+	QUnit.test("_getCountForCollection: calls _getHeaders", function () {
+		const oBinding = {
+			sCountMode: CountMode.Inline,
+			bHasTreeAnnotations: true,
+			oModel: {
+				read() {}
+			},
+			sOperationMode: OperationMode.Auto,
+			_getHeaders() {},
+			getResolvedPath() {}
+		};
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		this.mock(oBinding).expects("_getHeaders").withExactArgs().returns("~headers");
+		this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath", {
+				error: sinon.match.func,
+				groupId: undefined, // not relevant for this test
+				headers: "~headers",
+				success: sinon.match.func,
+				urlParameters: ["$top=0", "$inlinecount=allpages"]
+			});
+
+		// code under test
+		ODataTreeBinding.prototype._getCountForCollection.call(oBinding);
+	});
+	/** @deprecated As of version 1.120.0, reason OperationMode.Auto */
+	QUnit.test("_getCountForCollection: don't call _getHeaders for $count request", function () {
+		const oBinding = {
+			sCountMode: CountMode.Request,
+			bHasTreeAnnotations: true,
+			oModel: {
+				read() {}
+			},
+			sOperationMode: OperationMode.Auto,
+			getResolvedPath() {}
+		};
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sAbsolutePath");
+		this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sAbsolutePath/$count", {
+				error: sinon.match.func,
+				groupId: undefined, // not relevant for this test
+				headers: undefined,
+				success: sinon.match.func,
+				urlParameters: []
+			});
+
+		// code under test
+		ODataTreeBinding.prototype._getCountForCollection.call(oBinding);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("_getCountForNodeId: don't call _getHeaders for $count request", function () {
+		const oBinding = {
+			oModel: {
+				read() {}
+			},
+			getFilterParams() {}
+		};
+		this.mock(oBinding).expects("getFilterParams").withExactArgs().returns(undefined);
+		this.mock(oBinding.oModel).expects("read")
+			.withExactArgs("~sNodeId/$count", {
+				error: sinon.match.func,
+				groupId: undefined, // not relevant for this test
+				sorters: undefined, // not relevant for this test
+				success: sinon.match.func,
+				urlParameters: []
+			});
+
+		// code under test
+		ODataTreeBinding.prototype._getCountForNodeId.call(oBinding, "~sNodeId");
+	});
+
+	//*********************************************************************************************
+[
+	{bTransitionMessagesOnly: true, result: {"sap-messages": "transientOnly"}},
+	{bTransitionMessagesOnly: false, result: undefined}
+].forEach((oFixture) => {
+	QUnit.test("_getHeaders: bTransitionMessagesOnly=" + oFixture.bTransitionMessagesOnly, function (assert) {
+		const oBinding = {
+			bTransitionMessagesOnly: oFixture.bTransitionMessagesOnly
+		};
+
+		// code under test
+		assert.deepEqual(ODataTreeBinding.prototype._getHeaders.call(oBinding), oFixture.result);
+	});
+});
 });

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"

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

@@ -15,9 +15,10 @@ sap.ui.define([
 	"sap/ui/model/DataState",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/odata/v2/ODataModel",
+	"sap/ui/model/type/Currency",
 	"sap/ui/model/type/Float"
 ], function(deepEqual, deepExtend, Button, Input, Text, Configuration, library, Messaging, ControlMessageProcessor,
-		Message, MockServer, VerticalLayout, DataState, JSONModel, ODataModel, Float) {
+		Message, MockServer, VerticalLayout, DataState, JSONModel, ODataModel, Currency, Float) {
 	"use strict";
 
 	// shortcut for sap.ui.core.MessageType
@@ -1565,7 +1566,7 @@ sap.ui.define([
 					{ path: "/ProductSet('AD-1000')/Price" },
 					{ path: "/ProductSet('AD-1000')/CurrencyCode" }
 				],
-				type: 'sap.ui.model.type.Currency'
+				type: Currency.getMetadata().getName()
 			}
 		});
 		//let the message manager control the vertical layout for messages