Skip to content

Commit 3ba3fd1

Browse files
Fix Windows-specific file paths in TagHelperTooltipFactoryBaseTest
1 parent 0e54866 commit 3ba3fd1

File tree

1 file changed

+39
-23
lines changed

1 file changed

+39
-23
lines changed

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperTooltipFactoryBaseTest.cs

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#nullable disable
55

66
using System.Collections.Immutable;
7+
using System.IO;
78
using Microsoft.AspNetCore.Razor.Language;
89
using Microsoft.AspNetCore.Razor.Language.Components;
910
using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
@@ -360,8 +361,11 @@ public void GetAvailableProjects_OneProject_ReturnsNull()
360361
var tagHelpers = ImmutableArray.Create(builder.Build());
361362
var projectWorkspaceState = new ProjectWorkspaceState(tagHelpers, CodeAnalysis.CSharp.LanguageVersion.Default);
362363

363-
var razorFilePath = @"C:\path\to\file.razor";
364-
var project = TestProjectSnapshot.Create(@"C:\path\to\project.csproj", documentFilePaths: new[] { razorFilePath }, projectWorkspaceState);
364+
var baseDirectory = Path.Combine("C:", "path", "to");
365+
var razorFilePath = Path.Combine(baseDirectory, "file.razor");
366+
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
367+
368+
var project = TestProjectSnapshot.Create(projectFilePath, documentFilePaths: [razorFilePath], projectWorkspaceState);
365369

366370
var snapshotResolver = new TestSnapshotResolver(razorFilePath, project);
367371
var service = new TestTagHelperToolTipFactory(snapshotResolver);
@@ -381,18 +385,22 @@ public void GetAvailableProjects_AvailableInAllProjects_ReturnsNull()
381385
var tagHelpers = ImmutableArray.Create(builder.Build());
382386
var projectWorkspaceState = new ProjectWorkspaceState(tagHelpers, CodeAnalysis.CSharp.LanguageVersion.Default);
383387

384-
var razorFilePath = @"C:\path\to\file.razor";
388+
var baseDirectory = Path.Combine("C:", "path", "to");
389+
var razorFilePath = Path.Combine(baseDirectory, "file.razor");
390+
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
391+
var baseIntermediateOutputPath = Path.Combine(baseDirectory, "obj");
392+
385393
var project1 = TestProjectSnapshot.Create(
386-
@"C:\path\to\project.csproj",
387-
@"C:\path\to\obj\1",
388-
documentFilePaths: new[] { razorFilePath },
394+
projectFilePath,
395+
Path.Combine(baseIntermediateOutputPath, "1"),
396+
documentFilePaths: [razorFilePath],
389397
RazorConfiguration.Default,
390398
projectWorkspaceState);
391399

392400
var project2 = TestProjectSnapshot.Create(
393-
@"C:\path\to\project.csproj",
394-
@"C:\path\to\obj\2",
395-
documentFilePaths: new[] { razorFilePath },
401+
projectFilePath,
402+
Path.Combine(baseIntermediateOutputPath, "2"),
403+
documentFilePaths: [razorFilePath],
396404
RazorConfiguration.Default,
397405
projectWorkspaceState);
398406

@@ -414,19 +422,23 @@ public void GetAvailableProjects_NotAvailableInAllProjects_ReturnsText()
414422
var tagHelpers = ImmutableArray.Create(builder.Build());
415423
var projectWorkspaceState = new ProjectWorkspaceState(tagHelpers, CodeAnalysis.CSharp.LanguageVersion.Default);
416424

417-
var razorFilePath = @"C:\path\to\file.razor";
425+
var baseDirectory = Path.Combine("C:", "path", "to");
426+
var razorFilePath = Path.Combine(baseDirectory, "file.razor");
427+
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
428+
var baseIntermediateOutputPath = Path.Combine(baseDirectory, "obj");
429+
418430
var project1 = TestProjectSnapshot.Create(
419-
@"C:\path\to\project.csproj",
420-
@"C:\path\to\obj\1",
421-
documentFilePaths: new[] { razorFilePath },
431+
projectFilePath,
432+
Path.Combine(baseIntermediateOutputPath, "1"),
433+
documentFilePaths: [razorFilePath],
422434
RazorConfiguration.Default,
423435
projectWorkspaceState,
424436
displayName: "project1");
425437

426438
var project2 = TestProjectSnapshot.Create(
427-
@"C:\path\to\project.csproj",
428-
@"C:\path\to\obj\2",
429-
documentFilePaths: new[] { razorFilePath },
439+
projectFilePath,
440+
Path.Combine(baseIntermediateOutputPath, "2"),
441+
documentFilePaths: [razorFilePath],
430442
RazorConfiguration.Default,
431443
projectWorkspaceState: null,
432444
displayName: "project2");
@@ -446,19 +458,23 @@ public void GetAvailableProjects_NotAvailableInAllProjects_ReturnsText()
446458
[Fact]
447459
public void GetAvailableProjects_NotAvailableInAnyProject_ReturnsText()
448460
{
449-
var razorFilePath = @"C:\path\to\file.razor";
461+
var baseDirectory = Path.Combine("C:", "path", "to");
462+
var razorFilePath = Path.Combine(baseDirectory, "file.razor");
463+
var projectFilePath = Path.Combine(baseDirectory, "project.csproj");
464+
var baseIntermediateOutputPath = Path.Combine(baseDirectory, "obj");
465+
450466
var project1 = TestProjectSnapshot.Create(
451-
@"C:\path\to\project.csproj",
452-
@"C:\path\to\obj\1",
453-
documentFilePaths: new[] { razorFilePath },
467+
projectFilePath,
468+
Path.Combine(baseIntermediateOutputPath, "1"),
469+
documentFilePaths: [razorFilePath],
454470
RazorConfiguration.Default,
455471
projectWorkspaceState: null,
456472
displayName: "project1");
457473

458474
var project2 = TestProjectSnapshot.Create(
459-
@"C:\path\to\project.csproj",
460-
@"C:\path\to\obj\2",
461-
documentFilePaths: new[] { razorFilePath },
475+
projectFilePath,
476+
Path.Combine(baseIntermediateOutputPath, "2"),
477+
documentFilePaths: [razorFilePath],
462478
RazorConfiguration.Default,
463479
projectWorkspaceState: null,
464480
displayName: "project2");

0 commit comments

Comments
 (0)