@openui5/sap.ui.core 1.117.1 → 1.119.0

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

@@ -5,6 +5,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/core/Configuration",
+	"sap/ui/core/Messaging",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/message/Message",
 	"sap/ui/model/_Helper",
@@ -25,7 +26,7 @@ sap.ui.define([
 	"sap/ui/model/odata/v2/ODataListBinding",
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/odata/v2/ODataTreeBinding"
-], function (Log, SyncPromise, Configuration, UI5Date, Message, _Helper, BaseContext,
+], function (Log, SyncPromise, Configuration, Messaging, UI5Date, Message, _Helper, BaseContext,
 		FilterProcessor, Model, _ODataMetaModelUtils, CountMode, MessageScope, ODataMessageParser,
 		ODataMetaModel, ODataPropertyBinding, ODataUtils, _CreatedContextsCache, Context,
 		ODataAnnotations, ODataContextBinding, ODataListBinding, ODataModel, ODataTreeBinding
@@ -186,8 +187,8 @@ sap.ui.define([
 		this.mock(ODataModel.prototype).expects("_createMetadataUrl")
 			.withExactArgs("/$metadata")
 			.returns("~metadataUrl");
-		oDataModelMock.expects("_getSharedData").withExactArgs("server", "~serverUrl").returns(undefined);
-		oDataModelMock.expects("_getSharedData").withExactArgs("service", "~serviceUrl").returns(undefined);
+		oDataModelMock.expects("_getSharedData").withExactArgs("server", "~serverUrl").returns({});
+		oDataModelMock.expects("_getSharedData").withExactArgs("service", "~serviceUrl").returns({});
 		oDataModelMock.expects("_getSharedData").withExactArgs("meta", "~metadataUrl").returns(oMetadata);
 		this.mock(ODataModel.prototype).expects("_cacheSupported").withExactArgs("~metadataUrl").returns(false);
 		this.mock(ODataModel.prototype).expects("_getAnnotationCacheKey")
@@ -215,6 +216,77 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+[{
+	parameter : undefined, // value for tokenHandling c'tor parameter
+	member : true, // expected value for bTokenHandling member of model instance
+	headerIsSet : true // whether the x-csrf-token request header is expected to be set
+}, {
+	parameter : false,
+	member : false,
+	headerIsSet : false
+}, {
+	parameter : "skipServerCache",
+	member : true,
+	headerIsSet : false
+}].forEach((oFixture) => {
+	QUnit.test("constructor: tokenHandling=" + oFixture.parameter, function (assert) {
+		const mParameters = {
+				serviceUrl : "~serviceUrl",
+				tokenHandling : oFixture.parameter
+			};
+		this.mock(ODataModel.prototype).expects("createCodeListModelParameters")
+			.withExactArgs(sinon.match.same(mParameters))
+			.returns("~codeListModelParameters");
+		this.mock(ODataModel.prototype).expects("setDeferredGroups").withExactArgs(["changes"]);
+		this.mock(ODataModel.prototype).expects("setChangeGroups").withExactArgs({"*":{groupId: "changes"}});
+		this.mock(ODataModel.prototype).expects("setHeaders").withExactArgs(undefined)
+			.callThrough(/*initializes this.mCustomHeaders*/);
+		this.mock(ODataModel.prototype).expects("_getServerUrl")
+		    .exactly(oFixture.parameter === "skipServerCache" ? 0 : 1)
+			.withExactArgs()
+			.returns("~serverUrl");
+		this.mock(ODataModel.prototype).expects("_createMetadataUrl")
+			.withExactArgs("/$metadata")
+			.returns("~metadataUrl");
+		const oDataModelMock = this.mock(ODataModel);
+		const oServerCache = {securityToken : "~token"};
+		oDataModelMock.expects("_getSharedData")
+			.exactly(oFixture.parameter === "skipServerCache" ? 0 : 1)
+			.withExactArgs("server", "~serverUrl")
+			.returns(oServerCache);
+		oDataModelMock.expects("_getSharedData").withExactArgs("service", "~serviceUrl").returns({});
+		const oMetadata = {
+			oMetadata : {
+				isLoaded : function () {},
+				loaded : function () {}
+			}
+		};
+		oDataModelMock.expects("_getSharedData").withExactArgs("meta", "~metadataUrl").returns(oMetadata);
+		this.mock(ODataModel.prototype).expects("_cacheSupported").withExactArgs("~metadataUrl").returns(false);
+		this.mock(ODataModel.prototype).expects("_getAnnotationCacheKey")
+			.withExactArgs("~metadataUrl")
+			.returns(undefined);
+		// called in ODataModel#constructor and ODataAnnotations#constructor
+		const oPromise = Promise.resolve("~metadata");
+		this.mock(oMetadata.oMetadata).expects("loaded").withExactArgs().exactly(3).returns(oPromise);
+		this.mock(oMetadata.oMetadata).expects("isLoaded").withExactArgs().returns(true);
+		this.mock(ODataModel.prototype).expects("_initializeMetadata").withExactArgs();
+		this.mock(ODataAnnotations.prototype).expects("addSource")
+			.withExactArgs([{type : "xml", data : sinon.match.instanceOf(Promise)}]);
+		this.mock(Configuration).expects("getLanguageTag").withExactArgs().returns("~languageTag");
+
+		// code under test
+		const oModel = new ODataModel(mParameters);
+
+		assert.strictEqual(oModel.bTokenHandling, oFixture.member);
+		assert.deepEqual(oModel.oSharedServerData, oFixture.parameter === "skipServerCache" ? undefined : oServerCache);
+		assert.strictEqual(oModel.oHeaders["x-csrf-token"], oFixture.headerIsSet ? "~token" : undefined);
+
+		return oPromise;
+	});
+});
+
 	//*********************************************************************************************
 	QUnit.test("_read: updateAggregatedMessages and bSideEffects are passed to _createRequest",
 			function (assert) {
@@ -6308,6 +6380,54 @@ sap.ui.define([
 		assert.strictEqual(oModel.bTokenHandling, false);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("refreshSecurityToken: no server cache for tokenHandling='skipServerCache'", function (assert) {
+		const oModel = {
+				bDisableHeadRequestForToken : true,
+				_createRequest() {},
+				_createRequestUrlWithNormalizedPath() {},
+				_getHeader() {},
+				_getHeaders() {},
+				_request() {},
+				_setSessionContextIdHeader() {},
+				getServiceMetadata() {},
+				oHeaders : {},
+				oSharedServiceData : {}
+			};
+		const oModelMock = this.mock(oModel);
+		const oRequest = {headers : {}};
+		const oResponse = {headers : "~responseHdrs"};
+
+		oModelMock.expects("_createRequestUrlWithNormalizedPath").withExactArgs("/").returns("~sUrl");
+		oModelMock.expects("_getHeaders").withExactArgs(undefined, true).returns("~headers");
+		oModelMock.expects("_createRequest")
+			.withExactArgs("~sUrl", "", "GET", "~headers", null, null, false)
+			.returns(oRequest);
+		oModelMock.expects("getServiceMetadata").withExactArgs().returns("~serviceMetadata");
+		const oRequestCall = oModelMock.expects("_request")
+			.withExactArgs(sinon.match.same(oRequest), sinon.match.func, sinon.match.func, undefined, undefined,
+				"~serviceMetadata")
+			.returns("~requestHandle");
+
+		// code under test - parameters fnSuccess, fnError and bAsync are not relevant for this test
+		const oResult = ODataModel.prototype.refreshSecurityToken.call(oModel);
+
+		assert.strictEqual(oResult.request, "~requestHandle");
+
+		oModelMock.expects("_getHeader").withExactArgs("x-csrf-token", "~responseHdrs").returns("~token");
+		oModelMock.expects("_getHeader").withExactArgs("sap-contextid", "~responseHdrs").returns("~contextId");
+		oModelMock.expects("_setSessionContextIdHeader").withExactArgs("~contextId");
+
+		// code under test - call success handler handleSuccess
+		oRequestCall.args[0][1]("~oData", oResponse);
+
+		assert.strictEqual(oModel.oSharedServiceData.securityToken, "~token");
+		assert.strictEqual(oModel.oHeaders["x-csrf-token"], "~token");
+		return oModel.pSecurityToken.then((sToken) => {
+			assert.strictEqual(sToken, "~token");
+		});
+	});
+
 	//*********************************************************************************************
 	QUnit.test("getContext", function (assert) {
 		var oContext, oContext1,
@@ -6656,7 +6776,7 @@ sap.ui.define([
 	QUnit.test(sTitle, function (assert) {
 		var oFindAndRemoveContext, oRemoveEntity, fnResolve,
 			oContext = {removeFromTransientParent : function () {}},
-			oMessageManagerMock = this.mock(sap.ui.getCore().getMessageManager()),
+			oMessagingMock = this.mock(Messaging),
 			oMetadata = {
 				loaded : function () {}
 			},
@@ -6711,7 +6831,7 @@ sap.ui.define([
 		oModelMock.expects("getMessagesByEntity")
 			.withExactArgs("~sKey", !bDeleteEntity)
 			.returns("~aMessages");
-		oMessageManagerMock.expects("removeMessages").withExactArgs("~aMessages");
+		oMessagingMock.expects("removeMessages").withExactArgs("~aMessages");
 
 		// code under test
 		assert.strictEqual(
@@ -6768,7 +6888,7 @@ sap.ui.define([
 		this.mock(oModel).expects("getMessagesByEntity")
 			.withExactArgs("~sKey", false)
 			.returns("~aMessages");
-		this.mock(sap.ui.getCore().getMessageManager()).expects("removeMessages")
+		this.mock(Messaging).expects("removeMessages")
 			.withExactArgs("~aMessages");
 
 		// code under test
@@ -8707,4 +8827,27 @@ sap.ui.define([
 		ODataModel.prototype._isReloadNeeded.call(oModel, "~path", oFixture.parameters);
 	});
 });
+
+	/** @deprecated As of version 1.32.0 */
+	//*********************************************************************************************
+	QUnit.test("setDeferredBatchGroups", function (assert) {
+		const oModel = {setDeferredGroups() {}};
+
+		this.mock(oModel).expects("setDeferredGroups").withExactArgs("~mParameters");
+
+		// code under test
+		ODataModel.prototype.setDeferredBatchGroups.call(oModel, "~mParameters");
+	});
+
+	/** @deprecated As of version 1.32.0 */
+	//*********************************************************************************************
+	QUnit.test("setChangeBatchGroups", function (assert) {
+		const oModel = {setChangeGroups() {}};
+
+		this.mock(oModel).expects("setChangeGroups")
+			.withExactArgs({"*" : {batchGroupId : "~groupId", groupId: "~groupId"}});
+
+		// code under test
+		ODataModel.prototype.setChangeBatchGroups.call(oModel, {"*" : {batchGroupId : "~groupId"}});
+	});
 });

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

@@ -208,6 +208,27 @@ sap.ui.define([
 		// code under test - parameters are not relevant for this test
 		assert.strictEqual(ODataTreeBindingFlat.prototype.createEntry.call(oBinding), undefined);
 	});
+
+	//*********************************************************************************************
+[{
+	parameters: {expand : "~expand"},
+	error: new Error("Parameter 'expand' is not supported")
+ }, {
+	parameters: {inactive : "~inactive"},
+	error: new Error("Parameter 'inactive' is not supported")
+}].forEach((oFixture) => {
+	QUnit.test("createEntry: unsupported parameter", function (assert) {
+		const oBinding = {
+				getResolvedPath() {}
+			};
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("~sPath");
+
+		assert.throws(() => {
+			// code under test
+			ODataTreeBindingFlat.prototype.createEntry.call(oBinding, oFixture.parameters);
+		}, oFixture.error );
+	});
+});
 	/**
 	 * @deprecated As of version 1.104.0
 	 */

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

@@ -882,8 +882,7 @@ sap.ui.define([
 				"~ilength", "~iThreshold"),
 			"~V2Context[]");
 	});
-
-	//*********************************************************************************************
+	/** @deprecated As of version 1.102.0, reason OperationMode.Auto */
 	QUnit.test("_getContextsForNodeId: with operation mode 'Auto' and without"
 			+ " iTotalCollectionCount", function (assert) {
 		var oBinding = {

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

@@ -13,13 +13,12 @@ sap.ui.define([
 	"sap/ui/model/FilterType",
 	"sap/ui/model/Sorter",
 	"sap/ui/model/odata/CountMode",
-	"sap/ui/model/odata/Filter",
 	"sap/ui/model/odata/OperationMode",
 	"sap/ui/model/odata/v2/ODataModel",
 	"test-resources/sap/ui/core/qunit/odata/data/ODataModelFakeService"
 ], function(Log, each, extend, DisplayListItem, List, Panel, StandardListItem, Filter,
-	FilterOperator, FilterProcessor, FilterType, Sorter, CountMode, ODataFilter, OperationMode,
-	ODataModel, fakeService) {
+	FilterOperator, FilterProcessor, FilterType, Sorter, CountMode, OperationMode, ODataModel,
+	fakeService) {
 	"use strict";
 
 	var oModel;
@@ -1038,41 +1037,6 @@ sap.ui.define([
 			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "startsWith, endsWith filtered content");
 
 			oBinding.detachChange(handler3);
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.LE, value1: "Z"}, {operator:FilterOperator.GE, value1: "A"}, {operator:FilterOperator.NE, value1: "Beverages"}]);
-			oBinding.filter([oFilter]);
-			oBinding.attachChange(handler4);
-		};
-		var handler4 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 7, "ODataFilter, ANDed");
-			assert.ok(oModel.getProperty("CategoryName",aFilteredContexts[0]) != "Beverages" && oModel.getProperty("CategoryName",aFilteredContexts[0]) == "Condiments", "ODataFilter, ANDed");
-
-			oBinding.detachChange(handler4);
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.EQ, value1: "Condiments"}, {operator:FilterOperator.EQ, value1: "Beverages"}], false);
-			oBinding.filter([oFilter]);
-			oBinding.attachChange(handler5);
-		};
-		var handler5 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 2, "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Beverages", "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[1]), "Condiments", "ODataFilter, ORed");
-
-			oBinding.detachChange(handler5);
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.EQ, value1: "Condiments"}, {operator:FilterOperator.EQ, value1: "Beverages"}], false);
-			oFilter2 = new Filter("Description", FilterOperator.EndsWith, "ings");
-			oBinding.filter([oFilter, oFilter2]);
-			oBinding.attachChange(handler6);
-		};
-		var handler6 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 1, "ODataFilter + normal Filter");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "ODataFilter + normal Filter");
-
-			oBinding.detachChange(handler6);
 			//check (ProductID=male AND (SupplierID = Green OR (CategoryName = Peter OR CategoryName = Frank OR CategoryName = Gina)))
 			var oFilter1 = new Filter("CategoryName", FilterOperator.EQ, "Beverages");
 			var oFilter2 = new Filter("CategoryName", FilterOperator.EQ, "Dairy Products");
@@ -1083,14 +1047,13 @@ sap.ui.define([
 			var oFilter5 = new Filter("Description", FilterOperator.EndsWith, "s");
 			var oMultiFilter3 = new Filter([oMultiFilter2, oFilter5], true);
 			oBinding.filter(oMultiFilter3);
-			oBinding.attachChange(handler7);
+			oBinding.attachChange(handler4);
 		};
-		var handler7 = function(oEvent){
+		var handler4 = function(oEvent){
 			// contexts should be now loaded
 			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 3, "ODataFilter + normal Filter");
-			//assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "ODataFilter + normal Filter");
-			oBinding.detachChange(handler7);
+			assert.equal(aFilteredContexts.length, 3, "normal Filter");
+			oBinding.detachChange(handler4);
 			done();
 		};
 
@@ -1346,33 +1309,6 @@ sap.ui.define([
 			assert.equal(oModel.getProperty("CategoryName", aFilteredContexts[3]), "Produce", "not startsWith and not endsWith filtered content");
 			assert.equal(oModel.getProperty("CategoryName", aFilteredContexts[4]), "Seafood", "not startsWith and not endsWith filtered content");
 
-
-			// ANDed filters
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.LE, value1: "Z"}, {operator:FilterOperator.GE, value1: "A"}, {operator:FilterOperator.NE, value1: "Beverages"}]);
-			oBinding.filter([oFilter]);
-
-			aFilteredContexts = oBinding.getContexts();
-			assert.equal(aFilteredContexts.length, 7, "ODataFilter, ANDed");
-			assert.ok(oModel.getProperty("CategoryName",aFilteredContexts[0]) != "Beverages" && oModel.getProperty("CategoryName",aFilteredContexts[0]) == "Condiments", "ODataFilter, ANDed");
-
-			// ORed filters
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.EQ, value1: "Condiments"}, {operator:FilterOperator.EQ, value1: "Beverages"}], false);
-			oBinding.filter([oFilter]);
-
-			aFilteredContexts = oBinding.getContexts();
-			assert.equal(aFilteredContexts.length, 2, "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Beverages", "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[1]), "Condiments", "ODataFilter, ORed");
-
-			// ORed + ANDed filters
-			oFilter = new ODataFilter("CategoryName", [{operator:FilterOperator.EQ, value1: "Condiments"}, {operator:FilterOperator.EQ, value1: "Beverages"}], false);
-			oFilter2 = new Filter("Description", FilterOperator.EndsWith, "ings");
-			oBinding.filter([oFilter, oFilter2]);
-
-			aFilteredContexts = oBinding.getContexts();
-			assert.equal(aFilteredContexts.length, 1, "ODataFilter + normal Filter");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "ODataFilter + normal Filter");
-
 			//check (ProductID=male AND (SupplierID = Green OR (CategoryName = Peter OR CategoryName = Frank OR CategoryName = Gina)))
 			var oFilter1 = new Filter("CategoryName", FilterOperator.EQ, "Beverages");
 			var oFilter2 = new Filter("CategoryName", FilterOperator.EQ, "Dairy Products");
@@ -1385,7 +1321,7 @@ sap.ui.define([
 			oBinding.filter(oMultiFilter3);
 
 			aFilteredContexts = oBinding.getContexts();
-			assert.equal(aFilteredContexts.length, 3, "ODataFilter + normal Filter");
+			assert.equal(aFilteredContexts.length, 3, "normal Filter");
 
 			done();
 		};
@@ -2230,141 +2166,6 @@ sap.ui.define([
 		oList.getBinding("items").attachChange(fnChangeHandler);
 	});
 
-
-	QUnit.test("ListBinding filter (ODataFilter.convert)", function(assert){
-		var done = assert.async();
-		var oFilter, oFilter2;
-		var handler = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 1, "EQ filtered content length");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Beverages", "EQ filtered content");
-
-			oBinding.detachChange(handler);
-			// NE, contains
-			oFilter = new ODataFilter("CategoryName", [{
-				operator: FilterOperator.EQ,
-				value1: "Condiments"
-			}, {
-				operator: FilterOperator.Contains,
-				value1: "ons"
-			}], false);
-			oBinding.filter(oFilter.convert());
-			oBinding.attachChange(handler1);
-		};
-		var handler1 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 2, "NE, contains, filtered content length");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "EQ, Contains, filtered content");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[1]), "Confections", "EQ, Contains, filtered content");
-
-			oBinding.detachChange(handler1);
-			// between
-			oFilter = new ODataFilter("CategoryName", [{
-				operator: FilterOperator.BT,
-				value1: "Beverages",
-				value2: "D"
-			}]);
-			oBinding.filter(oFilter.convert());
-			oBinding.attachChange(handler2);
-		};
-		var handler2 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 3, "between filtered content length");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Beverages", "between filtered content");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[1]), "Condiments", "between filtered content");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[2]), "Confections", "between filtered content");
-
-			oBinding.detachChange(handler2);
-			// startsWith, endsWith
-			oFilter = new ODataFilter("CategoryName", [{operator: FilterOperator.StartsWith, value1: "C"}]);
-			oFilter2 = new ODataFilter("Description", [{operator: FilterOperator.EndsWith, value1: "ngs"}]);
-			oBinding.filter([oFilter.convert(), oFilter2.convert()]);
-			oBinding.attachChange(handler3);
-		};
-		var handler3 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 1, "startsWith, endsWith filtered content length");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "startsWith, endsWith filtered content");
-
-			oBinding.detachChange(handler3);
-			oFilter = new ODataFilter("CategoryName", [{
-				operator:FilterOperator.LE,
-				value1: "Z"
-			}, {
-				operator:FilterOperator.GE,
-				value1: "A"
-			}, {
-				operator:FilterOperator.NE,
-				value1: "Beverages"
-			}]);
-			oBinding.filter(oFilter.convert());
-			oBinding.attachChange(handler4);
-		};
-		var handler4 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 7, "ODataFilter, ANDed");
-			assert.ok(oModel.getProperty("CategoryName",aFilteredContexts[0]) != "Beverages" && oModel.getProperty("CategoryName",aFilteredContexts[0]) == "Condiments", "ODataFilter, ANDed");
-
-			oBinding.detachChange(handler4);
-			oFilter = new ODataFilter("CategoryName", [{
-				operator:FilterOperator.EQ,
-				value1: "Condiments"
-			}, {
-				operator:FilterOperator.EQ,
-				value1: "Beverages"
-			}], false);
-			oBinding.filter(oFilter.convert());
-			oBinding.attachChange(handler5);
-		};
-		var handler5 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 2, "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Beverages", "ODataFilter, ORed");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[1]), "Condiments", "ODataFilter, ORed");
-
-			oBinding.detachChange(handler5);
-			oFilter = new ODataFilter("CategoryName", [{
-				operator:FilterOperator.EQ, value1: "Condiments"
-			}, {
-				operator:FilterOperator.EQ, value1: "Beverages"
-			}], false);
-			oFilter2 = new ODataFilter("Description", [{
-				operator: FilterOperator.EndsWith,
-				value1: "ings"
-			}]);
-			oBinding.filter([oFilter.convert(), oFilter2.convert()]);
-			oBinding.attachChange(handler6);
-		};
-		var handler6 = function(oEvent){
-			// contexts should be now loaded
-			var aFilteredContexts = oEvent.oSource.getContexts();
-			assert.equal(aFilteredContexts.length, 1, "ODataFilter + normal Filter");
-			assert.equal(oModel.getProperty("CategoryName",aFilteredContexts[0]), "Condiments", "ODataFilter + normal Filter");
-
-			oBinding.detachChange(handler6);
-			done();
-		};
-		var oBinding = oModel.bindList("/Categories");
-		//check EQ
-		var oFilter = new ODataFilter("CategoryName", [{
-			operator: FilterOperator.EQ,
-			value1: "Beverages"
-		}]);
-		var fnFilter = function() {
-			oBinding.detachRefresh(fnFilter);
-			oBinding.attachRefresh(function() {oBinding.getContexts();});
-			oBinding.filter(oFilter.convert());
-		};
-		oBinding.attachChange(handler);
-		oBinding.attachRefresh(fnFilter);
-	});
-
 	QUnit.test("Error Case: Service returns partial data, Binding should keep data, length final", function(assert){
 		var done = assert.async();
 		var handler = function() {
@@ -3509,5 +3310,4 @@ sap.ui.define([
 			oBinding.initialize();
 		});
 	});
-
 });