[WIP] #3 - Fixed query string generator. Created more tests for issue listing methods.

Author: fanwashere

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

@@ -55,22 +55,14 @@ object IssueSort {
   def fromString(str: String) = values.filter(_.name == str).head
 }
 
-sealed abstract class MilestoneSearchOption {
-
+sealed abstract class MilestoneSearchOption(val name: String) {
+  override def toString = name
 }
 
 object MilestoneSearchOption {
-  case object all extends MilestoneSearchOption {
-    val value = JString("*")
-  }
-
-  case object none extends MilestoneSearchOption {
-    val value = JString("none")
-  }
-
-  case class Specified(number: Int) extends MilestoneSearchOption {
-    val value = JInt(number)
-  }
+  case object all extends MilestoneSearchOption("*")
+  case object none extends MilestoneSearchOption("none")
+  case class Specified(number: Int) extends MilestoneSearchOption(number.toString())
 
   def apply(number: Int) = Specified(number)
 }
@@ -84,8 +76,8 @@ case class IssueListOption(
   since: Option[DateTime] = None
 ) {
   def q = s"?filter=$filter&state=$state&sort=$sort&direction=$direction" +
-    (if (labels.length == 0) "" else "&labels=" + labels.mkString(",")) +
-    since.map("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ssZ"))
+    (if (!labels.isEmpty) "&labels=" + labels.mkString(",") else "") +
+    (if (!since.isEmpty) (since map ("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ss'Z'"))).get else "")
 }
 
 case class IssueListOption4Repository(
@@ -99,15 +91,15 @@ case class IssueListOption4Repository(
   direction: SortDirection = SortDirection.desc,
   since: Option[DateTime] = None
 ) {
-    def q: String = "?" + (if (!milestone.isEmpty) milestone map (t => s"milestone=$t&")) +
+    def q: String = "?" + (if (!milestone.isEmpty) (milestone map (t => s"milestone=$t&")).get else "") +
       s"state=$state" +
-      (if (!assignee.isEmpty) assignee map (t => s"&assignee=$t")) +
-      (if (!creator.isEmpty) creator map (t => s"&creator=$t")) +
-      (if (!mentioned.isEmpty) mentioned map (t => s"&mentioned=$t")) +
-      (if (!labels.isEmpty) "&labels=" + labels.mkString(",")) +
+      (if (!assignee.isEmpty) (assignee map (t => s"&assignee=$t")).get else "") +
+      (if (!creator.isEmpty) (creator map (t => s"&creator=$t")).get else "") +
+      (if (!mentioned.isEmpty) (mentioned map (t => s"&mentioned=$t")).get else "") +
+      (if (!labels.isEmpty) "&labels=" + labels.mkString(",") else "") +
       s"&sort=$sort" +
       s"&direction=$direction" +
-      (if (!since.isEmpty) since map ("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ssZ")))
+      (if (!since.isEmpty) (since map ("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ss'Z'"))).get else "")
  }
 
 case class IssueInput(

src/test/scala/IssueOpSpec.scala

@@ -10,21 +10,20 @@ import codecheck.github.models.IssueListOption4Repository
 import codecheck.github.models.IssueState
 import codecheck.github.models.Issue
 import codecheck.github.models.IssueInput
+import codecheck.github.models.MilestoneSearchOption
 
 class IssueOpSpec extends FunSpec with Constants {
 
   val number = 1
   var nUser: Long = 0
   var nOrg: Long = 0
-  var createdUser: DateTime = DateTime.now
-  var createdOrg: DateTime = DateTime.now
+  var nTime: DateTime = DateTime.now()
 
   describe("createIssue(owner, repo, input)") {
     val input = IssueInput(Some("test issue"), Some("testing"), Some(user), Some(1), Seq("question"))
 
     it("should create issue for user's own repo.") {
       val result = Await.result(api.createIssue(user, userRepo, input), TIMEOUT)
-      //showResponse(result)
       nUser = result.number
       assert(result.url == "https://api.github.com/repos/" + user + "/" + userRepo + "/issues/" + nUser)
       assert(result.labels_url == "https://api.github.com/repos/" + user + "/" + userRepo + "/issues/" + nUser + "/labels{/name}")
@@ -41,7 +40,6 @@ class IssueOpSpec extends FunSpec with Constants {
       assert(result.comments == 0)
       assert(result.created_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
-      createdUser = result.created_at
       assert(result.closed_at.isEmpty)
       assert(result.body.get == "testing")
       assert(result.closed_by.isEmpty)
@@ -65,8 +63,6 @@ class IssueOpSpec extends FunSpec with Constants {
       assert(result.comments == 0)
       assert(result.created_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
-      createdOrg = result.created_at
-      assert(result.closed_at.isEmpty)
       assert(result.body.get == "testing")
       assert(result.closed_by.isEmpty)
     }
@@ -114,10 +110,10 @@ class IssueOpSpec extends FunSpec with Constants {
       assert(result.length > 0)
     }
 
-    it("shold return only one issue.") {
-      val option = IssueListOption(IssueFilter.all, IssueState.open, since=Some(createdUser))
+    it("shold return only two issues when using options.") {
+      val option = IssueListOption(IssueFilter.created, IssueState.open, Seq("question"), since=Some(nTime))
       val result = Await.result(api.listAllIssues(option), TIMEOUT)
-      assert(result.length == 1)
+      assert(result.length == 2)
       assert(result.head.title == "test issue")
     }
   }
@@ -127,26 +123,53 @@ class IssueOpSpec extends FunSpec with Constants {
       val result = Await.result(api.listUserIssues(), TIMEOUT)
       assert(result.length > 0)
     }
+
+    it("shold return only one issues when using options.") {
+      val option = IssueListOption(IssueFilter.created, IssueState.open, Seq("question"), since=Some(nTime))
+      val result = Await.result(api.listUserIssues(option), TIMEOUT)
+      assert(result.length == 1)
+      assert(result.head.title == "test issue")
+    }
   }
 
   describe("listOrgIssues(org, option)") {
     it("should return at least one issue.") {
       val result = Await.result(api.listOrgIssues(organization), TIMEOUT)
       assert(result.length > 0)
     }
+
+    it("shold return only one issues when using options.") {
+      val option = IssueListOption(IssueFilter.created, IssueState.open, Seq("question"), since=Some(nTime))
+      val result = Await.result(api.listOrgIssues(organization, option), TIMEOUT)
+      assert(result.length == 1)
+      assert(result.head.title == "test issue")
+    }
   }
 
   describe("listRepositoryIssues(owner, repo, option)") {
-    it("should return at least one issue.") {
+    it("should return at least one issue from user's own repo.") {
       val result = Await.result(api.listRepositoryIssues(organization, repo), TIMEOUT)
       assert(result.length > 0)
     }
-  }
 
-  describe("listRepositoryIssues") {
-    it("is just testing.") {
-      val input = new IssueListOption4Repository(state=IssueState.all)
-      val result = Await.result(api.listRepositoryIssues(organization, repo, input), TIMEOUT)
+    it("should return at least one issue from organization's repo.") {
+      val result = Await.result(api.listRepositoryIssues(organization, repo), TIMEOUT)
+      assert(result.length > 0)
+    }
+
+    it("should return only one issue from user's own repo when using options.") {
+      val option = new IssueListOption4Repository(Some(MilestoneSearchOption(1)), IssueState.open, Some(user), Some(user), labels=Seq("question"), since=Some(nTime))
+      val result = Await.result(api.listRepositoryIssues(user, userRepo), TIMEOUT)
+      //showResponse(result)
+      assert(result.length == 1)
+    }
+
+    it("should return only one issue from organization's repo when using options.") {
+      val option = IssueListOption4Repository(Some(MilestoneSearchOption.all), IssueState.open, Some(user), Some(user), labels=Seq("question"), since=Some(nTime))
+      val result = Await.result(api.listRepositoryIssues(organization, repo, option), TIMEOUT)
+      showResponse(option.q)
+      showResponse(result)
+      //assert(result.length == 1)
     }
   }