Skip to content

Commit 15200d4

Browse files
[build] Add BenchmarkDotNet.Exporters.Plotting.Tests to unit-tests
1 parent 834417a commit 15200d4

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
33
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
4+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
5+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
6+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
47
<s:Boolean x:Key="/Default/UserDictionary/Words/=Nupkg/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

build/BenchmarkDotNet.Build/Runners/UnitTestRunner.cs

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,25 @@
77

88
namespace BenchmarkDotNet.Build.Runners;
99

10-
public class UnitTestRunner
10+
public class UnitTestRunner(BuildContext context)
1111
{
12-
private readonly BuildContext context;
12+
private FilePath UnitTestsProjectFile { get; } = context.RootDirectory
13+
.Combine("tests")
14+
.Combine("BenchmarkDotNet.Tests")
15+
.CombineWithFilePath("BenchmarkDotNet.Tests.csproj");
1316

14-
private FilePath UnitTestsProjectFile { get; }
15-
private FilePath IntegrationTestsProjectFile { get; }
16-
private DirectoryPath TestOutputDirectory { get; }
17+
private FilePath ExporterTestsProjectFile { get; } = context.RootDirectory
18+
.Combine("tests")
19+
.Combine("BenchmarkDotNet.Exporters.Plotting.Tests")
20+
.CombineWithFilePath("BenchmarkDotNet.Exporters.Plotting.Tests.csproj");
1721

18-
public UnitTestRunner(BuildContext context)
19-
{
20-
this.context = context;
21-
UnitTestsProjectFile = context.RootDirectory
22-
.Combine("tests")
23-
.Combine("BenchmarkDotNet.Tests")
24-
.CombineWithFilePath("BenchmarkDotNet.Tests.csproj");
25-
IntegrationTestsProjectFile = context.RootDirectory
26-
.Combine("tests")
27-
.Combine("BenchmarkDotNet.IntegrationTests")
28-
.CombineWithFilePath("BenchmarkDotNet.IntegrationTests.csproj");
29-
TestOutputDirectory = context.RootDirectory
30-
.Combine("TestResults");
31-
}
22+
private FilePath IntegrationTestsProjectFile { get; } = context.RootDirectory
23+
.Combine("tests")
24+
.Combine("BenchmarkDotNet.IntegrationTests")
25+
.CombineWithFilePath("BenchmarkDotNet.IntegrationTests.csproj");
26+
27+
private DirectoryPath TestOutputDirectory { get; } = context.RootDirectory
28+
.Combine("TestResults");
3229

3330
private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tfm)
3431
{
@@ -58,14 +55,15 @@ private void RunTests(FilePath projectFile, string alias, string tfm)
5855
context.DotNetTest(projectFile.FullPath, settings);
5956
}
6057

61-
private void RunUnitTests(string tfm) => RunTests(UnitTestsProjectFile, "unit", tfm);
58+
private void RunUnitTests(string tfm)
59+
{
60+
RunTests(UnitTestsProjectFile, "unit", tfm);
61+
RunTests(ExporterTestsProjectFile, "exporters", tfm);
62+
}
6263

6364
public void RunUnitTests()
6465
{
65-
var targetFrameworks = context.IsRunningOnWindows()
66-
? new[] { "net462", "net8.0" }
67-
: new[] { "net8.0" };
68-
66+
string[] targetFrameworks = context.IsRunningOnWindows() ? ["net462", "net8.0"] : ["net8.0"];
6967
foreach (var targetFramework in targetFrameworks)
7068
RunUnitTests(targetFramework);
7169
}

0 commit comments

Comments
 (0)