@@ -23,25 +23,31 @@ import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilit
2323import { getBuildAllTask , SwiftTask } from "../../../src/tasks/SwiftTaskProvider" ;
2424import { testAssetPath } from "../../fixtures" ;
2525import { activateExtensionForSuite , folderInRootWorkspace } from "../utilities/testutilities" ;
26+ import { FolderContext } from "../../../src/FolderContext" ;
27+ import { WorkspaceContext } from "../../../src/WorkspaceContext" ;
2628
2729suite ( "PackageDependencyProvider Test Suite" , function ( ) {
30+ let workspaceContext : WorkspaceContext ;
31+ let folderContext : FolderContext ;
2832 let treeProvider : PackageDependenciesProvider ;
2933 this . timeout ( 2 * 60 * 1000 ) ; // Allow up to 2 minutes to build
3034
3135 activateExtensionForSuite ( {
3236 async setup ( ctx ) {
33- const workspaceContext = ctx ;
37+ workspaceContext = ctx ;
3438 await waitForNoRunningTasks ( ) ;
35- await folderInRootWorkspace ( "defaultPackage" , workspaceContext ) ;
36- const folderContext = await folderInRootWorkspace ( "dependencies" , workspaceContext ) ;
39+ folderContext = await folderInRootWorkspace ( "dependencies" , workspaceContext ) ;
3740 await executeTaskAndWaitForResult ( ( await getBuildAllTask ( folderContext ) ) as SwiftTask ) ;
41+ await folderContext . reload ( ) ;
3842 treeProvider = new PackageDependenciesProvider ( workspaceContext ) ;
39- await workspaceContext . focusFolder ( folderContext ) ;
4043 } ,
4144 async teardown ( ) {
4245 treeProvider . dispose ( ) ;
4346 } ,
44- testAssets : [ "dependencies" ] ,
47+ } ) ;
48+
49+ setup ( async ( ) => {
50+ await workspaceContext . focusFolder ( folderContext ) ;
4551 } ) ;
4652
4753 test ( "Includes remote dependency" , async ( ) => {
0 commit comments