@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -1805,7 +1805,8 @@ sap.ui.define([
 
 	});
 
-	QUnit.test("Check correct initial tree-build in OperationMode.Client", function(assert) {
+	/** @deprecated As of version 1.102.0, reason sap.ui.model.odata.OperationMode.Auto */
+	QUnit.test("Check correct initial tree-build in OperationMode.Auto", function(assert) {
 		var done = assert.async();
 		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
 			operationMode: "Auto",
@@ -1870,118 +1871,175 @@ sap.ui.define([
 		// trigger $count in op mode auto
 		oBinding.attachChange(countChangeHandler);
 		oBinding.getContexts(1, 10);
+	});
 
-		QUnit.test("Empty binding should not cause exceptions", function(assert) {
-			createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
-				displayRootNode: true,
-				numberOfExpandedLevels: 2,
-				rootLevel: 1
-			});
+	QUnit.test("Check correct initial tree-build in OperationMode.Client", function(assert) {
+		var done = assert.async();
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			operationMode: "Client",
+			rootLevel: 2,
+			numberOfExpandedLevels: 1,
+			threshold: 300
+		});
 
-			// Keep the binding empty, so that the adapter can't find any nodes
+		// change handler called after the data returned
+		function fnChangeHandler() {
+			oBinding.detachChange(fnChangeHandler);
 
-			// The following function calls should fail but not throw an exception
-			oBinding.expand(999);
-			oBinding.collapse(999);
-			oBinding.toggleIndex(999);
-			oBinding.setNodeSelection({});
+			// retrieve the data and check it
+			var aContexts = oBinding.getContexts(1, 10);
 
-			assert.ok(true, "No exceptions thrown");
-		});
+			// check return value of getContexts call
+			assert.equal(aContexts[0].getProperty("HierarchyNode"), "000003", "Node 1 is 000003");
+			assert.equal(aContexts[0].getProperty("FinancialStatementItemText"), "Ausstehende Kapital-Einlagen",
+				"Node 1 is 'Ausstehende Kapital-Einlagen'");
+			assert.equal(aContexts[0].getProperty("FinStatementHierarchyLevelVal"), 3, "Node 1 is a 1st level node");
 
-		QUnit.test("Group ID calculation should not add forward slashes from property values", function(assert) {
-			createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
-				displayRootNode: true,
-				numberOfExpandedLevels: 2,
-				rootLevel: 1
-			});
+			assert.equal(aContexts[7].getProperty("HierarchyNode"), "000362", "Node 8 is 'P A S S I V A'");
+			assert.equal(aContexts[7].getProperty("FinancialStatementItemText"), "P A S S I V A", "Node 8 is 'P A S S I V A'");
+			assert.equal(aContexts[7].getProperty("FinStatementHierarchyLevelVal"), 2, "Node 8 is a top-level node");
 
-			var oFakeNode = {
-				context: {
-					getProperty: function(/* property name will be "GLAccount"*/) {
-						return "something/containing/forward/slashes";
-					}
-				},
-				parent: null // no parent -> no nesting with existing group IDs
-			};
+			// check internal tree state
+			var oN000002 = oBinding.findNode(0);
+			var oN000003 = oBinding.findNode(1);
 
-			var sResultGroupId = oBinding._calculateGroupID(oFakeNode);
-			assert.equal(sResultGroupId.match(/\//g).length, 2, "Group ID contains exactly two forward slashes");
-			// Group ID should contain exactly two forward slashes. One at the beginning and one at the end.
-			//	Level is then calculated with (slash count)-1
+			assert.equal(oN000002.groupID, "/000002/", "Correct node for index 0 found.");
+			assert.equal(oN000003.groupID, "/000002/000003/", "Correct node for index 1 found.");
 
-			// Current implementation encodes the slashes, so let's also explicitly check for that:
-			assert.equal(sResultGroupId, "/something%2Fcontaining%2Fforward%2Fslashes/", "Slashes got encoded");
+			var oN000002_test2 = oBinding.getNodeByIndex(0);
+			var oN000003_test2 = oBinding.getNodeByIndex(1);
+
+			assert.deepEqual(oN000002, oN000002_test2, "Correct node for index 0 found via getNodeByIndex.");
+			assert.deepEqual(oN000003, oN000003_test2, "Correct node for index 1 found via getNodeByIndex.");
+
+			// check if contexts are correctly returned via getContextByIndex vs getContexts
+			// Beware: Indices are shifted by 1, as the context array starts with 0
+			var oContext000003 = oBinding.getContextByIndex(1);
+			var oContext000008 = oBinding.getContextByIndex(2);
+
+			assert.equal(oContext000003.getProperty("HierarchyNode"), aContexts[0].getProperty("HierarchyNode"),
+				"Context 000003 via different API calls is identical.");
+			assert.equal(oContext000008.getProperty("HierarchyNode"), aContexts[1].getProperty("HierarchyNode"),
+				"Context 000008 via different API calls is identical.");
+
+			done();
+		}
+
+		// trigger $count in op mode auto
+		oBinding.attachChange(fnChangeHandler);
+		oBinding.getContexts(1, 10);
+	});
+
+	QUnit.test("Empty binding should not cause exceptions", function(assert) {
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			displayRootNode: true,
+			numberOfExpandedLevels: 2,
+			rootLevel: 1
 		});
 
-		QUnit.test("Group ID calculation should also be able to handle integer property values", function(assert) {
-			createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
-				displayRootNode: true,
-				numberOfExpandedLevels: 2,
-				rootLevel: 1
-			});
+		// Keep the binding empty, so that the adapter can't find any nodes
 
-			var oFakeNode = {
-				context: {
-					getProperty: function(/* property name will be "GLAccount"*/) {
-						return 1;
-					}
-				},
-				parent: null // no parent -> no nesting with existing group IDs
-			};
+		// The following function calls should fail but not throw an exception
+		oBinding.expand(999);
+		oBinding.collapse(999);
+		oBinding.toggleIndex(999);
+		oBinding.setNodeSelection({});
 
-			try {
-				var sResultGroupId = oBinding._calculateGroupID(oFakeNode);
-				assert.ok(true, "No exceptions thrown");
-				assert.equal(sResultGroupId, "/1/", "Integer got handled correctly");
-			} catch (e) {
-				assert.ok(false, "Threw exception: " + e);
-			}
+		assert.ok(true, "No exceptions thrown");
+	});
+
+	QUnit.test("Group ID calculation should not add forward slashes from property values", function(assert) {
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			displayRootNode: true,
+			numberOfExpandedLevels: 2,
+			rootLevel: 1
 		});
 
