Skip to content

Commit 738a94e

Browse files
tonyhalletttonyhallett
committed
more tests
1 parent c1f2fac commit 738a94e

14 files changed

+503
-170
lines changed

‎FineCodeCoverageTests/FineCodeCoverageTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@
109109
<Compile Include="CoverageToolOutput_Tests\SolutionFolderProvider_Tests.cs" />
110110
<Compile Include="CoverageUtilManager_Tests.cs" />
111111
<Compile Include="Events\EventAggregator.cs" />
112-
<Compile Include="MsCodeCoverage\CustomRunSettingsTemplateProvider_Tests - Copy.cs" />
112+
<Compile Include="MsCodeCoverage\CustomRunSettingsTemplateProvider_Tests.cs" />
113113
<Compile Include="MsCodeCoverage\RunSettingsHelper_Tests.cs" />
114-
<Compile Include="MsCodeCoverage\BuiltInRunSettingsTemplate_Tests.cs" />
114+
<Compile Include="MsCodeCoverage\RunSettingsTemplate_Tests.cs" />
115115
<Compile Include="MsCodeCoverage\MsCodeCoverageRunSettingsService_Collect_Tests.cs" />
116116
<Compile Include="MsCodeCoverage\MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs" />
117117
<Compile Include="MsCodeCoverage\MsCodeCoverageRunSettingsService_Initialize_Tests.cs" />
118118
<Compile Include="MsCodeCoverage\MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs" />
119119
<Compile Include="MsCodeCoverage\ProjectRunSettingsGenerator_Tests.cs" />
120-
<Compile Include="MsCodeCoverage\MsCodeCoverage_UserRunSettingsService_AddFCCSettings_Tests.cs" />
121-
<Compile Include="MsCodeCoverage\MsCodeCoverage_UserRunSettingsService_Suitability_Tests.cs" />
120+
<Compile Include="MsCodeCoverage\UserRunSettingsService_AddFCCSettings_Tests.cs" />
121+
<Compile Include="MsCodeCoverage\UserRunSettingsService_Analysis_Tests.cs" />
122122
<Compile Include="MsCodeCoverage\RunSettingsTemplateReplacementsFactory_Tests.cs" />
123123
<Compile Include="Test helpers\MefOrderAssertions.cs" />
124124
<Compile Include="Test helpers\TestThreadHelper.cs" />

FineCodeCoverageTests/MsCodeCoverage/CustomRunSettingsTemplateProvider_Tests - Copy.cs renamed to FineCodeCoverageTests/MsCodeCoverage/CustomRunSettingsTemplateProvider_Tests.cs

