Merge pull request #1463 from dampir/fix1459

Fix of bug with search of C# code
octokit · Sep 15, 2016 · 14ba023 · 14ba023
2 parents 5883360 + 3bde78b
commit 14ba023
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/Octokit.Tests.Integration/Clients/SearchClientTests.cs b/Octokit.Tests.Integration/Clients/SearchClientTests.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
@@ -57,6 +56,25 @@ public async Task SearchForFileNameInCode()
         Assert.NotEmpty(repos.Items);
     }
 
+    [IntegrationTest]
+    public async Task SearchForLanguageInCode()
+    {
+        var request = new SearchCodeRequest("AnonymousAuthenticator")
+        {
+            Language = Language.CSharp
+        };
+        request.Repos.Add("octokit/octokit.net");
+
+        var searchResults = await _gitHubClient.Search.SearchCode(request);
+
+        Assert.NotEmpty(searchResults.Items);
+
+        foreach (var code in searchResults.Items)
+        {
+            Assert.True(code.Name.EndsWith(".cs"));
+        }
+    }
+
     [IntegrationTest]
     public async Task SearchForFileNameInCodeWithoutTerm()
     {

diff --git a/Octokit.Tests/Clients/SearchClientTests.cs b/Octokit.Tests/Clients/SearchClientTests.cs
@@ -967,7 +967,7 @@ public void TestingTheLanguageQualifier()
 
                 connection.Received().Get<SearchIssuesResult>(
                     Arg.Is<Uri>(u => u.ToString() == "search/issues"),
-                    Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+language:C#"));
+                    Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+language:CSharp"));
             }
 
             [Fact]
@@ -1446,7 +1446,7 @@ public void TestingTheLanguageQualifier()
 
                 connection.Received().Get<SearchCodeResult>(
                     Arg.Is<Uri>(u => u.ToString() == "search/code"),
-                    Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+language:C#"));
+                    Arg.Is<Dictionary<string, string>>(d => d["q"] == "something+language:CSharp"));
             }
 
             [Fact]

diff --git a/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs b/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Octokit;
-using Octokit.Tests.Helpers;
 using Xunit;
 
 public class SearchIssuesRequestExclusionsTests
@@ -68,7 +67,7 @@ public void HandlesLanguageAttributeCorrectly()
 
             request.Language = Language.CSharp;
 
-            Assert.True(request.MergedQualifiers().Contains("-language:C#"));
+            Assert.True(request.MergedQualifiers().Contains("-language:CSharp"));
         }
 
         [Fact]

diff --git a/Octokit.Tests/Models/SearchIssuesRequestTests.cs b/Octokit.Tests/Models/SearchIssuesRequestTests.cs
@@ -133,7 +133,7 @@ public void HandlesLanguageAttributeCorrectly()
             Assert.False(request.MergedQualifiers().Any(x => x.Contains("language:")));
 
             request.Language = Language.CSharp;
-            Assert.True(request.MergedQualifiers().Contains("language:C#"));
+            Assert.True(request.MergedQualifiers().Contains("language:CSharp"));
         }
 
         [Fact]

diff --git a/Octokit/Models/Request/SearchRepositoriesRequest.cs b/Octokit/Models/Request/SearchRepositoriesRequest.cs
@@ -446,7 +446,7 @@ public enum Language
         Coq,
         [Parameter(Value = "C++")]
         CPlusPlus,
-        [Parameter(Value = "C#")]
+        [Parameter(Value = "CSharp")]
         CSharp,
         Css,
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cpp")]