-		QUnit.test("Expand with bSuppressChange flag should suppress the change event", function(assert) {
-			var done = assert.async();
-			createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
-				rootLevel: 2,
-				numberOfExpandedLevels: 2
-			});
+		var oFakeNode = {
+			context: {
+				getProperty: function(/* property name will be "GLAccount"*/) {
+					return "something/containing/forward/slashes";
+				}
+			},
+			parent: null // no parent -> no nesting with existing group IDs
+		};
 
-			oBinding.attachChange(changeHandler);
-			oBinding.getContexts(0, 10);
+		var sResultGroupId = oBinding._calculateGroupID(oFakeNode);
+		assert.equal(sResultGroupId.match(/\//g).length, 2, "Group ID contains exactly two forward slashes");
+		// Group ID should contain exactly two forward slashes. One at the beginning and one at the end.
+		//	Level is then calculated with (slash count)-1
 
-			function changeHandler() {
-				oBinding.detachChange(changeHandler);
-				oBinding.getContexts(0, 10);
-				assert.ok(oBinding.findNode(1), "Node can be found"); // If the binding does not find a node, it also does not fire a change event
+		// Current implementation encodes the slashes, so let's also explicitly check for that:
+		assert.equal(sResultGroupId, "/something%2Fcontaining%2Fforward%2Fslashes/", "Slashes got encoded");
+	});
 
-				var oSpy = sinon.spy(oBinding, "_fireChange");
-				oBinding.expand(1, true);
-				assert.ok(oSpy.notCalled, "No change event fired");
-				done();
-			}
+	QUnit.test("Group ID calculation should also be able to handle integer property values", function(assert) {
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			displayRootNode: true,
+			numberOfExpandedLevels: 2,
+			rootLevel: 1
 		});
 
-		QUnit.test("Collapse with bSuppressChange flag should suppress the change event", function(assert) {
-			var done = assert.async();
-			createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
-				rootLevel: 2,
-				numberOfExpandedLevels: 2
-			});
+		var oFakeNode = {
+			context: {
+				getProperty: function(/* property name will be "GLAccount"*/) {
+					return 1;
+				}
+			},
+			parent: null // no parent -> no nesting with existing group IDs
+		};
 
