@@ -23,25 +23,31 @@ import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilit
23
23
import { getBuildAllTask , SwiftTask } from "../../../src/tasks/SwiftTaskProvider" ;
24
24
import { testAssetPath } from "../../fixtures" ;
25
25
import { activateExtensionForSuite , folderInRootWorkspace } from "../utilities/testutilities" ;
26
+ import { FolderContext } from "../../../src/FolderContext" ;
27
+ import { WorkspaceContext } from "../../../src/WorkspaceContext" ;
26
28
27
29
suite ( "PackageDependencyProvider Test Suite" , function ( ) {
30
+ let workspaceContext : WorkspaceContext ;
31
+ let folderContext : FolderContext ;
28
32
let treeProvider : PackageDependenciesProvider ;
29
33
this . timeout ( 2 * 60 * 1000 ) ; // Allow up to 2 minutes to build
30
34
31
35
activateExtensionForSuite ( {
32
36
async setup ( ctx ) {
33
- const workspaceContext = ctx ;
37
+ workspaceContext = ctx ;
34
38
await waitForNoRunningTasks ( ) ;
35
- await folderInRootWorkspace ( "defaultPackage" , workspaceContext ) ;
36
- const folderContext = await folderInRootWorkspace ( "dependencies" , workspaceContext ) ;
39
+ folderContext = await folderInRootWorkspace ( "dependencies" , workspaceContext ) ;
37
40
await executeTaskAndWaitForResult ( ( await getBuildAllTask ( folderContext ) ) as SwiftTask ) ;
41
+ await folderContext . reload ( ) ;
38
42
treeProvider = new PackageDependenciesProvider ( workspaceContext ) ;
39
- await workspaceContext . focusFolder ( folderContext ) ;
40
43
} ,
41
44
async teardown ( ) {
42
45
treeProvider . dispose ( ) ;
43
46
} ,
44
- testAssets : [ "dependencies" ] ,
47
+ } ) ;
48
+
49
+ setup ( async ( ) => {
50
+ await workspaceContext . focusFolder ( folderContext ) ;
45
51
} ) ;
46
52
47
53
test ( "Includes remote dependency" , async ( ) => {
0 commit comments