[INTERNAL] ResourceCollector: Fix existing tests

Author: RandomByte

test/lib/lbt/resources/ResourceCollector.js

@@ -77,7 +77,7 @@ test.serial("groupResourcesByComponents: debugBundles", async (t) => {
 	});
 	await resourceCollector.visitResource({getPath: () => "/resources/testcomp/Component.js", getSize: async () => 13});
 	await resourceCollector.visitResource({getPath: () => "/resources/my/file.js", getSize: async () => 13});
-	resourceCollector.groupResourcesByComponents({debugBundles: [".*-dbg.js"]});
+	resourceCollector.groupResourcesByComponents();
 	t.is(resourceCollector.resources.size, 0, "all resources were deleted");
 });
 
@@ -86,7 +86,7 @@ test.serial("groupResourcesByComponents: theme", async (t) => {
 	await resourceCollector.visitResource({getPath: () => "/resources/themes/a/.theming", getSize: async () => 13});
 	t.is(resourceCollector.themePackages.size, 1, "1 theme was added");
 	await resourceCollector.determineResourceDetails({});
-	resourceCollector.groupResourcesByComponents({});
+	resourceCollector.groupResourcesByComponents();
 	t.is(resourceCollector.themePackages.get("themes/a/").resources.length, 1, "1 theme was grouped");
 });
 
@@ -102,7 +102,7 @@ test.serial("determineResourceDetails: properties", async (t) => {
 	await resourceCollector.visitResource({getPath: () => "/resources/mylib/i18n/i18n_de.properties", getSize: async () => 13});
 	await resourceCollector.visitResource({getPath: () => "/resources/mylib/i18n/i18n.properties", getSize: async () => 13});
 	await resourceCollector.determineResourceDetails({});
-	resourceCollector.groupResourcesByComponents({});
+	resourceCollector.groupResourcesByComponents();
 	const resources = resourceCollector.components.get("mylib/").resources;
 	t.deepEqual(resources.map((res) => res.i18nName), [null, "i18n/i18n.properties", "i18n/i18n.properties"], "i18nName was set");
 });
@@ -119,7 +119,7 @@ test.serial("determineResourceDetails: view.xml", async (t) => {
 	await resourceCollector.visitResource({getPath: () => "/resources/mylib/my.view.xml", getSize: async () => 13});
 	await resourceCollector.determineResourceDetails({});
 	t.is(enrichWithDependencyInfoStub.callCount, 1, "is called once");
-	t.is(enrichWithDependencyInfoStub.getCall(0).args[0].name, "mylib/my.view.xml", "is called with view");
+	t.is(enrichWithDependencyInfoStub.getCall(0).args[0].resourceInfo.name, "mylib/my.view.xml", "is called with view");
 });
 
 test.serial("enrichWithDependencyInfo: add infos to resourceinfo", async (t) => {
@@ -147,7 +147,7 @@ test.serial("enrichWithDependencyInfo: add infos to resourceinfo", async (t) =>
 		}
 	});
 	const resourceInfo = {};
-	await resourceCollector.enrichWithDependencyInfo(resourceInfo);
+	await resourceCollector.enrichWithDependencyInfo({resourceInfo});
 	t.deepEqual(resourceInfo, {
 		condRequired: new Set(["mydependency.conditional"]),
 		dynRequired: true,

test/lib/lbt/resources/ResourceInfoList.js

@@ -16,38 +16,28 @@ test("add: add new resources", (t) => {
 	t.falsy(result.module, "module is not set");
 });
 
-test("add: add source then debug resources", (t) => {
+test("add: add non-debug resource", (t) => {
 	const resourceInfoList = new ResourceInfoList("prefix");
 
-	resourceInfoList.add({name: "myfile.js", module: "myfile.js", size: 13});
+	resourceInfoList.add({name: "myfile.js", module: "myfile.js", size: 13, required: new Set(["some-dep.js"])});
 
-	const myInfo = {name: "myfile-dbg.js", size: 13};
-	resourceInfoList.add(myInfo);
-
-	t.is(resourceInfoList.resources.length, 2, "two entries");
+	t.is(resourceInfoList.resources.length, 1, "one resource added");
 
 	const result = resourceInfoList.resourcesByName.get("../myfile.js");
 	t.is(result.module, "myfile.js", "module is set");
-
-	const resultDbg = resourceInfoList.resourcesByName.get("../myfile-dbg.js");
-	t.is(resultDbg.module, "myfile.js", "module is set");
+	t.deepEqual(result.required, new Set(["some-dep.js"]), "module is set");
 });
 
-test("add: add debug then source resources", (t) => {
+test("add: add debug resources", (t) => {
 	const resourceInfoList = new ResourceInfoList("prefix");
 
-	resourceInfoList.add({name: "myfile-dbg.js", size: 13});
+	resourceInfoList.add({name: "myfile-dbg.js", size: 13, required: new Set(["some-dep.js"])});
 
-	const myInfo = {name: "myfile.js", module: "myfile.js", size: 13};
-	resourceInfoList.add(myInfo);
-
-	t.is(resourceInfoList.resources.length, 2, "two entries");
-
-	const result = resourceInfoList.resourcesByName.get("../myfile.js");
-	t.is(result.module, "myfile.js", "module is set");
+	t.is(resourceInfoList.resources.length, 1, "one resource added");
 
 	const resultDbg = resourceInfoList.resourcesByName.get("../myfile-dbg.js");
 	t.is(resultDbg.module, "myfile.js", "module is set");
+	t.deepEqual(resultDbg.required, new Set(["some-dep.js"]), "module is set");
 });
 
 test("add: add i18n resource", (t) => {