Skip to content

Commit

Permalink
Fix up tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoeRobich
JoeRobich committed May 31, 2023
1 parent 953ae8e commit 43e6210
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build/Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PropertyGroup>
<MicrosoftExtensionPackageVersion>7.0.0</MicrosoftExtensionPackageVersion>
<MicrosoftTestPackageVersion>17.6.0</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>17.6.3</MSBuildPackageVersion>
<MSBuildPackageVersion>17.3.2</MSBuildPackageVersion>
<NuGetPackageVersion>6.7.0-preview.1.20</NuGetPackageVersion>
<RoslynPackageVersion>4.7.0-2.23225.15</RoslynPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task RunXunitTest()
XunitTestProject,
methodName: "Main.Test.MainTest.Test",
testFramework: "xunit",
targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
assert: AssertCorrectness);
}

Expand All @@ -34,7 +34,7 @@ public async Task RunNunitTest()
NUnitTestProject,
methodName: "Main.Test.MainTest.Test",
testFramework: "nunit",
targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
assert: AssertCorrectness);
}

Expand All @@ -45,7 +45,7 @@ public async Task RunMSTestTest()
MSTestProject,
methodName: "Main.Test.MainTest.Test",
testFramework: "mstest",
targetFrameworkVersion: ".NETCoreApp,Version=v3.1",
targetFrameworkVersion: ".NETCoreApp,Version=v6.0",
assert: AssertCorrectness);
}

Expand Down
14 changes: 7 additions & 7 deletions tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public async Task RunXunitTest()
methodName: "Main.Test.MainTest.Test",
testFramework: "xunit",
shouldPass: true,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
}

[Fact]
Expand All @@ -76,7 +76,7 @@ public async Task RunXunitTheoryWithInlineData1()
methodName: "Main.Test.MainTest.DataDrivenTest1",
testFramework: "xunit",
shouldPass: false,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
}

[Fact]
Expand All @@ -87,7 +87,7 @@ public async Task RunXunitTheoryWithInlineData2()
methodName: "Main.Test.MainTest.DataDrivenTest2",
testFramework: "xunit",
shouldPass: true,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
}

[Fact]
Expand All @@ -98,7 +98,7 @@ public async Task RunXunitTestWithDisplayName()
methodName: "Main.Test.MainTest.UsesDisplayName",
testFramework: "xunit",
shouldPass: true,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");
}

[Fact]
Expand All @@ -109,7 +109,7 @@ public async Task RunXunitTestWithSimilarName()
methodName: "Main.Test.MainTest.TestWithSimilarName",
testFramework: "xunit",
shouldPass: true,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");

Assert.Single(response.Results);
}
Expand All @@ -122,7 +122,7 @@ public async Task RunXunitFailingTest()
methodName: "Main.Test.MainTest.FailingTest",
testFramework: "xunit",
shouldPass: false,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");

Assert.Single(response.Results);
Assert.NotEmpty(response.Results[0].ErrorMessage);
Expand All @@ -137,7 +137,7 @@ public async Task RunXunitStandardOutputIsReturned()
methodName: "Main.Test.MainTest.CheckStandardOutput",
testFramework: "xunit",
shouldPass: true,
targetFrameworkVersion: ".NETCoreApp,Version=v3.1");
targetFrameworkVersion: ".NETCoreApp,Version=v6.0");

Assert.Single(response.Results);
Assert.NotEmpty(response.Results[0].StandardOutput);
Expand Down
3 changes: 1 addition & 2 deletions tests/OmniSharp.MSBuild.Tests/ProjectFileInfoTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ public async Task ProjectReferenceProducingAnalyzerItems()
var projectFilePath = Path.Combine(testProject.Directory, "ConsumingProject", "ConsumingProject.csproj");
var projectFileInfo = CreateProjectFileInfo(_sharedOmniSharpHostFixture.OmniSharpTestHost, testProject, projectFilePath);
Assert.Empty(projectFileInfo.ProjectReferences);
var analyzerFileReference = Assert.Single(projectFileInfo.Analyzers);
Assert.EndsWith("Analyzer.dll", analyzerFileReference);
Assert.Single(projectFileInfo.Analyzers.Where(path => Path.GetFileName(path) == "Analyzer.dll"));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/OmniSharp.MSBuild.Tests/ProjectLoadListenerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public async Task If_there_are_multiple_target_frameworks_they_are_emitted()
Assert.Single(emitter.ReceivedMessages);
var tfm = emitter.ReceivedMessages[0].TargetFrameworks.ToArray();
Assert.Equal(2, tfm.Count());
Assert.Equal("netstandard2.0", tfm[0]);
Assert.Equal("netstandard1.5", tfm[0]);
Assert.Equal("netstandard2.0", tfm[1]);
}

