Improve tests for Code Search API

Author: ashawley

src/main/scala/codecheck/github/models/Repository.scala

@@ -71,6 +71,7 @@ case class Repository(value: JValue) extends AbstractJson(value) {
 
   def description = opt("description")
   def open_issues_count = get("open_issues_count").toLong
+  def `private` = boolean("private")
 
   lazy val permissions = Permissions(value \ "permissions")
   lazy val owner = User(value \ "owner")

src/main/scala/codecheck/github/models/Search.scala

@@ -82,16 +82,22 @@ case class SearchCodeInput (
  order: SortDirection = SortDirection.desc
 ) extends SearchInput
 
-case class SearchCodeItems (value: JValue) extends AbstractJson(value){
+case class SearchCodeItem(value: JValue) extends AbstractJson(value) {
   def name: String = get("name")
+  def path: String = get("path")
+  def sha: String = get("sha")
+  def url: String = get("url")
+  def git_url: String = get("git_url")
+  def html_url: String = get("html_url")
+  def score: Double = get("score").toDouble
   lazy val repository = Repository(value \ "repository")
 }
 
 case class SearchCodeResult(value: JValue) extends AbstractJson(value) {
  def total_count: Long = get("total_count").toLong
  def incomplete_results: Boolean = boolean("incomplete_results")
  lazy val items = (value \ "items") match {
-    case JArray(arr) => arr.map(SearchCodeItems(_))
+    case JArray(arr) => arr.map(SearchCodeItem(_))
     case _ => Nil
   }
 }
@@ -121,7 +127,7 @@ case class SearchUserResult(value: JValue) extends AbstractJson(value) {
  def total_count: Long = get("total_count").toLong
  def incomplete_results: Boolean = boolean("incomplete_results")
  lazy val items = (value \ "items") match {
-    case JArray(arr) => arr.map(new User(_))
+    case JArray(arr) => arr.map(User(_))
     case _ => Nil
   }
 }

src/test/scala/SearchOpSpec.scala

@@ -12,7 +12,6 @@ import codecheck.github.models.SearchIssueSort
 import codecheck.github.models.SearchUserSort
 import codecheck.github.models.SearchRepositoryResult
 import codecheck.github.models.SearchCodeResult
-import codecheck.github.models.SearchCodeItems
 import codecheck.github.exceptions.GitHubAPIException
 
 class SearchOpSpec extends FunSpec
@@ -21,9 +20,8 @@ class SearchOpSpec extends FunSpec
 
   describe("searchRepositories") {
     it("with valid SearchInput should succeed") {
-      var q = "tetris language:assembly"
-      val q1 = q.trim.replaceAll(" ","+");
-      val input = SearchRepositoryInput(q1,sort=Some(SearchRepositorySort.stars),order=SortDirection.desc)
+      val q = "tetris language:assembly".trim.replaceAll(" ","+")
+      val input = SearchRepositoryInput(q,sort=Some(SearchRepositorySort.stars),order=SortDirection.desc)
       val res = Await.result(api.searchRepositories(input), TIMEOUT)
       assert(res.total_count >= 1)
       assert(res.items(0).id >= 1 )
@@ -35,9 +33,8 @@ class SearchOpSpec extends FunSpec
       assert(res.items(0).stargazers_count > res.items(1).stargazers_count)
     }
     it("with valid changed query(q) SearchInput should succeed") {
-      var q = "jquery in:name,description"
-      val q1 = q.trim.replaceAll(" ","+");
-      val input = SearchRepositoryInput(q1,sort=Some(SearchRepositorySort.stars),order=SortDirection.desc)
+      val q = "jquery in:name,description".trim.replaceAll(" ","+")
+      val input = SearchRepositoryInput(q,sort=Some(SearchRepositorySort.stars),order=SortDirection.desc)
       val res = Await.result(api.searchRepositories(input), TIMEOUT)
       assert(res.total_count >= 1)
       assert(res.items(0).id >= 1 )
@@ -49,36 +46,31 @@ class SearchOpSpec extends FunSpec
   }
   describe("searchCode") {
     it("with valid SearchInput q,no SortOrder should succeed") {
-      var q = "addClass in:file language:js repo:jquery/jquery"
-      val q1 = q.trim.replaceAll(" ","+");
-      val input = SearchCodeInput(q1,sort=None,order=SortDirection.desc)
+      val q = "addClass in:file language:js repo:jquery/jquery".trim.replaceAll(" ","+")
+      val input = SearchCodeInput(q,sort=None,order=SortDirection.desc)
       val res = Await.result(api.searchCode(input), TIMEOUT)
       assert(res.total_count >= 1)
       assert(res.items(0).repository.id >= 1 )
+      assert(res.items(0).sha.length >= 40)
+      assert(res.items(0).score >= 0d)
       assert(res.items(0).repository.full_name == "jquery/jquery")
     }
-    //Following test results in error:
-    //  "message" : "Validation Failed",
-    //  "errors" : [ {
-    //  "message" : "Must include at least one user, organization, or repository"
     it("with valid SearchInput it should succeed") {
-      var q = "function size:10000 language:python"
-      val q1 = q.trim.replaceAll(" ","+");
-      val input = SearchCodeInput(q1,sort=Some(SearchCodeSort.indexed),order=SortDirection.desc)
-      try {
-        val res = Await.result(api.searchCode(input), TIMEOUT)
-      } catch {
-        case e: GitHubAPIException =>
-          assert(e.error.errors.length == 1)
-          assert(e.error.message == "Validation Failed")
-      }
+      val q = "function size:10000 language:python".trim.replaceAll(" ","+")
+      val input = SearchCodeInput(q,sort=Some(SearchCodeSort.indexed),order=SortDirection.asc)
+      val res = Await.result(api.searchCode(input), TIMEOUT)
+      assert(res.total_count >= 1)
+      assert(res.items(0).repository.id >= 1 )
+      assert(res.items(0).path.endsWith(".py"))
+      assert(res.items(0).sha.length >= 40)
+      assert(res.items(0).score >= 0d)
+      assert(res.items(0).repository.`private` == false)
     }
   }
   describe("searchIssues") {
     it("with valid SearchInput should succeed") {
-      var q = "windows label:bug language:python state:open"
-      val q1 = q.trim.replaceAll(" ","+");
-      val input = SearchIssueInput(q1,sort=Some(SearchIssueSort.created),order=SortDirection.desc)
+      val q = "windows label:bug language:python state:open".trim.replaceAll(" ","+")
+      val input = SearchIssueInput(q,sort=Some(SearchIssueSort.created),order=SortDirection.desc)
       val res = Await.result(api.searchIssues(input), TIMEOUT)
       assert(res.total_count >= 1)
       assert(res.items(0).labels(0).name == "bug" )
@@ -88,10 +80,10 @@ class SearchOpSpec extends FunSpec
   }
   describe("searchUser") {
     it("with valid SearchInput should succeed") {
-      var q = "tom repos:>42 followers:>1000"
-      q = q.trim.replaceAll(" ","+")
-      val q1 = q.replaceAll(">","%3E")
-      val input = SearchUserInput(q1,sort=None,order=SortDirection.desc)
+      val q = "tom repos:>42 followers:>1000"
+        .trim.replaceAll(" ","+")
+        .replaceAll(">","%3E")
+      val input = SearchUserInput(q,sort=None,order=SortDirection.desc)
       val res = Await.result(api.searchUser(input), TIMEOUT)
       assert(res.total_count >= 0)
       assert(res.items(0).login.length >= 0)