From 7d60d66a86cf1db0283dec0a4ba37850fbf0c9f4 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Mon, 29 Aug 2016 09:46:12 -0700 Subject: [PATCH] Addressing more code review comments. --- Microsoft.DotNet.Cli.sln | 26 +++++++++---------- ...nner.cs => AssemblyTestRunnerDecorator.cs} | 4 +-- .../ConsoleTestRunner.cs | 8 +++--- .../DesignTimeRunner.cs | 8 +++--- .../DotnetTestRunnerFactory.cs | 4 +-- ...r.cs => ProjectJsonTestRunnerDecorator.cs} | 4 +-- ...r.cs => AssemblyTestRunnerNameResolver.cs} | 6 ++--- .../DotnetTestRunnerResolverFactory.cs | 16 ++++++------ ...Resolver.cs => ITestRunnerNameResolver.cs} | 2 +- ....cs => ParameterTestRunnerNameResolver.cs} | 4 +-- ...s => ProjectJsonTestRunnerNameResolver.cs} | 4 +-- ... GivenAParameterTestRunnerNameResolver.cs} | 4 +-- ...ivenAProjectJsonTestRunnerNameResolver.cs} | 8 +++--- ...ameResolverFactoryAndADotnetTestParams.cs} | 8 +++--- ... GivenAnAssemblyTestRunnerNameResolver.cs} | 13 ++++++---- 15 files changed, 61 insertions(+), 58 deletions(-) rename src/Microsoft.DotNet.Tools.Test/{AssemblyTestRunner.cs => AssemblyTestRunnerDecorator.cs} (86%) rename src/Microsoft.DotNet.Tools.Test/{TestRunners/ProjectJsonTestRunner.cs => ProjectJsonTestRunnerDecorator.cs} (97%) rename src/Microsoft.DotNet.Tools.Test/TestRunners/{AssemblyTestRunnerResolver.cs => AssemblyTestRunnerNameResolver.cs} (79%) rename src/Microsoft.DotNet.Tools.Test/TestRunners/{ITestRunnerResolver.cs => ITestRunnerNameResolver.cs} (85%) rename src/Microsoft.DotNet.Tools.Test/TestRunners/{ParameterTestRunnerResolver.cs => ParameterTestRunnerNameResolver.cs} (76%) rename src/Microsoft.DotNet.Tools.Test/TestRunners/{ProjectJsonTestRunnerResolver.cs => ProjectJsonTestRunnerNameResolver.cs} (78%) rename test/dotnet-test.UnitTests/{GivenAParameterTestRunnerResolver.cs => GivenAParameterTestRunnerNameResolver.cs} (88%) rename test/dotnet-test.UnitTests/{GivenAProjectJsonTestRunnerResolver.cs => GivenAProjectJsonTestRunnerNameResolver.cs} (91%) rename test/dotnet-test.UnitTests/{GivenATestRunnerResolverFactoryAndADotnetTestParams.cs => GivenATestRunnerNameResolverFactoryAndADotnetTestParams.cs} (95%) rename test/dotnet-test.UnitTests/{GivenAnAssemblyTestRunnerResolver.cs => GivenAnAssemblyTestRunnerNameResolver.cs} (86%) diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 770834c0c..f8d3bd28e 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -152,7 +152,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1 build\publish\PublishContent.targets = build\publish\PublishContent.targets EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-test-console", "src\dotnet-test-console\dotnet-test-console.xproj", "{6D028154-5518-4A56-BAD6-938A90E5BCF6}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Test", "src\Microsoft.DotNet.Tools.Test\Microsoft.DotNet.Tools.Test.xproj", "{6D028154-5518-4A56-BAD6-938A90E5BCF6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -840,20 +840,20 @@ Global {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.ActiveCfg = Debug|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.Build.0 = Debug|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.Build.0 = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.ActiveCfg = Debug|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.Build.0 = Debug|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.Build.0 = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.ActiveCfg = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.Build.0 = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.ActiveCfg = Release|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.Build.0 = Release|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Microsoft.DotNet.Tools.Test/AssemblyTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/AssemblyTestRunnerDecorator.cs similarity index 86% rename from src/Microsoft.DotNet.Tools.Test/AssemblyTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/AssemblyTestRunnerDecorator.cs index fb25062b5..c6d9836b7 100644 --- a/src/Microsoft.DotNet.Tools.Test/AssemblyTestRunner.cs +++ b/src/Microsoft.DotNet.Tools.Test/AssemblyTestRunnerDecorator.cs @@ -7,11 +7,11 @@ using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.Tools.Test { - public class AssemblyTestRunner : IDotnetTestRunner + public class AssemblyTestRunnerDecorator : IDotnetTestRunner { private readonly Func _nextRunner; - public AssemblyTestRunner(Func nextRunner) + public AssemblyTestRunnerDecorator(Func nextRunner) { _nextRunner = nextRunner; } diff --git a/src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs index 5dfb9ad9a..fa8a6b00e 100644 --- a/src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs +++ b/src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Tools.Test { public class ConsoleTestRunner : IDotnetTestRunner { - private readonly ITestRunnerResolver _testRunnerResolver; + private readonly ITestRunnerNameResolver _testRunnerNameResolver; private readonly ICommandFactory _commandFactory; @@ -18,12 +18,12 @@ namespace Microsoft.DotNet.Tools.Test private readonly NuGetFramework _framework; public ConsoleTestRunner( - ITestRunnerResolver testRunnerResolver, + ITestRunnerNameResolver testRunnerNameResolver, ICommandFactory commandFactory, string assemblyUnderTest, NuGetFramework framework = null) { - _testRunnerResolver = testRunnerResolver; + _testRunnerNameResolver = testRunnerNameResolver; _commandFactory = commandFactory; _assemblyUnderTest = assemblyUnderTest; _framework = framework; @@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Tools.Test public int RunTests(DotnetTestParams dotnetTestParams) { return _commandFactory.Create( - _testRunnerResolver.ResolveTestRunner(), + _testRunnerNameResolver.ResolveTestRunner(), GetCommandArgs(dotnetTestParams), _framework, dotnetTestParams.Config) diff --git a/src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs b/src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs index 646cd89eb..8d3d37ded 100644 --- a/src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs +++ b/src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs @@ -8,18 +8,18 @@ namespace Microsoft.DotNet.Tools.Test { public class DesignTimeRunner : IDotnetTestRunner { - private readonly ITestRunnerResolver _testRunnerResolver; + private readonly ITestRunnerNameResolver _testRunnerNameResolver; private readonly ICommandFactory _commandFactory; private readonly string _assemblyUnderTest; public DesignTimeRunner( - ITestRunnerResolver testRunnerResolver, + ITestRunnerNameResolver testRunnerNameResolver, ICommandFactory commandFactory, string assemblyUnderTest) { - _testRunnerResolver = testRunnerResolver; + _testRunnerNameResolver = testRunnerNameResolver; _commandFactory = commandFactory; _assemblyUnderTest = assemblyUnderTest; } @@ -45,7 +45,7 @@ namespace Microsoft.DotNet.Tools.Test using (var dotnetTest = new DotnetTest(messages, pathToAssemblyUnderTest)) { var testRunnerFactory = - new TestRunnerFactory(_testRunnerResolver.ResolveTestRunner(), _commandFactory); + new TestRunnerFactory(_testRunnerNameResolver.ResolveTestRunner(), _commandFactory); dotnetTest .AddNonSpecificMessageHandlers(messages, adapterChannel) diff --git a/src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs index 49e374991..bcef09d91 100644 --- a/src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs +++ b/src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs @@ -44,13 +44,13 @@ namespace Microsoft.DotNet.Tools.Test Func nextAssemblyTestRunner = (commandFactory, assemblyUnderTest) => nextTestRunner(commandFactory, assemblyUnderTest, null); - return new AssemblyTestRunner(nextAssemblyTestRunner); + return new AssemblyTestRunnerDecorator(nextAssemblyTestRunner); } private static IDotnetTestRunner CreateTestRunnerForProjectJson( Func nextTestRunner) { - return new ProjectJsonTestRunner(nextTestRunner); + return new ProjectJsonTestRunnerDecorator(nextTestRunner); } } } diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/ProjectJsonTestRunnerDecorator.cs similarity index 97% rename from src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/ProjectJsonTestRunnerDecorator.cs index 102c240ef..2d071fa59 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunner.cs +++ b/src/Microsoft.DotNet.Tools.Test/ProjectJsonTestRunnerDecorator.cs @@ -11,12 +11,12 @@ using NuGet.Frameworks; namespace Microsoft.DotNet.Tools.Test { - public class ProjectJsonTestRunner : IDotnetTestRunner + public class ProjectJsonTestRunnerDecorator : IDotnetTestRunner { private readonly Func _nextRunner; private readonly TestProjectBuilder _testProjectBuilder; - public ProjectJsonTestRunner( + public ProjectJsonTestRunnerDecorator( Func nextRunner) { _nextRunner = nextRunner; diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerNameResolver.cs similarity index 79% rename from src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerNameResolver.cs index 853914158..0b006f1a6 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerResolver.cs +++ b/src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerNameResolver.cs @@ -7,18 +7,18 @@ using Microsoft.Extensions.EnvironmentAbstractions; namespace Microsoft.DotNet.Tools.Test { - public class AssemblyTestRunnerResolver : ITestRunnerResolver + public class AssemblyTestRunnerNameResolver : ITestRunnerNameResolver { private readonly string _directoryOfAssemblyUnderTest; private readonly IDirectory _directory; - public AssemblyTestRunnerResolver(string assemblyUnderTest) : + public AssemblyTestRunnerNameResolver(string assemblyUnderTest) : this(assemblyUnderTest, FileSystemWrapper.Default.Directory) { } - internal AssemblyTestRunnerResolver(string assemblyUnderTest, IDirectory directory) + internal AssemblyTestRunnerNameResolver(string assemblyUnderTest, IDirectory directory) { _directoryOfAssemblyUnderTest = directory.GetDirectoryFullName(assemblyUnderTest); _directory = directory; diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs index 6d65cb686..efe9cc877 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs +++ b/src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Test _projectReader = projectReader; } - public ITestRunnerResolver Create(DotnetTestParams dotnetTestParams) + public ITestRunnerNameResolver Create(DotnetTestParams dotnetTestParams) { var testRunnerResolver = dotnetTestParams.IsTestingAssembly ? GetAssemblyTestRunnerResolver(dotnetTestParams) : @@ -24,25 +24,25 @@ namespace Microsoft.DotNet.Tools.Test return testRunnerResolver; } - private ITestRunnerResolver GetAssemblyTestRunnerResolver(DotnetTestParams dotnetTestParams) + private ITestRunnerNameResolver GetAssemblyTestRunnerResolver(DotnetTestParams dotnetTestParams) { - ITestRunnerResolver testRunnerResolver = null; + ITestRunnerNameResolver testRunnerNameResolver = null; if (dotnetTestParams.HasTestRunner) { - testRunnerResolver = new ParameterTestRunnerResolver(dotnetTestParams.TestRunner); + testRunnerNameResolver = new ParameterTestRunnerNameResolver(dotnetTestParams.TestRunner); } else { - testRunnerResolver = new AssemblyTestRunnerResolver(dotnetTestParams.ProjectOrAssemblyPath); + testRunnerNameResolver = new AssemblyTestRunnerNameResolver(dotnetTestParams.ProjectOrAssemblyPath); } - return testRunnerResolver; + return testRunnerNameResolver; } - private ITestRunnerResolver GetProjectJsonTestRunnerResolver(DotnetTestParams dotnetTestParams) + private ITestRunnerNameResolver GetProjectJsonTestRunnerResolver(DotnetTestParams dotnetTestParams) { var project = _projectReader.ReadProject(dotnetTestParams.ProjectOrAssemblyPath); - return new ProjectJsonTestRunnerResolver(project); + return new ProjectJsonTestRunnerNameResolver(project); } } } \ No newline at end of file diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerNameResolver.cs similarity index 85% rename from src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerNameResolver.cs index f0c4d15a6..aa0d94243 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerResolver.cs +++ b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerNameResolver.cs @@ -3,7 +3,7 @@ namespace Microsoft.DotNet.Tools.Test { - public interface ITestRunnerResolver + public interface ITestRunnerNameResolver { string ResolveTestRunner(); } diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerNameResolver.cs similarity index 76% rename from src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerNameResolver.cs index 35cd7055b..7a393f0b8 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerResolver.cs +++ b/src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerNameResolver.cs @@ -3,11 +3,11 @@ namespace Microsoft.DotNet.Tools.Test { - public class ParameterTestRunnerResolver : ITestRunnerResolver + public class ParameterTestRunnerNameResolver : ITestRunnerNameResolver { private readonly string _testRunner; - public ParameterTestRunnerResolver(string testRunner) + public ParameterTestRunnerNameResolver(string testRunner) { _testRunner = testRunner; } diff --git a/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerNameResolver.cs similarity index 78% rename from src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerNameResolver.cs index 4bcdc0987..2de3784c7 100644 --- a/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerResolver.cs +++ b/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerNameResolver.cs @@ -5,11 +5,11 @@ using Microsoft.DotNet.ProjectModel; namespace Microsoft.DotNet.Tools.Test { - public class ProjectJsonTestRunnerResolver : ITestRunnerResolver + public class ProjectJsonTestRunnerNameResolver : ITestRunnerNameResolver { private Project _project; - public ProjectJsonTestRunnerResolver(Project project) + public ProjectJsonTestRunnerNameResolver(Project project) { _project = project; } diff --git a/test/dotnet-test.UnitTests/GivenAParameterTestRunnerResolver.cs b/test/dotnet-test.UnitTests/GivenAParameterTestRunnerNameResolver.cs similarity index 88% rename from test/dotnet-test.UnitTests/GivenAParameterTestRunnerResolver.cs rename to test/dotnet-test.UnitTests/GivenAParameterTestRunnerNameResolver.cs index 0eb1aa664..b85637c98 100644 --- a/test/dotnet-test.UnitTests/GivenAParameterTestRunnerResolver.cs +++ b/test/dotnet-test.UnitTests/GivenAParameterTestRunnerNameResolver.cs @@ -7,14 +7,14 @@ using Xunit; namespace Microsoft.Dotnet.Tools.Test.Tests { - public class GivenAParameterTestRunnerResolver + public class GivenAParameterTestRunnerNameResolver { private const string SomeTestRunner = "Some test runner"; [Fact] public void It_returns_the_runner_based_on_the_parameter() { - var parameterTestRunnerResolver = new ParameterTestRunnerResolver(SomeTestRunner); + var parameterTestRunnerResolver = new ParameterTestRunnerNameResolver(SomeTestRunner); var testRunner = parameterTestRunnerResolver.ResolveTestRunner(); diff --git a/test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerResolver.cs b/test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerNameResolver.cs similarity index 91% rename from test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerResolver.cs rename to test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerNameResolver.cs index 68f653721..e1dc7f7f7 100644 --- a/test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerResolver.cs +++ b/test/dotnet-test.UnitTests/GivenAProjectJsonTestRunnerNameResolver.cs @@ -9,7 +9,7 @@ using Xunit; namespace Microsoft.Dotnet.Tools.Test.Tests { - public class GivenAProjectJsonTestRunnerResolver + public class GivenAProjectJsonTestRunnerNameResolver { private const string SomeTestRunner = "runner"; @@ -21,7 +21,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests TestRunner = SomeTestRunner }; - var projectJsonTestRunnerResolver = new ProjectJsonTestRunnerResolver(project); + var projectJsonTestRunnerResolver = new ProjectJsonTestRunnerNameResolver(project); var testRunner = projectJsonTestRunnerResolver.ResolveTestRunner(); @@ -33,11 +33,11 @@ namespace Microsoft.Dotnet.Tools.Test.Tests { var project = new Project(); - var projectJsonTestRunnerResolver = new ProjectJsonTestRunnerResolver(project); + var projectJsonTestRunnerResolver = new ProjectJsonTestRunnerNameResolver(project); var testRunner = projectJsonTestRunnerResolver.ResolveTestRunner(); testRunner.Should().BeNull(); } } -} \ No newline at end of file +} diff --git a/test/dotnet-test.UnitTests/GivenATestRunnerResolverFactoryAndADotnetTestParams.cs b/test/dotnet-test.UnitTests/GivenATestRunnerNameResolverFactoryAndADotnetTestParams.cs similarity index 95% rename from test/dotnet-test.UnitTests/GivenATestRunnerResolverFactoryAndADotnetTestParams.cs rename to test/dotnet-test.UnitTests/GivenATestRunnerNameResolverFactoryAndADotnetTestParams.cs index 5510e36ae..109b2addc 100644 --- a/test/dotnet-test.UnitTests/GivenATestRunnerResolverFactoryAndADotnetTestParams.cs +++ b/test/dotnet-test.UnitTests/GivenATestRunnerNameResolverFactoryAndADotnetTestParams.cs @@ -10,7 +10,7 @@ using Xunit; namespace Microsoft.Dotnet.Tools.Test.Tests { - public class GivenATestRunnerResolverFactoryAndADotnetTestParams + public class GivenATestRunnerNameResolverFactoryAndADotnetTestParams { private const string PathToAFolder = "c:/some/path"; private const string PathToAnAssembly = "c:/some/path/to/assembly.dll"; @@ -35,7 +35,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests var testRunnerResolver = dotnetTestRunnerResolverFactory.Create(dotnetTestParams); - testRunnerResolver.Should().BeOfType(); + testRunnerResolver.Should().BeOfType(); } [Fact] @@ -55,7 +55,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests var testRunnerResolver = dotnetTestRunnerResolverFactory.Create(dotnetTestParams); - testRunnerResolver.Should().BeOfType(); + testRunnerResolver.Should().BeOfType(); } [Fact] @@ -73,7 +73,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests var testRunnerResolver = dotnetTestRunnerResolverFactory.Create(dotnetTestParams); - testRunnerResolver.Should().BeOfType(); + testRunnerResolver.Should().BeOfType(); } } } diff --git a/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs b/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerNameResolver.cs similarity index 86% rename from test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs rename to test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerNameResolver.cs index 0dd59788f..9358efb1e 100644 --- a/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs +++ b/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerNameResolver.cs @@ -12,7 +12,7 @@ using Xunit; namespace Microsoft.Dotnet.Tools.Test.Tests { - public class GivenAnAssemblyTestRunnerResolver + public class GivenAnAssemblyTestRunnerNameResolver { private readonly string _directoryOfAssemblyUnderTest = Path.Combine("c:", "some", "path"); @@ -28,7 +28,8 @@ namespace Microsoft.Dotnet.Tools.Test.Tests directoryMock.AddFile(_directoryOfAssemblyUnderTest, TestRunnerFileName); var pathToAssemblyUnderTest = Path.Combine(_directoryOfAssemblyUnderTest, TestRunnerFileName); - var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(pathToAssemblyUnderTest, directoryMock); + var assemblyTestRunnerResolver = + new AssemblyTestRunnerNameResolver(pathToAssemblyUnderTest, directoryMock); var testRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -44,7 +45,8 @@ namespace Microsoft.Dotnet.Tools.Test.Tests directoryMock.AddFile(_directoryOfAssemblyUnderTest, "dotnet-test-someOtherTestRunner.dll"); directoryMock.AddFile(_directoryOfAssemblyUnderTest, "dotnet-test-AndYetAnotherTestRunner.dll"); - var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(_directoryOfAssemblyUnderTest, directoryMock); + var assemblyTestRunnerResolver = + new AssemblyTestRunnerNameResolver(_directoryOfAssemblyUnderTest, directoryMock); var bestEffortTestRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -56,7 +58,8 @@ namespace Microsoft.Dotnet.Tools.Test.Tests { var directoryMock = new DirectoryMock(); - var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(_directoryOfAssemblyUnderTest, directoryMock); + var assemblyTestRunnerResolver = + new AssemblyTestRunnerNameResolver(_directoryOfAssemblyUnderTest, directoryMock); var testRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -94,4 +97,4 @@ namespace Microsoft.Dotnet.Tools.Test.Tests } } } -} \ No newline at end of file +}