-			oBinding.attachChange(changeHandler);
+		try {
+			var sResultGroupId = oBinding._calculateGroupID(oFakeNode);
+			assert.ok(true, "No exceptions thrown");
+			assert.equal(sResultGroupId, "/1/", "Integer got handled correctly");
+		} catch (e) {
+			assert.ok(false, "Threw exception: " + e);
+		}
+	});
+
+	QUnit.test("Expand with bSuppressChange flag should suppress the change event", function(assert) {
+		var done = assert.async();
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			rootLevel: 2,
+			numberOfExpandedLevels: 2
+		});
+
+		oBinding.attachChange(changeHandler);
+		oBinding.getContexts(0, 10);
+
+		function changeHandler() {
+			oBinding.detachChange(changeHandler);
 			oBinding.getContexts(0, 10);
+			assert.ok(oBinding.findNode(1), "Node can be found"); // If the binding does not find a node, it also does not fire a change event
 
-			function changeHandler() {
-				oBinding.detachChange(changeHandler);
-				oBinding.getContexts(0, 10);
-				assert.ok(oBinding.findNode(0), "Node can be found"); // If the binding does not find a node, it also does not fire a change event
+			var oSpy = sinon.spy(oBinding, "_fireChange");
+			oBinding.expand(1, true);
+			assert.ok(oSpy.notCalled, "No change event fired");
+			done();
+		}
+	});
 
