Fix issue in dependency handling, improve tests

SAP · Dec 29, 2019 · f72c914 · f72c914
1 parent dcb2252
commit f72c914
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/lib/processors/resourceListCreator.js b/lib/processors/resourceListCreator.js
@@ -146,10 +146,6 @@ class ResourceInfo {
 		}
 		return result;
 	}
-
-	isEmpty() {
-		return this.i18nLocale == null && this.i18nName == null && this.isDebug == false && this.theme == null && this.merged == false;
-	}
 }
 
 /**
@@ -412,7 +408,7 @@ class ResourceCollector {
 				resourceInfo.condRequired = resourceInfo.condRequired || new Set();
 				info.dependencies.forEach((dep) => {
 					if ( info.isConditionalDependency(dep) ) {
-						resourceInfo.condRequired.push(dep);
+						resourceInfo.condRequired.add(dep);
 					} else if ( !info.isImplicitDependency(dep) ) {
 						resourceInfo.required.add(dep);
 					}

diff --git a/test/expected/build/library.n/dest/resources/library/n/Button-dbg.js b/test/expected/build/library.n/dest/resources/library/n/Button-dbg.js
@@ -14,7 +14,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	return Control.extend("library.n.Button", { 
+	return Control.extend("library.n.Button", {
 		metadata : {
 			library : "library.n",
 			properties : {
@@ -44,6 +44,13 @@ sap.ui.define([
 				oRm.close("span");
 				oRm.close("button");
 			}
+		},
+		helper: function(sCalendarType) {
+			var sCalendar = "sap/ui/core/date/" + sCalendarType;
+			sap.ui.require(["sap/ui/core/format/DateFormat", sCalendar], function(DateFormat, Calendar) {
+				DateFormat.getInstance();
+				new Calendar();
+			});
 		}
 	});
 

diff --git a/test/expected/build/library.n/dest/resources/library/n/Button.js b/test/expected/build/library.n/dest/resources/library/n/Button.js
diff --git a/test/expected/build/library.n/dest/resources/library/n/resources.json b/test/expected/build/library.n/dest/resources/library/n/resources.json
@@ -11,15 +11,23 @@
 			"required": [
 				"library/n/library.js",
 				"sap/ui/core/Control.js"
-			]
+			],
+			"condRequired": [
+				"sap/ui/core/format/DateFormat.js"
+			],
+			"dynRequired": true
 		},
 		{
 			"name": "Button.js",
 			"module": "library/n/Button.js",
 			"required": [
 				"library/n/library.js",
 				"sap/ui/core/Control.js"
-			]
+			],
+			"condRequired": [
+				"sap/ui/core/format/DateFormat.js"
+			],
+			"dynRequired": true
 		},
 		{
 			"name": "changeHandler/SplitButton-dbg.js",

diff --git a/test/fixtures/library.n/src/library/n/Button.js b/test/fixtures/library.n/src/library/n/Button.js
@@ -12,7 +12,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	return Control.extend("library.n.Button", { 
+	return Control.extend("library.n.Button", {
 		metadata : {
 			library : "library.n",
 			properties : {
@@ -42,6 +42,13 @@ sap.ui.define([
 				oRm.close("span");
 				oRm.close("button");
 			}
+		},
+		helper: function(sCalendarType) {
+			var sCalendar = "sap/ui/core/date/" + sCalendarType;
+			sap.ui.require(["sap/ui/core/format/DateFormat", sCalendar], function(DateFormat, Calendar) {
+				DateFormat.getInstance();
+				new Calendar();
+			});
 		}
 	});