@openui5/sap.ui.core 1.124.2 → 1.126.0

package/test/sap/ui/core/qunit/component/ExtensionPoint.qunit.js

@@ -52,10 +52,9 @@ sap.ui.define([
 		afterEach: destroyComponentAndContainer
 	});
 
-	QUnit.test("simple resolution", async function(assert) {
-		assert.expect(31);
+	QUnit.test("simple resolution", function(assert) {
+		assert.expect(32);
 		var oView = oComponent.getRootControl();
-		await oView.loaded();
 
 		assert.ok(ExtensionPoint._fnExtensionProvider, "ExtensionPointProvider added");
 
@@ -75,46 +74,45 @@ sap.ui.define([
 
 		// view content on top level
 		var aViewContent = oView.getContent();
-		assert.strictEqual(aViewContent.length, 33, "Correct # of controls inside View content aggregation");
-
-		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[32].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
+		assert.strictEqual(aViewContent.length, 34, "Correct # of controls inside View content aggregation");
+
+		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--Panel_With_Nested_View", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[32].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[33].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
 
 		var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
 		assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
 
-		// Wait for nested View and its EPs (id: EPinBinding_in_nestedView, s.a.) in nested View should be available
-		const oNestedView = aViewContent[32];
-		await oNestedView.loaded();
+		const oNestedView = oView.byId("EPinBinding_in_nestedView");
+
 		assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
 		assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
 	});
 
-	QUnit.test("ExtensionPoint on top-level of XMLView", async function(assert) {
-		assert.expect(51);
+	QUnit.test("ExtensionPoint on top-level of XMLView", function(assert) {
+		assert.expect(52);
 		var oView = oComponent.getRootControl();
-		await oView.loaded();
 
 		assert.ok(ExtensionPoint._fnExtensionProvider, "ExtensionPointProvider added");
 
 		var aViewContent = oView.getContent();
-		assert.strictEqual(aViewContent.length, 33, "Correct # of controls inside View content aggregation");
+		assert.strictEqual(aViewContent.length, 34, "Correct # of controls inside View content aggregation");
 
 		// View Content Aggregation
 		assert.strictEqual(aViewContent[0].getId(), "ExtComponent---mainView--zero--defaultButton", "EP0 content is in correct order"); // EP0
@@ -132,24 +130,27 @@ sap.ui.define([
 		assert.strictEqual(aViewContent[12].getId(), "ExtComponent---mainView--tn1--customButton2", "tn1 Fragment is in correct order"); // tn1 Fragment customButton2
 		assert.strictEqual(aViewContent[13].getId(), "ExtComponent---mainView--myTable", "Table is in correct order"); // myTable
 		assert.strictEqual(aViewContent[14].getId(), "ExtComponent---mainView--myListItem", "ColumnListItem is in correct order"); // myListItem
-		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
-		assert.strictEqual(aViewContent[32].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
+
+		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--Panel_With_Nested_View", "ColumnListItem is in correct order"); // myListItem
+
+		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[32].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[33].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
 
 		var oTable = aViewContent[13];
 		var aTableItems = oTable.getItems();
@@ -179,9 +180,7 @@ sap.ui.define([
 		var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
 		assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
 
-		// Wait for nested View and its EPs (id: EPinBinding_in_nestedView, s.a.) in nested View should be available
-		const oNestedView = aViewContent[32];
-		await oNestedView.loaded();
+		const oNestedView = oView.byId("EPinBinding_in_nestedView");
 		assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
 		assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
 	});
@@ -192,72 +191,73 @@ sap.ui.define([
 	});
 
 	QUnit.test("simple resolution", function(assert) {
-		assert.expect(43);
+		assert.expect(44);
 		var oView = oComponent.getRootControl();
-		return oView.loaded().then(function() {
-			assert.strictEqual(ExtensionPoint._fnExtensionProvider(), undefined, "ExtensionPointProvider exists, but no module returned");
 
-			var aViewContent = oView.getContent();
-			assert.strictEqual(aViewContent.length, 31, "Correct # of controls inside View content aggregation");
-
-			assert.strictEqual(aViewContent[0].getId(), "ExtComponent---mainView--zero--defaultButton", "EP0 is not included: default content is in correct order"); // EP0
-			assert.strictEqual(aViewContent[1].getId(), "ExtComponent---mainView--button0", "button0 is in correct order"); // Button0
-			assert.strictEqual(aViewContent[2].getId(), "ExtComponent---mainView--Panel", "Panel is in correct order"); // Panel
-			assert.strictEqual(aViewContent[3].getId(), "ExtComponent---mainView--button5", "button5 is in correct order"); // button5
-			assert.strictEqual(aViewContent[4].getId(), "ExtComponent---mainView--button6", "button6 is in correct order"); // button6
-			assert.strictEqual(aViewContent[5].getId(), "ExtComponent---mainView--nine_nine--defaultButton", "EP99 is not included: default content is in correct order"); // EP99 button0
-			assert.strictEqual(aViewContent[6].getId(), "ExtComponent---mainView--shifty--customButton1", "shifty Fragment content is in correct order"); // shifty Fragment customButton1
-			assert.strictEqual(aViewContent[7].getId(), "ExtComponent---mainView--shifty--customButton2", "shifty Fragment content is in correct order"); // shifty Fragment customButton2
-			assert.strictEqual(aViewContent[8].getId(), "ExtComponent---mainView--button7", "button7 is in correct order"); // button7
-			assert.strictEqual(aViewContent[9].getId(), "ExtComponent---mainView--tn1--customButton1", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton1
-			assert.strictEqual(aViewContent[10].getId(), "ExtComponent---mainView--tn1--customButton2", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton2
-			assert.strictEqual(aViewContent[11].getId(), "ExtComponent---mainView--myTable", "Table is in correct order"); // myTable
-			assert.strictEqual(aViewContent[12].getId(), "ExtComponent---mainView--myListItem", "ColumnListItem is in correct order"); // myListItem
-			assert.strictEqual(aViewContent[13].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[14].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
-
-			// table
-			var oTable = aViewContent[11];
-			var aTableItems = oTable.getItems();
-			assert.strictEqual(aTableItems.length, 4, "Number of Table Items is correct");
-
-			// panel
-			var oPanel = oView.byId("Panel");
-			var aPanelContent = oPanel.getContent();
-			assert.strictEqual(aPanelContent.length, 5, "ExtensionView content added to view");
-
-			assert.strictEqual(aPanelContent[0].getId(), "ExtComponent---mainView--button1", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[1].getId(), "ExtComponent---mainView--button2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[2].getId(), "ExtComponent---mainView--button3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[3].getId(), "ExtComponent---mainView--defaultFragment--defaultButton", "EP2 default content is in correct order"); // EP2
-			assert.strictEqual(aPanelContent[4].getId(), "ExtComponent---mainView--button4", "Main.view content is in correct order"); // Main
-
-			var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
-			assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
-
-			// Default content for EPs in nested View should be available
-			var oNestedView = aViewContent[30];
-			return oNestedView.loaded().then(function() {
-				assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
-				assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
-			});
-		});
+		assert.strictEqual(ExtensionPoint._fnExtensionProvider(), undefined, "ExtensionPointProvider exists, but no module returned");
+
+		var aViewContent = oView.getContent();
+		assert.strictEqual(aViewContent.length, 32, "Correct # of controls inside View content aggregation");
+
+		assert.strictEqual(aViewContent[0].getId(), "ExtComponent---mainView--zero--defaultButton", "EP0 is not included: default content is in correct order"); // EP0
+		assert.strictEqual(aViewContent[1].getId(), "ExtComponent---mainView--button0", "button0 is in correct order"); // Button0
+		assert.strictEqual(aViewContent[2].getId(), "ExtComponent---mainView--Panel", "Panel is in correct order"); // Panel
+		assert.strictEqual(aViewContent[3].getId(), "ExtComponent---mainView--button5", "button5 is in correct order"); // button5
+		assert.strictEqual(aViewContent[4].getId(), "ExtComponent---mainView--button6", "button6 is in correct order"); // button6
+		assert.strictEqual(aViewContent[5].getId(), "ExtComponent---mainView--nine_nine--defaultButton", "EP99 is not included: default content is in correct order"); // EP99 button0
+		assert.strictEqual(aViewContent[6].getId(), "ExtComponent---mainView--shifty--customButton1", "shifty Fragment content is in correct order"); // shifty Fragment customButton1
+		assert.strictEqual(aViewContent[7].getId(), "ExtComponent---mainView--shifty--customButton2", "shifty Fragment content is in correct order"); // shifty Fragment customButton2
+		assert.strictEqual(aViewContent[8].getId(), "ExtComponent---mainView--button7", "button7 is in correct order"); // button7
+		assert.strictEqual(aViewContent[9].getId(), "ExtComponent---mainView--tn1--customButton1", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton1
+		assert.strictEqual(aViewContent[10].getId(), "ExtComponent---mainView--tn1--customButton2", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton2
+		assert.strictEqual(aViewContent[11].getId(), "ExtComponent---mainView--myTable", "Table is in correct order"); // myTable
+		assert.strictEqual(aViewContent[12].getId(), "ExtComponent---mainView--myListItem", "ColumnListItem is in correct order"); // myListItem
+
+		// panel with a nested view
+		assert.strictEqual(aViewContent[13].getId(), "ExtComponent---mainView--Panel_With_Nested_View", "ColumnListItem is in correct order"); // myListItem
+
+		assert.strictEqual(aViewContent[14].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
+
+		// table
+		var oTable = aViewContent[11];
+		var aTableItems = oTable.getItems();
+		assert.strictEqual(aTableItems.length, 4, "Number of Table Items is correct");
+
+		// panel
+		var oPanel = oView.byId("Panel");
+		var aPanelContent = oPanel.getContent();
+		assert.strictEqual(aPanelContent.length, 5, "ExtensionView content added to view");
+
+		assert.strictEqual(aPanelContent[0].getId(), "ExtComponent---mainView--button1", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[1].getId(), "ExtComponent---mainView--button2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[2].getId(), "ExtComponent---mainView--button3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[3].getId(), "ExtComponent---mainView--defaultFragment--defaultButton", "EP2 default content is in correct order"); // EP2
+		assert.strictEqual(aPanelContent[4].getId(), "ExtComponent---mainView--button4", "Main.view content is in correct order"); // Main
+
+		var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
+		assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
+
+		// Default content for EPs in nested View should be available
+		var oNestedView = oView.byId("EPinBinding_in_nestedView");
+		assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
+		assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
 	});
 
 	QUnit.module("ExtensionPoint w/o Provider (Async)", {
@@ -266,75 +266,77 @@ sap.ui.define([
 	});
 
 	QUnit.test("simple resolution", function(assert) {
-		assert.expect(42);
+		assert.expect(43);
 		var oView = oComponent.getRootControl();
-		return oView.loaded().then(function() {
-			assert.ok(!ExtensionPoint._fnExtensionProvider, "ExtensionPointProvider added");
 
-			var aViewContent = oView.getContent();
-			assert.strictEqual(aViewContent.length, 31, "Correct # of controls inside View content aggregation");
-
-			assert.strictEqual(aViewContent[0].getId(), "ExtComponent---mainView--zero--defaultButton", "EP0 is not included: default content is in correct order"); // EP0
-			assert.strictEqual(aViewContent[1].getId(), "ExtComponent---mainView--button0", "button0 is in correct order"); // Button0
-			assert.strictEqual(aViewContent[2].getId(), "ExtComponent---mainView--Panel", "Panel is in correct order"); // Panel
-			assert.strictEqual(aViewContent[3].getId(), "ExtComponent---mainView--button5", "button5 is in correct order"); // button5
-			assert.strictEqual(aViewContent[4].getId(), "ExtComponent---mainView--button6", "button6 is in correct order"); // button6
-			assert.strictEqual(aViewContent[5].getId(), "ExtComponent---mainView--nine_nine--defaultButton", "EP99 is not included: default content is in correct order"); // EP99 button0
-			assert.strictEqual(aViewContent[6].getId(), "ExtComponent---mainView--shifty--customButton1", "shifty Fragment content is in correct order"); // shifty Fragment customButton1
-			assert.strictEqual(aViewContent[7].getId(), "ExtComponent---mainView--shifty--customButton2", "shifty Fragment content is in correct order"); // shifty Fragment customButton2
-			assert.strictEqual(aViewContent[8].getId(), "ExtComponent---mainView--button7", "button7 is in correct order"); // button7
-			assert.strictEqual(aViewContent[9].getId(), "ExtComponent---mainView--tn1--customButton1", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton1
-			assert.strictEqual(aViewContent[13].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[14].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
-
-			// table
-			var oTable = aViewContent[11];
-			var aTableItems = oTable.getItems();
-			assert.strictEqual(aTableItems.length, 4, "Number of Table Items is correct");
-
-			// panel
-			var oPanel = oView.byId("Panel");
-			var aPanelContent = oPanel.getContent();
-			assert.strictEqual(aPanelContent.length, 5, "ExtensionView content added to view");
-
-			assert.strictEqual(aPanelContent[0].getId(), "ExtComponent---mainView--button1", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[1].getId(), "ExtComponent---mainView--button2", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[2].getId(), "ExtComponent---mainView--button3", "Main.view content is in correct order"); // Main
-			assert.strictEqual(aPanelContent[3].getId(), "ExtComponent---mainView--defaultFragment--defaultButton", "EP2 default content is in correct order"); // EP2
-			assert.strictEqual(aPanelContent[4].getId(), "ExtComponent---mainView--button4", "Main.view content is in correct order"); // Main
-
-			// check rendering result for top-level extension points
-			// EP0
-			assert.ok(oView.byId("zero--defaultButton").getDomRef(), "Default Button in EP_Zero is rendered");
-			// EP99
-			assert.ok(oView.byId("nine_nine--defaultButton").getDomRef(), "Default Button in EP99 is rendered");
-
-			var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
-			assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
-
-			// Default content for EPs in nested View should be available
-			var oNestedView = aViewContent[30];
-			return oNestedView.loaded().then(function() {
-				assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
-				assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
-			});
-		});
+		assert.ok(!ExtensionPoint._fnExtensionProvider, "ExtensionPointProvider added");
+
+		var aViewContent = oView.getContent();
+		assert.strictEqual(aViewContent.length, 32, "Correct # of controls inside View content aggregation");
+
+		assert.strictEqual(aViewContent[0].getId(), "ExtComponent---mainView--zero--defaultButton", "EP0 is not included: default content is in correct order"); // EP0
+		assert.strictEqual(aViewContent[1].getId(), "ExtComponent---mainView--button0", "button0 is in correct order"); // Button0
+		assert.strictEqual(aViewContent[2].getId(), "ExtComponent---mainView--Panel", "Panel is in correct order"); // Panel
+		assert.strictEqual(aViewContent[3].getId(), "ExtComponent---mainView--button5", "button5 is in correct order"); // button5
+		assert.strictEqual(aViewContent[4].getId(), "ExtComponent---mainView--button6", "button6 is in correct order"); // button6
+		assert.strictEqual(aViewContent[5].getId(), "ExtComponent---mainView--nine_nine--defaultButton", "EP99 is not included: default content is in correct order"); // EP99 button0
+		assert.strictEqual(aViewContent[6].getId(), "ExtComponent---mainView--shifty--customButton1", "shifty Fragment content is in correct order"); // shifty Fragment customButton1
+		assert.strictEqual(aViewContent[7].getId(), "ExtComponent---mainView--shifty--customButton2", "shifty Fragment content is in correct order"); // shifty Fragment customButton2
+		assert.strictEqual(aViewContent[8].getId(), "ExtComponent---mainView--button7", "button7 is in correct order"); // button7
+		assert.strictEqual(aViewContent[9].getId(), "ExtComponent---mainView--tn1--customButton1", "EP23 is not included: default content is in correct order"); // tn1 Fragment customButton1
+
+		// Panel with nested view
+		assert.strictEqual(aViewContent[13].getId(), "ExtComponent---mainView--Panel_With_Nested_View", "Main.view content is in correct order"); // Main
+
+		assert.strictEqual(aViewContent[14].getId(), "ExtComponent---mainView--ButtonInRootEP", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[15].getId(), "ExtComponent---mainView--EPinEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[16].getId(), "ExtComponent---mainView--EPinEPButton2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[17].getId(), "ExtComponent---mainView--EPinEPButton3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[18].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[19].getId(), "ExtComponent---mainView--EPinEPButtonDeepNesting2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[20].getId(), "ExtComponent---mainView--ButtonInRootEP2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[21].getId(), "ExtComponent---mainView--ButtonInRootEP3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[22].getId(), "ExtComponent---mainView--EPinEPButton4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[23].getId(), "ExtComponent---mainView--ButtonInRootEP4", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[24].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[25].getId(), "ExtComponent---mainView--EPinEPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[26].getId(), "ExtComponent---mainView--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[27].getId(), "ExtComponent---mainView--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[28].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButton", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[29].getId(), "ExtComponent---mainView--NestingFragment--EPRootFragment--extEPButtonChild", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[30].getId(), "ExtComponent---mainView--EPinBinding--supplier_panel", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aViewContent[31].getId(), "ExtComponent---mainView--EPinBinding_in_nestedView", "Main.view content is in correct order"); // Main (nested view with EPs)
+
+		// table
+		var oTable = aViewContent[11];
+		var aTableItems = oTable.getItems();
+		assert.strictEqual(aTableItems.length, 4, "Number of Table Items is correct");
+
+		// panel
+		var oPanel = oView.byId("Panel");
+		var aPanelContent = oPanel.getContent();
+		assert.strictEqual(aPanelContent.length, 5, "ExtensionView content added to view");
+
+		assert.strictEqual(aPanelContent[0].getId(), "ExtComponent---mainView--button1", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[1].getId(), "ExtComponent---mainView--button2", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[2].getId(), "ExtComponent---mainView--button3", "Main.view content is in correct order"); // Main
+		assert.strictEqual(aPanelContent[3].getId(), "ExtComponent---mainView--defaultFragment--defaultButton", "EP2 default content is in correct order"); // EP2
+		assert.strictEqual(aPanelContent[4].getId(), "ExtComponent---mainView--button4", "Main.view content is in correct order"); // Main
+
+		// check rendering result for top-level extension points
+		// EP0
+		assert.ok(oView.byId("zero--defaultButton").getDomRef(), "Default Button in EP_Zero is rendered");
+		// EP99
+		assert.ok(oView.byId("nine_nine--defaultButton").getDomRef(), "Default Button in EP99 is rendered");
+
+		var oOwnerComponent = Component.getOwnerComponentFor(oPanel);
+		assert.strictEqual(oOwnerComponent.getId(), "ExtComponent", "Panel has the correct OwnerComponent");
+
+		// Default content for EPs in nested View should be available
+		var oNestedView = oView.byId("EPinBinding_in_nestedView");
+
+		assert.ok(oNestedView.byId("TableRowButton") != null, "Default Content 'TableRowButton' in nested View is available");
+		assert.ok(oNestedView.byId("PanelButton") != null, "Default Content 'PanelButton' in nested View is available");
 	});
 
 	QUnit.module("ExtensionPoint Provider arguments", {
@@ -394,119 +396,302 @@ sap.ui.define([
 		}.bind(this));
 	});
 
-	QUnit.test("via XMLView: async", function(assert) {
-		assert.expect(47);
+
+	// matches if the "view" property in the EP info object for flex is of type "sap.ui.core.mvc.View"
+	const oViewClassMatcher = sinon.match((v) => {return v?.getMetadata().isA("sap.ui.core.mvc.View");});
+
+	// matches the control against the given ID
+	const idMatcher = (sId) => {
+		return sinon.match((v) => {return v?.getId() === sId;});
+	};
+
+	/**
+	 * Asserts if we made the correct calls to the registered ExtensionPointProvider.
+	 * This includes information about the targetControl, closestBindingCarrier,
+	 * the target aggregation and the index therein.
+	 *
+	 * @param {function} assert the QUnit assert function
+	 */
+	function assertExtensionPointProviderSpies(assert, oView) {
+
+		// inspect EP Provider calls
+		assert.equal(this.oEPSpy.getCalls().length, 21, "21 Calls to the EP Provider");
+
+		// EP 1
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP1",
+			view: oViewClassMatcher
+		})), "EP 'EP1' registered");
+
+		// EP 2
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP2",
+			view: oViewClassMatcher
+		})), "EP 'EP2' registered");
+
+		// Closest Binding Carrier Test: EPinBinding from Fragement
+		// EP Product_Table_Cell_Ext
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Product_Table_Cell_Ext",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding--product_table",
+			closestAggregationBinding: "items"
+		})), "EP 'Product_Table_Cell_Ext' registered");
+
+		// EP Product_Table_Column_Ext
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Product_Table_Column_Ext",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding--supplier_panel",
+			closestAggregationBinding: "content"
+		})), "EP 'Product_Table_Column_Ext' registered");
+
+		// EP Panel_Button_Ext
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Panel_Button_Ext",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding--supplier_panel",
+			closestAggregationBinding: "content"
+		})), "EP 'Panel_Button_Ext' registered");
+
+		// EP 0
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP0",
+			view: oViewClassMatcher
+		})), "EP 'EP0' registered");
+
+		// EP 99
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP99",
+			view: oViewClassMatcher
+		})), "EP 'EP99' registered");
+
+		// EP 23
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP23",
+			view: oViewClassMatcher
+		})), "EP 'EP23' registered");
+
+		// EP Table
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EPTable",
+			view: oViewClassMatcher
+		})), "EP 'EPTable' registered");
+
+		// --- 5 EPs contained in EPinNestedView.view.xml ---
+		assertNestedViewExtensionPoints.call(this, assert);
+
+		//EPinEPRoot
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EPinEPRoot",
+			view: oViewClassMatcher
+		})), "EP 'EPinEPRoot' registered");
+
+		//EPinRootFragmentRoot
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EPinRootFragment",
+			view: oViewClassMatcher
+		})), "EP 'EPinRootFragment' registered");
+
+		// EP Root
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EPRoot",
+			view: oViewClassMatcher,
+			fragmentId: "EPRootFragment"
+		})), "EP 'EPRoot' registered");
+
+		// NestingFragment --> EP Root
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EPRoot",
+			view: oViewClassMatcher,
+			fragmentId: "NestingFragment--EPRootFragment"
+		})), "EP 'EPRoot' in NestingFragment registered");
+
+		// Closest Binding Carrier Test: EPinBinding from nested View
+		// EP Product_Table_Cell_Ext_In_View
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Product_Table_Cell_Ext_In_View",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding_in_nestedView--product_table",
+			closestAggregationBinding: "items"
+		})), "EP 'Product_Table_Cell_Ext_In_View' registered");
+
+		// EP Product_Table_Column_Ext_In_View
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Product_Table_Column_Ext_In_View",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding_in_nestedView",
+			closestAggregationBinding: "dependents"
+		})), "EP 'Product_Table_Column_Ext_In_View' registered");
+
+		// EP Panel_Button_Ext_In_View
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "Panel_Button_Ext_In_View",
+			view: oViewClassMatcher,
+			closestAggregationBindingCarrier: "myView--EPinBinding_in_nestedView",
+			closestAggregationBinding: "dependents"
+		})), "EP 'Panel_Button_Ext_In_View' registered");
+
+	}
+
+	/**
+	 * Asserts the EPs inside the nested view.
+	 *
+	 * @param {function} assert the QUnit assert function
+	 */
+	function assertNestedViewExtensionPoints(assert) {
+		// EP_In_Product_Table_Column - 1st
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP_In_Product_Table_Column",
+			view: idMatcher("myView--EPs_In_Nested_View"),
+			aggregationName: "header",
+			targetControl: idMatcher("myView--EPs_In_Nested_View--column_0")
+		})), "EP 'EPinNestedView > EP_In_Product_Table_Column' (1) registered");
+
+		// EP_In_Product_Table_Column - 2nd
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP_In_Product_Table_Column",
+			view: idMatcher("myView--EPs_In_Nested_View"),
+			aggregationName: "header",
+			targetControl: idMatcher("myView--EPs_In_Nested_View--column_1")
+		})), "EP 'EPinNestedView > EP_In_Product_Table_Column' (2) registered");
+
+		// EP_In_Product_Table_Cell_Not_Found
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP_In_Product_Table_Cell_Not_Found",
+			view: idMatcher("myView--EPs_In_Nested_View"),
+			aggregationName: "cells",
+			targetControl: idMatcher("myView--EPs_In_Nested_View--list_item_0")
+		})), "EP 'EPinNestedView > EP_In_Product_Table_Cell_Not_Found' registered");
+
+		// EP_In_Product_Table_Cell_Found
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP_In_Product_Table_Cell_Found",
+			view: idMatcher("myView--EPs_In_Nested_View"),
+			aggregationName: "cells",
+			targetControl: idMatcher("myView--EPs_In_Nested_View--list_item_1")
+		})), "EP 'EPinNestedView > EP_In_Product_Table_Cell_Found' registered");
+
+		// EP_in_Panel
+		assert.ok(this.oEPSpy.calledWith(sinon.match({
+			name: "EP_in_Panel",
+			view: idMatcher("myView--EPs_In_Nested_View"),
+			aggregationName: "content",
+			targetControl: idMatcher("myView--EPs_In_Nested_View") // target is the "content" aggr. of the nested view
+		})), "EP 'EPinNestedView > EP_in_Panel' registered");
+	}
+
+	/**
+	 * Evaluates if the control tree of the given View is correct.
+	 * We test if nested Views, Fragments and ExtensionPoints resolve in the correct
+	 * order and the controls are correctly aggregated.
+	 *
+	 * @param {function} assert the QUnit assert function
+	 */
+	function assertControlTreeCorrectness(assert, oView) {
+		// the Main View
+		const aActualContentAggregationOfOuterView = oView.getContent().map((oChild) => {
+			return oChild.getId();
+		});
+		const aExpectedContentAggregationOfOuterView = [
+			"myView--zero--defaultButton",
+			"myView--button0",
+			"myView--Panel",
+			"myView--button5",
+			"myView--button6",
+			"myView--ep99--button0",
+			"myView--ep99--input0",
+			"myView--ep99--input1",
+			"myView--shifty--customButton1",
+			"myView--shifty--customButton2",
+			"myView--button7",
+			"myView--tn1--customButton1",
+			"myView--tn1--customButton2",
+			"myView--myTable",
+			"myView--myListItem",
+			"myView--Panel_With_Nested_View",
+			"myView--ButtonInRootEP",
+			"myView--EPinEPButton",
+			"myView--EPinEPButton2",
+			"myView--EPinEPButton3",
+			"myView--EPinEPButtonDeepNesting",
+			"myView--EPinEPButtonDeepNesting2",
+			"myView--ButtonInRootEP2",
+			"myView--ButtonInRootEP3",
+			"myView--EPinEPButton4",
+			"myView--ButtonInRootEP4",
+			"myView--EPinEPRootFragment--extEPButton",
+			"myView--EPinEPRootFragment--extEPButtonChild",
+			"myView--EPRootFragment--extEPButton",
+			"myView--EPRootFragment--extEPButtonChild",
+			"myView--NestingFragment--EPRootFragment--extEPButton",
+			"myView--NestingFragment--EPRootFragment--extEPButtonChild",
+			"myView--EPinBinding--supplier_panel",
+			"myView--EPinBinding_in_nestedView"
+		];
+
+		assert.deepEqual(aActualContentAggregationOfOuterView, aExpectedContentAggregationOfOuterView, "Content Aggregation of View is correct.");
+
+		// check the nested View's content
+		const oNestedView = oView.byId("EPs_In_Nested_View");
+		assert.ok(oNestedView.isA("sap.ui.core.mvc.XMLView"), "Nested View is available");
+
+		// top level content
+		const aActualContentAggregationOfNestedView = oNestedView.getContent().map((oChild) => {
+			return oChild.getId();
+		});
+		const aExpectedContentAggregationOfNestedView = ['myView--EPs_In_Nested_View--product_table', 'myView--EPs_In_Nested_View--PanelButton'];
+
+		assert.deepEqual(aActualContentAggregationOfNestedView, aExpectedContentAggregationOfNestedView, "Nested Views' top-level content is correct.");
+
+		// Table content
+		const oTable = oNestedView.byId("product_table");
+
+		// -- columns
+		const aColumns = oTable.getColumns();
+
+		assert.deepEqual(aColumns.map((oCol) => {
+			return oCol.getId();
+		}), ["myView--EPs_In_Nested_View--column_0", "myView--EPs_In_Nested_View--column_1"],
+		"Columns are correctly ordered, including their nested EPs.");
+
+		assert.equal(aColumns[0].getHeader().getText(), "Table Header Text from EP Fragment: EP_In_Product_Table_Column.fragment.xml", "sap.m.Text from EP 'EP_In_Product_Table_Column' is correctly inserted into Column's 'header' aggregation.");
+		assert.equal(aColumns[1].getHeader().getText(), "Table Header Text from EP Fragment: EP_In_Product_Table_Column.fragment.xml", "sap.m.Text from EP 'EP_In_Product_Table_Column' is correctly inserted into Column's 'header' aggregation.");
+
+		// -- items
+		const aItems = oTable.getItems();
+
+		assert.deepEqual(aItems.map((oCLI) => {
+			return oCLI.getId();
+		}), ["myView--EPs_In_Nested_View--list_item_0", "myView--EPs_In_Nested_View--list_item_1"], "ColumnListItems are correctly ordered.");
+
+		// -- items -- cells
+
+		// 1st Item must have a cell with an EP's default content
+		const oCell0 = aItems[0].getCells()[0];
+		assert.ok(oCell0.isA("sap.m.Button"), "1st CLI's cell content is a 'sap.m.Button'.");
+		assert.equal(oCell0.getId(), "myView--EPs_In_Nested_View--TableRowButton", "1st CLI's cell is correct Button control with correct ID.");
+
+		// 2nd Item must have a cell with an EP's resolved content (a sap.m.Input field)
+		const oCell1 = aItems[1].getCells()[0];
+		assert.ok(oCell1.isA("sap.m.Input"), "2nd CLI's cell content is a 'sap.m.Input'.");
+		assert.equal(oCell1.getId(), "myView--EPs_In_Nested_View--column_list_item_fragment--Input_From_EP", "2nd CLI's cell is correct Input control with correct ID.");
+	}
+
+	QUnit.test("via XMLView: async", async function(assert) {
+		assert.expect(33);
 
 		// load the view
-		return XMLView.create({
+		const oView = await XMLView.create({
 			viewName: "testdata.customizing.customer.ext.Main",
 			id: "myView"
-		}).then(function(oView) {
-			var oNestedView = oView.byId("EPinBinding_in_nestedView");
-			return oNestedView.loaded().then(function() {
-				// inspect EP Provider calls
-				assert.equal(this.oEPSpy.args.length, 16, "16 Calls to the EP Provider");
-
-				// EP 1
-				var oArgsEP1 = this.oEPSpy.args[0][0];
-				assert.equal(oArgsEP1.name, "EP1", "EP1");
-				assert.ok(oArgsEP1.view.getMetadata().isA("sap.ui.core.mvc.View"), "EP1: View instance is correct");
-
-				// EP 2
-				var oArgsEP2 = this.oEPSpy.args[1][0];
-				assert.equal(oArgsEP2.name, "EP2", "EP2");
-				assert.ok(oArgsEP2.view.getMetadata().isA("sap.ui.core.mvc.View"), "EP2: View instance is correct");
-
-				// Closest Binding Carrier Test: EPinBinding from Fragement
-				// EP Product_Table_Cell_Ext
-				var oArgsProductTableCellInFragment = this.oEPSpy.args[2][0];
-				assert.equal(oArgsProductTableCellInFragment.name, "Product_Table_Cell_Ext", "Product_Table_Cell_Ext");
-				assert.ok(oArgsProductTableCellInFragment.view.getMetadata().isA("sap.ui.core.mvc.View"), "Product_Table_Cell_Ext: View instance is correct");
-				assert.equal(oArgsProductTableCellInFragment.closestAggregationBindingCarrier, "myView--EPinBinding--product_table", "BindingCarrier ID set correctly");
-				assert.equal(oArgsProductTableCellInFragment.closestAggregationBinding, "items", "BindingCarrier aggregation set cortrectly");
-
-				// EP Product_Table_Column_Ext
-				var oArgsProductTableColumnInFragment = this.oEPSpy.args[3][0];
-				assert.equal(oArgsProductTableColumnInFragment.name, "Product_Table_Column_Ext", "Product_Table_Column_Ext");
-				assert.ok(oArgsProductTableColumnInFragment.view.getMetadata().isA("sap.ui.core.mvc.View"), "Product_Table_Column_Ext: View instance is correct");
-				assert.equal(oArgsProductTableColumnInFragment.closestAggregationBindingCarrier, "myView--EPinBinding--supplier_panel", "BindingCarrier ID set correctly");
-				assert.equal(oArgsProductTableColumnInFragment.closestAggregationBinding, "content", "BindingCarrier aggregation set cortrectly");
-
-				// EP Panel_Button_Ext
-				var oArgsPanelButtonInFragment = this.oEPSpy.args[4][0];
-				assert.equal(oArgsPanelButtonInFragment.name, "Panel_Button_Ext", "Panel_Button_Ext");
-				assert.ok(oArgsPanelButtonInFragment.view.getMetadata().isA("sap.ui.core.mvc.View"), "Panel_Button_Ext: View instance is correct");
-				assert.equal(oArgsPanelButtonInFragment.closestAggregationBindingCarrier, "myView--EPinBinding--supplier_panel", "BindingCarrier ID set correctly");
-				assert.equal(oArgsPanelButtonInFragment.closestAggregationBinding, "content", "BindingCarrier aggregation set cortrectly");
-
-				// EP 0
-				var oArgsEP0 = this.oEPSpy.args[5][0];
-				assert.equal(oArgsEP0.name, "EP0", "EP0");
-				assert.ok(oArgsEP0.view.getMetadata().isA("sap.ui.core.mvc.View"), "EP0: View instance is correct");
-
-				// EP 99
-				var oArgsEP99 = this.oEPSpy.args[6][0];
-				assert.equal(oArgsEP99.name, "EP99", "EP99");
-				assert.ok(oArgsEP99.view.getMetadata().isA("sap.ui.core.mvc.View"), "EP99: View instance is correct");
-
-				// EP 23
-				var oArgsEP23 = this.oEPSpy.args[7][0];
-				assert.equal(oArgsEP23.name, "EP23", "EP23");
-				assert.ok(oArgsEP23.view.getMetadata().isA("sap.ui.core.mvc.View"), "EP23: View instance is correct");
-
-				// EP Table
-				var oArgsEPTable = this.oEPSpy.args[8][0];
-				assert.equal(oArgsEPTable.name, "EPTable", "EPTable");
-				assert.ok(oArgsEPTable.view.getMetadata().isA("sap.ui.core.mvc.View"), "EPTable: View instance is correct");
-
-				//EPinEPRoot
-				var oArgsEPinEP = this.oEPSpy.args[9][0];
-				assert.equal(oArgsEPinEP.name, "EPinEPRoot", "EPinEPRoot");
-				assert.ok(oArgsEPinEP.view.getMetadata().isA("sap.ui.core.mvc.View"), "EPinEPRoot: View instance is correct");
-
-				//EPinRootFragmentRoot
-				var oArgsEPinRootFragment = this.oEPSpy.args[10][0];
-				assert.equal(oArgsEPinRootFragment.name, "EPinRootFragment", "EPinRootFragment");
-				assert.ok(oArgsEPinRootFragment.view.getMetadata().isA("sap.ui.core.mvc.View"), "EPinRootFragment: View instance is correct");
-
-				// EP Root
-				var oArgsEPRoot = this.oEPSpy.args[11][0];
-				assert.equal(oArgsEPRoot.name, "EPRoot", "EPRoot");
-				assert.ok(oArgsEPRoot.view.getMetadata().isA("sap.ui.core.mvc.View"), "EPRoot: View instance is correct");
-				assert.equal(oArgsEPRoot.fragmentId, "EPRootFragment", "Local Fragment-ID is passed for 'EPRootFragment'");
-
-				// NestingFragment --> EP Root
-				var oArgsEPRootNested = this.oEPSpy.args[12][0];
-				assert.equal(oArgsEPRootNested.name, "EPRoot", "EPRoot");
-				assert.ok(oArgsEPRootNested.view.getMetadata().isA("sap.ui.core.mvc.View"), "EPRoot: View instance is correct");
-				assert.equal(oArgsEPRootNested.fragmentId, "NestingFragment--EPRootFragment", "Local Fragment-ID is passed for 'EPRootFragment'");
-
-				// Closest Binding Carrier Test: EPinBinding from nested View
-				// EP Product_Table_Cell_Ext_In_View
-				var oArgsProductTableCellInView = this.oEPSpy.args[13][0];
-				assert.equal(oArgsProductTableCellInView.name, "Product_Table_Cell_Ext_In_View", "Product_Table_Cell_Ext_In_View");
-				assert.ok(oArgsProductTableCellInView.view.getMetadata().isA("sap.ui.core.mvc.View"), "Product_Table_Cell_Ext_In_View: View instance is correct");
-				assert.equal(oArgsProductTableCellInView.closestAggregationBindingCarrier, "myView--EPinBinding_in_nestedView--product_table", "BindingCarrier ID set correctly");
-				assert.equal(oArgsProductTableCellInView.closestAggregationBinding, "items", "BindingCarrier aggregation set cortrectly");
-
-				// EP Product_Table_Column_Ext_In_View
-				var oArgsProductTableColumnInView = this.oEPSpy.args[14][0];
-				assert.equal(oArgsProductTableColumnInView.name, "Product_Table_Column_Ext_In_View", "Product_Table_Column_Ext_In_View");
-				assert.ok(oArgsProductTableColumnInView.view.getMetadata().isA("sap.ui.core.mvc.View"), "Product_Table_Column_Ext_In_View: View instance is correct");
-				assert.equal(oArgsProductTableColumnInView.closestAggregationBindingCarrier, "myView--EPinBinding_in_nestedView", "BindingCarrier ID set correctly");
-				assert.equal(oArgsProductTableColumnInView.closestAggregationBinding, "dependents", "BindingCarrier aggregation set cortrectly");
-
-				// EP Panel_Button_Ext_In_View
-				var oArgsPanelButtonInView = this.oEPSpy.args[15][0];
-				assert.equal(oArgsPanelButtonInView.name, "Panel_Button_Ext_In_View", "Panel_Button_Ext_In_View");
-				assert.ok(oArgsPanelButtonInView.view.getMetadata().isA("sap.ui.core.mvc.View"), "Panel_Button_Ext_In_View: View instance is correct");
-				assert.equal(oArgsPanelButtonInView.closestAggregationBindingCarrier, "myView--EPinBinding_in_nestedView", "BindingCarrier ID set correctly");
-				assert.equal(oArgsPanelButtonInView.closestAggregationBinding, "dependents", "BindingCarrier aggregation set cortrectly");
-
-				oView.destroy();
-			}.bind(this));
-		}.bind(this));
+		});
+
+		assertExtensionPointProviderSpies.bind(this)(assert, oView);
+
+		assertControlTreeCorrectness.bind(this)(assert, oView);
 
+		oView.destroy();
 	});
 
 	QUnit.module("Delayed Extension Point", {