Merge pull request #2153 from Myoxocephalus/fixes/diff-service-test

Fix DiffService warnings

Author: StanleyGoldman

test/GitHub.InlineReviews.UnitTests/Models/DiffUtilitiesTests.cs

@@ -237,6 +237,45 @@ public void InvalidDiffLineChangeChar(string line, string expectMessage)
 
                 Assert.That(expectMessage, Is.EqualTo(e.Message));
             }
+
+            [Test]
+            public void ShouldParsePr960()
+            {
+                var result = DiffUtilities.ParseFragment(Properties.Resources.pr_960_diff).ToList();
+
+                Assert.That(4, Is.EqualTo(result.Count));
+
+                Assert.That(11, Is.EqualTo(result[0].OldLineNumber));
+                Assert.That(11, Is.EqualTo(result[0].NewLineNumber));
+                Assert.That(24, Is.EqualTo(result[0].Lines.Count));
+
+                Assert.That(61, Is.EqualTo(result[1].OldLineNumber));
+                Assert.That(61, Is.EqualTo(result[1].NewLineNumber));
+                Assert.That(21, Is.EqualTo(result[1].Lines.Count));
+
+                Assert.That(244, Is.EqualTo(result[2].OldLineNumber));
+                Assert.That(247, Is.EqualTo(result[2].NewLineNumber));
+                Assert.That(15, Is.EqualTo(result[2].Lines.Count));
+
+                Assert.That(268, Is.EqualTo(result[3].OldLineNumber));
+                Assert.That(264, Is.EqualTo(result[3].NewLineNumber));
+                Assert.That(15, Is.EqualTo(result[3].Lines.Count));
+
+                // -    public class UsageTracker : IUsageTracker
+                Assert.That(17, Is.EqualTo(result[0].Lines[7].OldLineNumber));
+                Assert.That(-1, Is.EqualTo(result[0].Lines[7].NewLineNumber));
+                Assert.That(8, Is.EqualTo(result[0].Lines[7].DiffLineNumber));
+
+                // +    public sealed class UsageTracker : IUsageTracker, IDisposable
+                Assert.That(-1, Is.EqualTo(result[0].Lines[8].OldLineNumber));
+                Assert.That(18, Is.EqualTo(result[0].Lines[8].NewLineNumber));
+                Assert.That(9, Is.EqualTo(result[0].Lines[8].DiffLineNumber));
+
+                //      IConnectionManager connectionManager;
+                Assert.That(26, Is.EqualTo(result[0].Lines[17].OldLineNumber));
+                Assert.That(25, Is.EqualTo(result[0].Lines[17].NewLineNumber));
+                Assert.That(18, Is.EqualTo(result[0].Lines[17].DiffLineNumber));
+            }
         }
 
         public class TheMatchMethod

test/GitHub.InlineReviews.UnitTests/Services/DiffServiceTests.cs

@@ -1,57 +1,41 @@
-using System;
-using System.IO;
-using System.Linq;
+using System.Threading.Tasks;
 using GitHub.InlineReviews.Services;
-using GitHub.InlineReviews.UnitTests.Properties;
 using GitHub.Services;
-using GitHub.Models;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NUnit.Framework;
 
 namespace GitHub.InlineReviews.UnitTests.Services
 {
     public class DiffServiceTests
     {
-        public class TheParseFragmentMethod
+        public class TheDiffMethod
         {
             [Test]
-            public void ShouldParsePr960()
+            public async Task DiffReturnsEmptyList()
             {
-                var target = new DiffService(Substitute.For<IGitService>());
-                var result = DiffUtilities.ParseFragment(Properties.Resources.pr_960_diff).ToList();
+                var gitService = Substitute.For<IGitService>();
+                gitService.Compare(null, null, null, null).ReturnsNull();
+                var target = new DiffService(gitService);
 
-                Assert.That(4, Is.EqualTo(result.Count));
+                var result = await target.Diff(null, null, null, null);
 
-                Assert.That(11, Is.EqualTo(result[0].OldLineNumber));
-                Assert.That(11, Is.EqualTo(result[0].NewLineNumber));
-                Assert.That(24, Is.EqualTo(result[0].Lines.Count));
-
-                Assert.That(61, Is.EqualTo(result[1].OldLineNumber));
-                Assert.That(61, Is.EqualTo(result[1].NewLineNumber));
-                Assert.That(21, Is.EqualTo(result[1].Lines.Count));
-
-                Assert.That(244, Is.EqualTo(result[2].OldLineNumber));
-                Assert.That(247, Is.EqualTo(result[2].NewLineNumber));
-                Assert.That(15, Is.EqualTo(result[2].Lines.Count));
-
-                Assert.That(268, Is.EqualTo(result[3].OldLineNumber));
-                Assert.That(264, Is.EqualTo(result[3].NewLineNumber));
-                Assert.That(15, Is.EqualTo(result[3].Lines.Count));
+                Assert.That(result, Is.Empty);
+            }
+        }
 
-                // -    public class UsageTracker : IUsageTracker
-                Assert.That(17, Is.EqualTo(result[0].Lines[7].OldLineNumber));
-                Assert.That(-1, Is.EqualTo(result[0].Lines[7].NewLineNumber));
-                Assert.That(8, Is.EqualTo(result[0].Lines[7].DiffLineNumber));
+        public class TheDiffOverloadMethod
+        {
+            [Test]
+            public async Task DiffReturnsEmptyList()
+            {
+                var gitService = Substitute.For<IGitService>();
+                gitService.CompareWith(null, null, null, null, null).ReturnsNull();
+                var target = new DiffService(gitService);
 
-                // +    public sealed class UsageTracker : IUsageTracker, IDisposable
-                Assert.That(-1, Is.EqualTo(result[0].Lines[8].OldLineNumber));
-                Assert.That(18, Is.EqualTo(result[0].Lines[8].NewLineNumber));
-                Assert.That(9, Is.EqualTo(result[0].Lines[8].DiffLineNumber));
+                var result = await target.Diff(null, null, null, null, null);
 
-                //      IConnectionManager connectionManager;
-                Assert.That(26, Is.EqualTo(result[0].Lines[17].OldLineNumber));
-                Assert.That(25, Is.EqualTo(result[0].Lines[17].NewLineNumber));
-                Assert.That(18, Is.EqualTo(result[0].Lines[17].DiffLineNumber));
+                Assert.That(result, Is.Empty);
             }
         }
     }