[WIP] #3 - Refactored tests and minor changes to code

Author: fanwashere

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

@@ -91,7 +91,7 @@ case class IssueListOption4Repository(
   direction: SortDirection = SortDirection.desc,
   since: Option[DateTime] = None
 ) {
-    def q: String = "?" + (if (!milestone.isEmpty) (milestone map (t => s"milestone=$t&")).get else "") +
+    def q = "?" + (if (!milestone.isEmpty) (milestone map (t => s"milestone=$t&")).get else "") +
       s"state=$state" +
       (if (!assignee.isEmpty) (assignee map (t => s"&assignee=$t")).get else "") +
       (if (!creator.isEmpty) (creator map (t => s"&creator=$t")).get else "") +

src/main/scala/codecheck/github/operations/IssueOp.scala

@@ -26,6 +26,7 @@ trait IssueOp {
     )
   }
 
+  //Only listAll/User/OrgIssues return Repository object
   def listAllIssues(option: IssueListOption = IssueListOption()): Future[List[Issue]] =
     doList("/issues" + option.q)
 

src/test/scala/IssueOpSpec.scala

@@ -1,5 +1,6 @@
 
 import org.scalatest.FunSpec
+import org.scalatest.BeforeAndAfter
 import scala.concurrent.Await
 import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
@@ -12,6 +13,8 @@ import codecheck.github.models.Issue
 import codecheck.github.models.IssueInput
 import codecheck.github.models.MilestoneSearchOption
 
+import codecheck.github.models.MilestoneInput
+
 class IssueOpSpec extends FunSpec with Constants {
 
   val number = 1
@@ -108,6 +111,7 @@ class IssueOpSpec extends FunSpec with Constants {
     it("shold return at least one issue.") {
       val result = Await.result(api.listAllIssues(), TIMEOUT)
       assert(result.length > 0)
+      assert(result.head.repository.name == "test-repo")
     }
 
     it("shold return only two issues when using options.") {
@@ -122,6 +126,7 @@ class IssueOpSpec extends FunSpec with Constants {
     it("shold return at least one issue.") {
       val result = Await.result(api.listUserIssues(), TIMEOUT)
       assert(result.length > 0)
+      assert(result.head.repository.name == "test-repo")
     }
 
     it("shold return only one issues when using options.") {
@@ -148,7 +153,7 @@ class IssueOpSpec extends FunSpec with Constants {
 
   describe("listRepositoryIssues(owner, repo, option)") {
     it("should return at least one issue from user's own repo.") {
-      val result = Await.result(api.listRepositoryIssues(organization, repo), TIMEOUT)
+      val result = Await.result(api.listRepositoryIssues(user, userRepo), TIMEOUT)
       assert(result.length > 0)
     }
 
@@ -159,17 +164,17 @@ class IssueOpSpec extends FunSpec with Constants {
 
     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)
+      val result = Await.result(api.listRepositoryIssues(user, userRepo, option), TIMEOUT)
+      showResponse(option.q)
       assert(result.length == 1)
+      assert(result.head.title == "test issue")
     }
 
     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 option = new IssueListOption4Repository(Some(MilestoneSearchOption(1)), 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)
+      assert(result.length == 1)
+      assert(result.head.title == "test issue")
     }
   }