-				var oSpy = sinon.spy(oBinding, "_fireChange");
-				oBinding.collapse(0, true);
-				assert.ok(oSpy.notCalled, "No change event fired");
-				done();
-			}
+	QUnit.test("Collapse with bSuppressChange flag should suppress the change event", function(assert) {
+		var done = assert.async();
+		createTreeBindingAdapter("/GLAccountHierarchyInChartOfAccountsSet(P_MANDT='902',P_VERSN='INT',P_KTOPL='INT')/Result", [], null, {
+			rootLevel: 2,
+			numberOfExpandedLevels: 2
 		});
+
+		oBinding.attachChange(changeHandler);
+		oBinding.getContexts(0, 10);
+
+		function changeHandler() {
+			oBinding.detachChange(changeHandler);
+			oBinding.getContexts(0, 10);
+			assert.ok(oBinding.findNode(0), "Node can be found"); // If the binding does not find a node, it also does not fire a change event
+
+			var oSpy = sinon.spy(oBinding, "_fireChange");
+			oBinding.collapse(0, true);
+			assert.ok(oSpy.notCalled, "No change event fired");
+			done();
+		}
 	});
 
 	QUnit.test("expandNodeToLevel: Correct filter creation", function(assert) {

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

@@ -621,6 +621,7 @@ sap.ui.define([
 		assert.equal(sFilterString, "$filter=false", "Filter string should be returned.");
 	});
 
+	/** @deprecated As of version 1.22.0 reason sap.ui.model.odata.Filter*/
 	QUnit.test("createFilterParams: Use API with deprecated sap.ui.model.odata.Filter", function(assert) {
 		var oFilter1 = new ODataFilter('Customer',[{
 			operator: 'EQ',

package/test/sap/ui/core/qunit/odata/type/DateTimeBase.qunit.js

@@ -1168,19 +1168,10 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-[
-	"2023-07-31T09:15:30.000Z",
-	"2022-06-30T15:15:45.12345Z",
-	"0009-06-29T23:00:00.123-01:00",
-	"0099-09-25T12:30:45.12345+01:00"
-].forEach(function (sISOString, i) {
-	QUnit.test("getISOStringFromModelValue/getModelValueFromISOString: integrative test V4 #" + i, function (assert) {
-		var oType = new DateTimeOffset().setV4();
-
-		assert.strictEqual(oType.getISOStringFromModelValue(sISOString), sISOString);
-		assert.strictEqual(oType.getModelValueFromISOString(sISOString), sISOString);
+	QUnit.test("getISOStringFromModelValue: integrative test V4", function (assert) {
+		assert.strictEqual(new DateTimeOffset({}, {V4: true})
+			.getISOStringFromModelValue("2023-07-31T09:15:30Z"), "2023-07-31T09:15:30Z");
 	});
-});
 
 	//*********************************************************************************************
 [new DateTimeOffset(), new DateTimeOffset().setV4()].forEach(function (oType, i) {
@@ -1190,4 +1181,34 @@ sap.ui.define([
 		assert.strictEqual(oType.getModelValueFromISOString(""), null);
 	});
 });
+
+	//*********************************************************************************************
+	// Enhance existing integration test for V4 DateTimeOffset#getModelValueFromISOString with and without precision
+	// constraints. It is expected that the milliseconds in the ISO string are either truncated or padded with 0
+	// according to the set precision.
+	// BCP: 2380114882
+[{
+	sISOString: "2023-01-31T23:15:30.6Z",
+	sModelValue: "2023-01-31T23:15:30.6Z",
+	iPrecision: 1
+}, {
+	sISOString: "2023-07-31T09:15:30.123Z",
+	sModelValue: "2023-07-31T09:15:30.12Z",
+	iPrecision: 2
+}, {
+	sISOString: "2023-07-31T09:15:30.12Z",
+	sModelValue: "2023-07-31T09:15:30.1200Z",
+	iPrecision: 4
+}, {
+	sISOString: "2023-07-31T09:15:30.12Z",
+	sModelValue: "2023-07-31T09:15:30Z",
+	iPrecision: undefined
+}].forEach(function (oFixture, i) {
+	QUnit.test("getModelValueFromISOString: integrative test #" + i, function (assert) {
+		const oType = new DateTimeOffset({}, {V4: true, precision: oFixture.iPrecision});
+
+		// code under test
+		assert.strictEqual(oType.getModelValueFromISOString(oFixture.sISOString), oFixture.sModelValue);
+	});
+});
 });

package/test/sap/ui/core/qunit/odata/type/TimeOfDay.qunit.js

@@ -518,19 +518,9 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-[
-	"09:15:30.000Z",
-	"15:15:45.12345Z",
-	"23:00:00.123-01:00",
-	"12:30:45.12345+01:00"
-].forEach(function (sISOString, i) {
-	QUnit.test("getISOStringFromModelValue/getModelValueFromISOString: integrative test " + i, function (assert) {
-		var oType = new TimeOfDay({}, {precision: 3});
-
-		assert.strictEqual(oType.getISOStringFromModelValue(sISOString), sISOString);
-		assert.strictEqual(oType.getModelValueFromISOString(sISOString), sISOString);
+	QUnit.test("getISOStringFromModelValue: integrative test", function (assert) {
+		assert.strictEqual(new TimeOfDay().getISOStringFromModelValue("09:15:30"), "09:15:30");
 	});
-});
 
 	//*********************************************************************************************
 ["getISOStringFromModelValue", "getModelValueFromISOString"].forEach(function (sMethod) {
@@ -542,4 +532,35 @@ sap.ui.define([
 		assert.strictEqual(oType[sMethod](""), null);
 	});
 });
+
+	//*********************************************************************************************
+	// Enhance existing integration test for TimeOfDay#getModelValueFromISOString with and without precision
+	// constraints. It is expected that the milliseconds in the ISO string are either truncated or padded with 0
+	// according to the set precision.
+	// BCP: 2380114882
+	[{
+		sISOString: "09:15:30.12",
+		sModelValue: "09:15:30.12",
+		iPrecision: 2
+	}, {
+		sISOString: "09:15:30.123",
+		sModelValue: "09:15:30.12",
+		iPrecision: 2
+	}, {
+		sISOString: "09:15:30.12",
+		sModelValue: "09:15:30.1200",
+		iPrecision: 4
+	}, {
+		sISOString: "09:15:30.12",
+		sModelValue: "09:15:30",
+		iPrecision: undefined
+	}].forEach(function (oFixture, i) {
+		const sTitle = "getModelValueFromISOString: integrative test #" + i;
+		QUnit.test(sTitle, function (assert) {
+			const oType = new TimeOfDay({}, {precision: oFixture.iPrecision});
+
+			// code under test
+			assert.strictEqual(oType.getModelValueFromISOString(oFixture.sISOString), oFixture.sModelValue);
+		});
+	});
 });

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

@@ -2,8 +2,9 @@
 sap.ui.define([
 	"sap/ui/model/odata/v2/ODataModel",
 	"sap/ui/model/odata/MessageScope",
+	"sap/ui/core/Messaging",
 	'sap/ui/core/util/MockServer'
-], function (ODataModel, MessageScope, MockServer) {
+], function (ODataModel, MessageScope, Messaging, MockServer) {
 	"use strict";
 
 
@@ -661,7 +662,7 @@ sap.ui.define([
 		var done = assert.async();
 		var that = this;
 		var oRequest;
-		var oMessageModel = sap.ui.getCore().getMessageManager().getMessageModel();
+		var oMessageModel = Messaging.getMessageModel();
 
 		var oCreateEntryProduct = {
 			properties: {
@@ -859,7 +860,7 @@ sap.ui.define([
 					mResponseParameter.mDeepSalesOrderMsg = "Msg";
 					that.oModel.read("/BusinessPartnerSet('0100000000')", {
 						success: function(){
-							var oMsg = sap.ui.getCore().getMessageManager().getMessageModel().getData()[0];
+							var oMsg = Messaging.getMessageModel().getData()[0];
 							assert.equal(oMsg.aTargets[0], "/SalesOrderLineItemSet(SalesOrderID='0500000000',ItemPosition='0000000010')", "Message target is correctly set.");
 							assert.equal(oMsg.aFullTargets[0], "/BusinessPartnerSet('0100000000')/ToSalesOrders('0500000000')/ToLineItems(SalesOrderID='0500000000',ItemPosition='0000000010')", "Message full target is correctly set.");
 							done();
@@ -883,7 +884,7 @@ sap.ui.define([
 					mResponseParameter.mDeepSalesOrderMsg = "MsgWithProperty";
 					that.oModel.read("/BusinessPartnerSet('0100000000')", {
 						success: function(){
-							var oMsg = sap.ui.getCore().getMessageManager().getMessageModel().getData()[0];
+							var oMsg = Messaging.getMessageModel().getData()[0];
 							assert.equal(oMsg.aTargets[0], "/SalesOrderLineItemSet(SalesOrderID='0500000000',ItemPosition='0000000010')/CurrencyCode", "Message target is correctly set.");
 							assert.equal(oMsg.aFullTargets[0], "/BusinessPartnerSet('0100000000')/ToSalesOrders('0500000000')/ToLineItems(SalesOrderID='0500000000',ItemPosition='0000000010')/CurrencyCode", "Message full target is correctly set.");
 							done();

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

@@ -190,7 +190,6 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [
-	{operationMode : OperationMode.Auto, useFilterParams : false},
 	{operationMode : OperationMode.Client, useFilterParams : true},
 	{operationMode : OperationMode.Default, useFilterParams : true},
 	{operationMode : OperationMode.Server, useFilterParams : true}
@@ -231,6 +230,40 @@ sap.ui.define([
 	});
 });
 
+	//*********************************************************************************************
+	/** @deprecated As of version 1.102.0, reason OperationMode.Auto */
+	QUnit.test("_getLength: calls _addFilterQueryOption; operation mode=OperationMode.Auto", function (assert) {
+		var oModel = {read : function () {}},
+			oBinding = {
+				sCountMode : CountMode.Request,
+				oModel : oModel,
+				sOperationMode : OperationMode.Auto,
+				sPath : "/~Path",
+				_addFilterQueryOption : function () {},
+				getResolvedPath : function () {}
+			};
+
+		this.mock(oBinding).expects("_addFilterQueryOption")
+			.withExactArgs([], false)
+			.callsFake(function (aParams) {
+				aParams.push("~filter"); // simulate _addFilterQueryOption implementation
+			});
+		this.mock(oBinding).expects("getResolvedPath").withExactArgs().returns("/~Path");
+
+		this.mock(oModel).expects("read").withExactArgs("/~Path/$count", {
+				canonicalRequest : undefined,
+				context : undefined,
+				error : sinon.match.func,
+				groupId : undefined,
+				success : sinon.match.func,
+				urlParameters : ["~filter"],
+				withCredentials : undefined
+			});
+
+		// code under test
+		ODataListBinding.prototype._getLength.call(oBinding);
+	});
+
 	//*********************************************************************************************
 [{
 	error : {message : "~message"},
@@ -1702,6 +1735,7 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
+/** @deprecated As of version 1.102.0, reason OperationMode.Auto */
 [CountMode.Request, CountMode.Both].forEach(function (sCountMode, i) {
 	QUnit.test("getContexts: return empty array; check OperationMode/CountMode; #" + i,
 			function (assert) {
@@ -2472,16 +2506,15 @@ sap.ui.define([
 		var oBinding = {
 				aKeys : [],
 				bLengthFinal : true,
-				iLength : "~length",
+				iLength : 42,
 				_getCreatedContexts : function () {},
 				isFirstCreateAtEnd : function () {}
 			};
 
-		this.mock(oBinding).expects("_getCreatedContexts").withExactArgs(); // return value unused
+		this.mock(oBinding).expects("_getCreatedContexts").withExactArgs().returns(["~oCreated1"]);
 		this.mock(oBinding).expects("isFirstCreateAtEnd").withExactArgs().returns(false);
 		this.mock(ODataUtils).expects("_getReadIntervals")
-			.withExactArgs(sinon.match.same(oBinding.aKeys), "~startIndex", "~length",
-				"~maximumPrefetchSize", "~length")
+			.withExactArgs(sinon.match.same(oBinding.aKeys), "~startIndex", "~length", "~maximumPrefetchSize", 43)
 			.returns("~aIntervals");
 		this.mock(ODataUtils).expects("_mergeIntervals")
 			.withExactArgs("~aIntervals")
@@ -2496,27 +2529,27 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [
-	{interval : {start : 222, end : 333}, result : {skip : 222 - 1, top : 111}},
+	{interval : {start : 222, end : 333}, result : {skip : 222 - 2, top : 111}},
 	{interval : undefined, result : undefined}
 ].forEach(function (oFixture, i) {
 	QUnit.test("_getSkipAndTop, creation at start, binding has data: #" + i, function (assert) {
 		var oBinding = {
 				aKeys : ["key0", "key1"],
 				bLengthFinal : true,
-				iLength : "~length",
+				iLength : 42,
 				_getCreatedContexts : function () {},
 				isFirstCreateAtEnd : function () {}
 			};
 
 		this.mock(oBinding).expects("_getCreatedContexts")
 			.withExactArgs()
-			.returns(["created0"]);
+			.returns(["created0", "created1"]);
 		this.mock(oBinding).expects("isFirstCreateAtEnd")
 			.withExactArgs()
 			.returns(false);
 		this.mock(ODataUtils).expects("_getReadIntervals")
-			.withExactArgs(["created0", "key0", "key1"], "~startIndex", "~length",
-				"~maximumPrefetchSize", "~length")
+			.withExactArgs(["created0", "created1", "key0", "key1"], "~startIndex", "~length",
+				"~maximumPrefetchSize", 44)
 			.returns("~aIntervals");
 		this.mock(ODataUtils).expects("_mergeIntervals")
 			.withExactArgs("~aIntervals")
@@ -2566,7 +2599,7 @@ sap.ui.define([
 		var oBinding = {
 				aKeys : [],
 				bLengthFinal : true,
-				iLength : "~length",
+				iLength : 42,
 				_getCreatedContexts : function () {},
 				isFirstCreateAtEnd : function () {}
 			};
@@ -2574,8 +2607,7 @@ sap.ui.define([
 		this.mock(oBinding).expects("_getCreatedContexts").withExactArgs().returns([]);
 		this.mock(oBinding).expects("isFirstCreateAtEnd").withExactArgs().returns(false);
 		this.mock(ODataUtils).expects("_getReadIntervals")
-			.withExactArgs(sinon.match.same(oBinding.aKeys) , 0, 10, "~maximumPrefetchSize",
-				"~length")
+			.withExactArgs(sinon.match.same(oBinding.aKeys) , 0, 10, "~maximumPrefetchSize", 42)
 			.returns("~aIntervals");
 		this.mock(ODataUtils).expects("_mergeIntervals")
 			.withExactArgs("~aIntervals")
@@ -3768,4 +3800,22 @@ sap.ui.define([
 		// code under test
 		ODataListBinding.prototype.addComparators.call(oBinding, [/*unused*/], false /*bSort unused*/);
 	});
+
+	//*********************************************************************************************
+	QUnit.test("getContextByIndex", function (assert) {
+		var oBinding = {
+				_getContexts : function () {}
+			},
+			oBindingMock = this.mock(oBinding);
+
+		oBindingMock.expects("_getContexts").withExactArgs(42, 1).returns([]);
+
+		// code under test
+		assert.strictEqual(ODataListBinding.prototype.getContextByIndex.call(oBinding, 42), undefined);
+
+		oBindingMock.expects("_getContexts").withExactArgs(77, 1).returns(["~oContext"]);
+
+		// code under test
+		assert.strictEqual(ODataListBinding.prototype.getContextByIndex.call(oBinding, 77), "~oContext");
+	});
 });