More strict SwiftPackage test setup

Author: plemarquand

test/integration-tests/SwiftPackage.test.ts

@@ -15,6 +15,7 @@ import * as assert from "assert";
 
 import { FolderContext } from "@src/FolderContext";
 import { SwiftPackage } from "@src/SwiftPackage";
+import { WorkspaceContext } from "@src/WorkspaceContext";
 import { Version } from "@src/utilities/version";
 
 import { tag } from "../tags";
@@ -24,12 +25,22 @@ import { activateExtensionForSuite } from "./utilities/testutilities";
 tag("medium").suite("SwiftPackage Test Suite", function () {
     let swiftPackage: SwiftPackage;
 
+    function getFolderContext(ctx: WorkspaceContext, asset: string): FolderContext {
+        const folders = ctx.folders.filter(folder => folder.name.endsWith(asset));
+        if (folders.length === 0) {
+            throw new Error(`Test asset folder ${asset} not found`);
+        }
+        return folders[0];
+    }
+
     suite("empty-folder", () => {
+        const asset = "empty-folder";
+
         activateExtensionForSuite({
             async setup(ctx) {
-                swiftPackage = ctx.folders[0].swiftPackage;
+                swiftPackage = getFolderContext(ctx, asset).swiftPackage;
             },
-            testAssets: ["empty-folder"],
+            testAssets: [asset],
         });
 
         test("No package", async () => {
@@ -38,11 +49,13 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
     });
 
     suite("invalid-package", () => {
+        const asset = "invalid-package";
+
         activateExtensionForSuite({
             async setup(ctx) {
-                swiftPackage = ctx.folders[0].swiftPackage;
+                swiftPackage = getFolderContext(ctx, asset).swiftPackage;
             },
-            testAssets: ["invalid-package"],
+            testAssets: [asset],
         });
 
         test("Invalid Package", async () => {
@@ -52,14 +65,15 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
     });
 
     suite("package2", () => {
+        const asset = "package2";
         let folderContext: FolderContext;
 
         activateExtensionForSuite({
             async setup(ctx) {
-                folderContext = ctx.folders[0];
+                folderContext = getFolderContext(ctx, asset);
                 swiftPackage = folderContext.swiftPackage;
             },
-            testAssets: ["package2"],
+            testAssets: [asset],
         });
 
         test("Library Package", async () => {
@@ -83,13 +97,15 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
     });
 
     suite("package5.6", () => {
+        const asset = "package5.6";
+
         let swiftVersion: Version;
         activateExtensionForSuite({
             async setup(ctx) {
                 swiftVersion = ctx.globalToolchain.swiftVersion;
-                swiftPackage = ctx.folders[0].swiftPackage;
+                swiftPackage = getFolderContext(ctx, asset).swiftPackage;
             },
-            testAssets: ["package5.6"],
+            testAssets: [asset],
         });
 
         test("Package resolve v2", async function () {
@@ -105,11 +121,13 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
     });
 
     suite("identity-case", () => {
+        const asset = "identity-case";
+
         activateExtensionForSuite({
             async setup(ctx) {
-                swiftPackage = ctx.folders[0].swiftPackage;
+                swiftPackage = getFolderContext(ctx, asset).swiftPackage;
             },
-            testAssets: ["identity-case"],
+            testAssets: [asset],
         });
 
         test("Identity case-insensitivity", async () => {
@@ -122,11 +140,13 @@ tag("medium").suite("SwiftPackage Test Suite", function () {
     });
 
     suite("identity-different", () => {
+        const asset = "identity-different";
+
         activateExtensionForSuite({
             async setup(ctx) {
-                swiftPackage = ctx.folders[0].swiftPackage;
+                swiftPackage = getFolderContext(ctx, asset).swiftPackage;
             },
-            testAssets: ["identity-different"],
+            testAssets: [asset],
         });
 
         test("Identity case-insensitivity", async () => {