Expand Down
16 changes: 8 additions & 8 deletions tests/OmniSharp.MSBuild.Tests/WorkspaceInformationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task TestProjectAndSolution()
Assert.True(project.IsExe);
Assert.False(project.IsUnityProject);

Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
var targetFramework = Assert.Single(project.TargetFrameworks);
Assert.Equal("net6.0", targetFramework.ShortName);
}
Expand All @@ -66,7 +66,7 @@ public async Task TestProjectAndSolutionFilter()
Assert.True(project.IsExe);
Assert.False(project.IsUnityProject);

Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
var targetFramework = Assert.Single(project.TargetFrameworks);
Assert.Equal("net6.0", targetFramework.ShortName);
}
Expand All @@ -82,7 +82,7 @@ public async Task ProjectAndSolutionWithProjectSection()
Assert.Equal("ProjectAndSolutionWithProjectSection.sln", Path.GetFileName(workspaceInfo.SolutionPath));
Assert.NotNull(workspaceInfo.Projects);
var project = Assert.Single(workspaceInfo.Projects);
Assert.Equal(".NETCoreApp,Version=v3.1", project.TargetFramework);
Assert.Equal(".NETCoreApp,Version=v6.0", project.TargetFramework);
Assert.Equal("net6.0", project.TargetFrameworks[0].ShortName);
}

Expand Down Expand Up @@ -127,12 +127,12 @@ public async Task TwoProjectsWithSolution()

var firstProject = workspaceInfo.Projects[0];
Assert.Equal("App.csproj", Path.GetFileName(firstProject.Path));
Assert.Equal(".NETCoreApp,Version=v3.1", firstProject.TargetFramework);
Assert.Equal(".NETCoreApp,Version=v6.0", firstProject.TargetFramework);
Assert.Equal("net6.0", firstProject.TargetFrameworks[0].ShortName);

var secondProject = workspaceInfo.Projects[1];
Assert.Equal("Lib.csproj", Path.GetFileName(secondProject.Path));
Assert.Equal(".NETStandard,Version=v1.3", secondProject.TargetFramework);
Assert.Equal(".NETStandard,Version=v2.0", secondProject.TargetFramework);
Assert.Equal("netstandard2.0", secondProject.TargetFrameworks[0].ShortName);
}

Expand All @@ -150,12 +150,12 @@ public async Task TwoProjectsWithSolutionAndCustomConfigurations()

var firstProject = workspaceInfo.Projects[0];
Assert.Equal("App.csproj", Path.GetFileName(firstProject.Path));
Assert.Equal(".NETCoreApp,Version=v3.1", firstProject.TargetFramework);
Assert.Equal(".NETCoreApp,Version=v6.0", firstProject.TargetFramework);
Assert.Equal("net6.0", firstProject.TargetFrameworks[0].ShortName);

var secondProject = workspaceInfo.Projects[1];
Assert.Equal("Lib.csproj", Path.GetFileName(secondProject.Path));
Assert.Equal(".NETStandard,Version=v1.3", secondProject.TargetFramework);
Assert.Equal(".NETStandard,Version=v1.5", secondProject.TargetFramework);
Assert.Equal("netstandard2.0", secondProject.TargetFrameworks[0].ShortName);
}

Expand Down Expand Up @@ -268,7 +268,7 @@ public async Task TestProjectWithMultiTFMReferencedProjectOutsideOfOmniSharp()

var project2 = workspaceInfo.Projects[1];
Assert.Equal("Lib.csproj", Path.GetFileName(project2.Path));
Assert.Equal(".NETStandard,Version=v1.3", project2.TargetFramework);
Assert.Equal(".NETStandard,Version=v1.5", project2.TargetFramework);
Assert.Equal(2, project2.TargetFrameworks.Count);
}

Expand Down

0 comments on commit 43e6210

Please sign in to comment.