Merge pull request #57 from yansklyarenko/feature/move-generic-code-t…

…o-cake-tfs (GH-22) Move generic code to Cake.Tfs addin
cake-contrib · Jan 10, 2019 · 0a8f5af · 0a8f5af
2 parents a5f2897 + ae619aa
commit 0a8f5af
Show file tree

Hide file tree

Showing 17 changed files with 347 additions and 555 deletions.
diff --git a/setup.cake b/setup.cake
@@ -17,7 +17,7 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(
     context: Context,
     dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/*.cs" },
-    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]* -[Cake.Tfs]*",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Cake.Issues]* -[Cake.Issues.Testing]* -[Cake.Issues.PullRequests]* -[Cake.Tfs]* -[*]Costura.AssemblyLoader -[*]ProcessedByFody",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj b/src/Cake.Issues.PullRequests.Tfs.Tests/Cake.Issues.PullRequests.Tfs.Tests.csproj
@@ -72,7 +72,6 @@
     <Compile Include="Capabilities\TfsFilteringByModifiedFilesCapabilityTests.cs" />
     <Compile Include="Capabilities\TfsDiscussionThreadsCapabilityTests.cs" />
     <Compile Include="Capabilities\TfsCheckingCommitIdCapabilityTests.cs" />
-    <Compile Include="TfsCredentialsExtensionsTests.cs" />
     <Compile Include="TfsPullRequestSystemTests.cs" />
     <Compile Include="TfsPullRequestSystemSettingsTests.cs" />
   </ItemGroup>

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentExtensionsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentExtensionsTests.cs
@@ -2,7 +2,7 @@
 {
     using Cake.Issues.PullRequests.Tfs.Capabilities;
     using Cake.Issues.Testing;
-    using Microsoft.TeamFoundation.SourceControl.WebApi;
+    using Cake.Tfs.PullRequest.CommentThread;
     using Shouldly;
     using Xunit;
 
@@ -14,7 +14,7 @@ public sealed class TheToPullRequestDiscussionCommentExtension
             public void Should_Throw_If_Comment_Is_Null()
             {
                 // Given
-                Comment comment = null;
+                TfsComment comment = null;
 
                 // When
                 var result = Record.Exception(() => comment.ToPullRequestDiscussionComment());
@@ -29,7 +29,7 @@ public void Should_Set_Correct_Content()
                 // Given
                 var content = "foo";
                 var comment =
-                    new Comment
+                    new TfsComment
                     {
                         Content = content
                     };
@@ -48,7 +48,7 @@ public void Should_Set_Correct_IsDeleted(bool isDeleted)
             {
                 // Given
                 var comment =
-                    new Comment
+                    new TfsComment
                     {
                         IsDeleted = isDeleted
                     };

diff --git a/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs b/src/Cake.Issues.PullRequests.Tfs.Tests/Capabilities/CommentThreadStatusExtensionsTests.cs
@@ -1,7 +1,7 @@
 namespace Cake.Issues.PullRequests.Tfs.Tests.Capabilities
 {
     using Cake.Issues.PullRequests.Tfs.Capabilities;
-    using Microsoft.TeamFoundation.SourceControl.WebApi;
+    using Cake.Tfs.PullRequest.CommentThread;
     using Shouldly;
     using Xunit;
 
@@ -11,28 +11,28 @@ public sealed class TheToPullRequestDiscussionStatusExtension
         {
             [Theory]
             [InlineData(
-                CommentThreadStatus.Unknown,
+                TfsCommentThreadStatus.Unknown,
                 PullRequestDiscussionStatus.Unknown)]
             [InlineData(
-                CommentThreadStatus.Active,
+                TfsCommentThreadStatus.Active,
                 PullRequestDiscussionStatus.Active)]
             [InlineData(
-                CommentThreadStatus.Pending,
+                TfsCommentThreadStatus.Pending,
                 PullRequestDiscussionStatus.Active)]
             [InlineData(
-                CommentThreadStatus.Fixed,
+                TfsCommentThreadStatus.Fixed,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.WontFix,
+                TfsCommentThreadStatus.WontFix,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.Closed,
+                TfsCommentThreadStatus.Closed,
                 PullRequestDiscussionStatus.Resolved)]
             [InlineData(
-                CommentThreadStatus.ByDesign,
+                TfsCommentThreadStatus.ByDesign,
                 PullRequestDiscussionStatus.Resolved)]
             public void Should_Return_Correct_Value(
-                CommentThreadStatus status,
+                TfsCommentThreadStatus status,
                 PullRequestDiscussionStatus expectedResult)
             {
                 // Given
@@ -49,28 +49,28 @@ public sealed class TheToPullRequestDiscussionResolutionExtension
         {
             [Theory]
             [InlineData(
-                CommentThreadStatus.Unknown,
+                TfsCommentThreadStatus.Unknown,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Active,
+                TfsCommentThreadStatus.Active,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Pending,
+                TfsCommentThreadStatus.Pending,
                 PullRequestDiscussionResolution.Unknown)]
             [InlineData(
-                CommentThreadStatus.Fixed,
+                TfsCommentThreadStatus.Fixed,
                 PullRequestDiscussionResolution.Resolved)]
             [InlineData(
-                CommentThreadStatus.WontFix,
+                TfsCommentThreadStatus.WontFix,
                 PullRequestDiscussionResolution.WontFix)]
             [InlineData(
-                CommentThreadStatus.Closed,
+                TfsCommentThreadStatus.Closed,
                 PullRequestDiscussionResolution.Resolved)]
             [InlineData(
-                CommentThreadStatus.ByDesign,
+                TfsCommentThreadStatus.ByDesign,
                 PullRequestDiscussionResolution.Resolved)]
             public void Should_Return_Correct_Value(
-                CommentThreadStatus status,
+                TfsCommentThreadStatus status,
                 PullRequestDiscussionResolution expectedResult)
             {
                 // Given