Enabling more tests

Author: StanleyGoldman

src/GitHub.UI/Controls/AutoCompleteBox/AutoCompleteTextInputExtensions.cs

@@ -24,8 +24,10 @@ public static string GetExpandedText(this IAutoCompleteTextInput textInput, stri
             int offset = completionOffset;
 
             var currentText = textInput.Text ?? ""; // Playing it safe
-            Debug.Assert(offset <= currentText.Length, "The offset can't be larger than the current text length");
-            Debug.Assert(afterIndex <= currentText.Length, "The afterIndex can't be larger than the current text length");
+
+            if(offset <= currentText.Length) throw new InvalidOperationException("The offset can't be larger than the current text length");
+            if(afterIndex <= currentText.Length) throw new InvalidOperationException("The afterIndex can't be larger than the current text length");
+
             var before = currentText.Substring(0, offset);
             var after = currentText.Substring(afterIndex);
             string prefix = before + value + " ";

test/GitHub.UI.UnitTests/Controls/AutoCompleteTextInputExtensionsTests.cs

@@ -1,25 +1,29 @@
-using GitHub.UI;
-using GitHub.UI.Controls.AutoCompleteBox;
-using Moq;
-using Xunit;
+using GitHub.UI.Controls.AutoCompleteBox;
+using NSubstitute;
+using NUnit.Framework;
 
-class AutoCompleteTextInputExtensionsTests
+namespace GitHub.UI.UnitTests.Controls
 {
-    public class TheGetExpandedTextMethod
+    class AutoCompleteTextInputExtensionsTests
     {
-        [Theory]
-        [InlineData(":", 1, 0, ":apple: ")]
-        [InlineData(":a", 2, 0, ":apple: ")]
-        [InlineData(":ap", 3, 0, ":apple: ")]
-        [InlineData(":a", 1, 0, ":apple: a")]
-        [InlineData("Test :", 6, 5, "Test :apple: ")]
-        [InlineData("Test :ap", 8, 5, "Test :apple: ")]
-        [InlineData("Test :apother stuff", 8, 5, "Test :apple: other stuff")]
-        public void ReturnsExpandedText(string text, int caretIndex, int completionOffset, string expected)
+        public class TheGetExpandedTextMethod
         {
-            var textInput = Mock.Of<IAutoCompleteTextInput>(t => t.CaretIndex == caretIndex && t.Text == text);
-            var expandedText = textInput.GetExpandedText(":apple:", completionOffset);
-            Assert.Equal(expected, expandedText);
+            [TestCase(":", 1, 0, ":apple: ")]
+            [TestCase(":a", 2, 0, ":apple: ")]
+            [TestCase(":ap", 3, 0, ":apple: ")]
+            [TestCase(":a", 1, 0, ":apple: a")]
+            [TestCase("Test :", 6, 5, "Test :apple: ")]
+            [TestCase("Test :ap", 8, 5, "Test :apple: ")]
+            [TestCase("Test :apother stuff", 8, 5, "Test :apple: other stuff")]
+            public void ReturnsExpandedText(string text, int caretIndex, int completionOffset, string expected)
+            {
+                var textInput = Substitute.For<IAutoCompleteTextInput>();
+                textInput.CaretIndex.Returns(caretIndex);
+                textInput.Text.Returns(text);
+
+                var expandedText = textInput.GetExpandedText(":apple:", completionOffset);
+                Assert.AreEqual(expected, expandedText);
+            }
         }
     }
 }

test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj

@@ -3,8 +3,6 @@
     <TargetFramework>net46</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="Controls\AutoCompleteTextInputExtensionsTests.cs" />
-    <Compile Remove="Helpers\AutoCompleteAdvisorTests.cs" />
     <Compile Remove="Helpers\AutoCompleteSourceTests.cs" />
     <Compile Remove="Helpers\IssuesAutoCompleteSourceTests.cs" />
     <Compile Remove="Helpers\MentionsAutoCompleteSourceTests.cs" />
@@ -31,11 +29,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Controls\AutoCompleteTextInputExtensionsTests.cs" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="Helpers\AutoCompleteAdvisorTests.cs" />
     <None Include="Helpers\AutoCompleteSourceTests.cs" />
     <None Include="Helpers\IssuesAutoCompleteSourceTests.cs" />
     <None Include="Helpers\MentionsAutoCompleteSourceTests.cs" />