File renamed without changes.

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IRunSettingsService_Tests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Should_Not_Process_When_Not_Test_Execution(RunSettingConfigurationIn
4848
public void Should_Not_Process_When_Runsettings_Created_From_Template()
4949
{
5050
var xPathNavigable = new Mock<IXPathNavigable>().Object;
51-
autoMocker.GetMock<IBuiltInRunSettingsTemplate>().Setup(brst => brst.FCCGenerated(xPathNavigable)).Returns(true);
51+
autoMocker.GetMock<IRunSettingsTemplate>().Setup(runSettingsTemplate => runSettingsTemplate.FCCGenerated(xPathNavigable)).Returns(true);
5252
var mockRunSettingsConfigurationInfo = new Mock<IRunSettingsConfigurationInfo>();
5353
mockRunSettingsConfigurationInfo.Setup(ci => ci.RequestState).Returns(RunSettingConfigurationInfoState.Execution);
5454
Assert.IsNull(msCodeCoverageRunSettingsService.AddRunSettings(xPathNavigable, mockRunSettingsConfigurationInfo.Object, null));
@@ -58,8 +58,8 @@ public void Should_Not_Process_When_Runsettings_Created_From_Template()
5858
public void Should_UserRunSettingsService_AddFCCRunSettings_When_Execute_And_UserRunSettings()
5959
{
6060
var inputRunSettingDocument = new Mock<IXPathNavigable>().Object;
61-
var mockBuiltInRunSettingsTemplate = autoMocker.GetMock<IBuiltInRunSettingsTemplate>();
62-
mockBuiltInRunSettingsTemplate.Setup(brst => brst.FCCGenerated(inputRunSettingDocument)).Returns(false);
61+
var mockRunSettingsTemplate = autoMocker.GetMock<IRunSettingsTemplate>();
62+
mockRunSettingsTemplate.Setup(runSettingsTemplate => runSettingsTemplate.FCCGenerated(inputRunSettingDocument)).Returns(false);
6363

6464
var mockRunSettingsConfigurationInfo = new Mock<IRunSettingsConfigurationInfo>();
6565
mockRunSettingsConfigurationInfo.Setup(ci => ci.RequestState).Returns(RunSettingConfigurationInfoState.Execution);
@@ -83,7 +83,7 @@ public void Should_UserRunSettingsService_AddFCCRunSettings_When_Execute_And_Use
8383

8484
var mockUserRunSettingsService = autoMocker.GetMock<IUserRunSettingsService>();
8585
var fccRunSettingDocument = new Mock<IXPathNavigable>().Object;
86-
mockUserRunSettingsService.Setup(userRunSettingsService => userRunSettingsService.AddFCCRunSettings(mockBuiltInRunSettingsTemplate.Object, runSettingsTemplateReplacements, inputRunSettingDocument)).Returns(fccRunSettingDocument);
86+
mockUserRunSettingsService.Setup(userRunSettingsService => userRunSettingsService.AddFCCRunSettings(mockRunSettingsTemplate.Object, runSettingsTemplateReplacements, inputRunSettingDocument)).Returns(fccRunSettingDocument);
8787

8888
Assert.AreSame(fccRunSettingDocument,msCodeCoverageRunSettingsService.AddRunSettings(inputRunSettingDocument, mockRunSettingsConfigurationInfo.Object, null));
8989
}

‎FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverageRunSettingsService_IsCollecting_Tests.cs‎

Lines changed: 124 additions & 47 deletions
Large diffs are not rendered by default.

FineCodeCoverageTests/MsCodeCoverage/BuiltInRunSettingsTemplate_Tests.cs renamed to FineCodeCoverageTests/MsCodeCoverage/RunSettingsTemplate_Tests.cs

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
using NUnit.Framework;
22
using FineCodeCoverage.Engine.MsTestPlatform.CodeCoverage;
3+
using System.Xml.Linq;
4+
using System.Xml.XPath;
35

46
namespace FineCodeCoverageTests.MsCodeCoverage
57
{
6-
public class BuiltInRunSettingsTemplate_Tests
8+
public class RunSettingsTemplate_Tests
79
{
810
[Test]
911
public void Should_Be_Replaceable()
1012
{
11-
var builtInRunSettingsTemplate = new BuiltInRunSettingsTemplate();
12-
var template = builtInRunSettingsTemplate.Template;
13+
var runSettingsTemplate = new RunSettingsTemplate();
14+
var template = runSettingsTemplate.ToString();
1315

1416
var replacements = new TestRunSettingsTemplateReplacements
1517
{
@@ -101,35 +103,59 @@ public void Should_Be_Replaceable()
101103
</DataCollectionRunSettings>
102104
</RunSettings>";
103105

104-
var result = builtInRunSettingsTemplate.Replace(template, replacements);
106+
var result = runSettingsTemplate.Replace(template, replacements);
105107

106108
XmlAssert.NoXmlDifferences(result.Replaced, expected);
107109
}
108110

109111
[Test]
110112
public void Should_Be_ReplacedTestAdapter_When_Template_Has_The_FCC_TestAdapter_Placeholder()
111113
{
112-
var builtInRunSettingsTemplate = new BuiltInRunSettingsTemplate();
113-
var template = builtInRunSettingsTemplate.Template;
114-
Assert.True(builtInRunSettingsTemplate.Replace(template, new TestRunSettingsTemplateReplacements()).ReplacedTestAdapter);
114+
var runSettingsTemplate = new RunSettingsTemplate();
115+
var template = runSettingsTemplate.ToString();
116+
Assert.True(runSettingsTemplate.Replace(template, new TestRunSettingsTemplateReplacements()).ReplacedTestAdapter);
115117
}
116118

117119
[Test]
118-
public void Should_Be_ReplacedTestAdapter_When_Custom_Template_Does_Not_Have_FCC_TestAdapter_Placeholder()
120+
public void Should_Be_ReplacedTestAdapter_False_When_Custom_Template_Does_Not_Have_FCC_TestAdapter_Placeholder()
119121
{
120-
var builtInRunSettingsTemplate = new BuiltInRunSettingsTemplate();
122+
var runSettingsTemplate = new RunSettingsTemplate();
121123
var customTemplate = @"
122124
<RunSettings>
123125
<RunConfiguration>
124126
<TestAdaptersPaths>No placeholder</TestAdaptersPaths>
125127
</RunConfiguration>
126128
</RunSettings>
127129
";
128-
Assert.False(builtInRunSettingsTemplate.Replace(customTemplate, new TestRunSettingsTemplateReplacements()).ReplacedTestAdapter);
130+
Assert.False(runSettingsTemplate.Replace(customTemplate, new TestRunSettingsTemplateReplacements()).ReplacedTestAdapter);
131+
}
132+
133+
[TestCase("%fcc_testadapter%", true)]
134+
[TestCase("", false)]
135+
public void Should_HasReplaceableTestAdapter_When_Has_FCC_TestAdapter_Placeholder(string toReplace, bool expected)
136+
{
137+
var runSettingsTemplate = new RunSettingsTemplate();
138+
Assert.AreEqual(expected,runSettingsTemplate.HasReplaceableTestAdapter(toReplace));
139+
}
140+
141+
[Test]
142+
public void Should_Be_FCC_Generated_If_FCCGenerated_Element_Exists()
143+
{
144+
var runSettingsTemplate = new RunSettingsTemplate();
145+
var xpathNavigable = XDocument.Parse("<FCCGenerated/>").ToXPathNavigable();
146+
Assert.True(runSettingsTemplate.FCCGenerated(xpathNavigable));
147+
}
148+
149+
[Test]
150+
public void Should_Not_Be_FCC_Generated_If_FCCGenerated_Element_Exists()
151+
{
152+
var runSettingsTemplate = new RunSettingsTemplate();
153+
var xpathNavigable = XDocument.Parse("<Not/>").ToXPathNavigable();
154+
Assert.False(runSettingsTemplate.FCCGenerated(xpathNavigable));
129155
}
130156
}
131157

132-
public class BuiltInRunSettingsTemplate_ConfigureCustom_Tests
158+
public class RunSettingsTemplate_ConfigureCustom_Tests
133159
{
134160
private const string nonReplacedRunConfiguration = @"<RunConfiguration>
135161
<ResultsDirectory>Path</ResultsDirectory>
@@ -549,11 +575,11 @@ public void Should_Add_Configuration_Element_If_Not_Present_To_Existing_Ms_DataC
549575

550576
private void ConfiguredCustomReplaceTest(string custom,string expected,IRunSettingsTemplateReplacements replacements)
551577
{
552-
var builtInRunSettingsTemplate = new BuiltInRunSettingsTemplate();
578+
var runSettingsTemplate = new RunSettingsTemplate();
553579

554-
var customTemplate = builtInRunSettingsTemplate.ConfigureCustom(custom);
580+
var customTemplate = runSettingsTemplate.ConfigureCustom(custom);
555581

556-
var replaced = builtInRunSettingsTemplate.Replace(customTemplate, replacements).Replaced;
582+
var replaced = runSettingsTemplate.Replace(customTemplate, replacements).Replaced;
557583

558584
XmlAssert.NoXmlDifferences(replaced, expected);
559585
}

FineCodeCoverageTests/MsCodeCoverage/MsCodeCoverage_UserRunSettingsService_AddFCCSettings_Tests.cs renamed to FineCodeCoverageTests/MsCodeCoverage/UserRunSettingsService_AddFCCSettings_Tests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ public static string DumpXmlContents(this IXPathNavigable xmlPathNavigable)
7474
}
7575
}
7676

77-
internal class MsCodeCoverage_UserRunSettingsService_AddFCCSettings_Tests
77+
internal class UserRunSettingsService_AddFCCSettings_Tests
7878
{
79-
private readonly BuiltInRunSettingsTemplate builtInRunSettingsTemplate = new BuiltInRunSettingsTemplate();
79+
private readonly RunSettingsTemplate runSettingsTemplate = new RunSettingsTemplate();
8080
private UserRunSettingsService userRunSettingsService;
8181
private const string xmlDeclaration = "<?xml version='1.0' encoding='utf-8'?>";
8282
private const string unchangedRunConfiguration = @"
@@ -539,7 +539,7 @@ private void TestAddFCCSettings(string runsettings, string expectedFccRunSetting
539539

540540
private string AddFCCSettings(XPathNavigator navigator, IRunSettingsTemplateReplacements runSettingsTemplateReplacements)
541541
{
542-
return userRunSettingsService.AddFCCRunSettings( builtInRunSettingsTemplate, runSettingsTemplateReplacements, navigator).DumpXmlContents();
542+
return userRunSettingsService.AddFCCRunSettings( runSettingsTemplate, runSettingsTemplateReplacements, navigator).DumpXmlContents();
543543
}
544544

545545

0 commit comments

Comments
 (0)