Merge pull request code-check#63 from code-check/new-test

Fix test

Author: shunjikonishi

.gitignore

@@ -4,3 +4,4 @@
 /project/project/
 /project/target/
 /target/
+env.sh

build.sbt

@@ -10,8 +10,8 @@ scalaVersion := "2.11.7"
 libraryDependencies ++= Seq(
   "com.ning" % "async-http-client" % "1.9.21" % "provided",
   "org.asynchttpclient" % "async-http-client" % "2.0.15" % "provided",
-  "org.json4s" %% "json4s-jackson" % "3.3.0",
-  "org.json4s" %% "json4s-ext" % "3.3.0",
+  "org.json4s" %% "json4s-jackson" % "3.4.2",
+  "org.json4s" %% "json4s-ext" % "3.4.2",
   "joda-time" % "joda-time" % "2.8.1",
   "ch.qos.logback" % "logback-classic" % "1.1.3",
   "com.github.scopt" %% "scopt" % "3.3.0",

src/test/scala/CollaboratorOpSpec.scala

@@ -6,32 +6,6 @@ import codecheck.github.exceptions.NotFoundException
 
 class CollaboratorOpSpec extends FunSpec with Constants {
 
-  describe("listCollaborators"){
-    it("should return atleast one Collaborator"){
-      val res = Await.result(api.listCollaborators(organization,repo),TIMEOUT)
-      assert(res.length >= 1)
-      val c = res(0)
-      assert(c.login.length > 0)
-      assert(c.id > 0)
-      assert(c.avatar_url.length > 0)
-      assert(c.url.length > 0)
-      assert(c.site_admin == false)
-    }
-  }
-  describe("isCollaborator"){
-    it("if it is Collaborator"){
-      val res = Await.result(api.addCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
-      assert(res)
-      val res1 = Await.result(api.isCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
-      assert(res1 == true)
-      var res2 = Await.result(api.removeCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
-      assert(res2)
-    }
-    it("if it is not a valid Collaborator"){
-      val res1 = Await.result(api.isCollaborator(organization, repo, otherUserInvalid),TIMEOUT)
-      assert(res1 == false)
-    }
-  }
   describe("addCollaborator"){
     it("should add Collaborator User to user Repo"){
       val res = Await.result(api.addCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
@@ -45,10 +19,31 @@ class CollaboratorOpSpec extends FunSpec with Constants {
       }
     }
   }
+  describe("isCollaborator"){
+    it("if it is Collaborator"){
+      val res = Await.result(api.isCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
+      assert(res)
+    }
+    it("if it is not a valid Collaborator"){
+      val res1 = Await.result(api.isCollaborator(user, userRepo, otherUserInvalid),TIMEOUT)
+      assert(res1 == false)
+    }
+  }
+  describe("listCollaborators"){
+    it("should return at least one Collaborator"){
+      val res = Await.result(api.listCollaborators(user, userRepo),TIMEOUT)
+      val c = res.find(_.login == collaboratorUser)
+      assert(c.isDefined)
+      assert(c.get.id > 0)
+      assert(c.get.avatar_url.length > 0)
+      assert(c.get.url.length > 0)
+      assert(c.get.site_admin == false)
+    }
+  }
  describe("removeCollaborator"){
     it("should remove the Collaborator"){
       var res = Await.result(api.removeCollaborator(user, userRepo, collaboratorUser),TIMEOUT)
-      assert(res)
+      assert(res == true)
     }
   }
   it("should fail for non existent User Repo"){

src/test/scala/Constants.scala

@@ -31,7 +31,8 @@ trait Constants {
   protected val userRepo = sys.env("GITHUB_REPO")
 
   protected val otherUser = "shunjikonishi"
-  protected val collaboratorUser = "code-project"
+  protected val otherUserRepo = "test-repo"
+  protected val collaboratorUser = "shunjikonishi"
   protected val otherUserInvalid = "loremipsom123"
   protected val organizationInvalid = "loremipsom123"
   protected val repoInvalid = "loremipsom123"

src/test/scala/IssueOpSpec.scala

@@ -23,31 +23,10 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
   var nUser: Long = 0
   var nOrg: Long = 0
   var nTime: DateTime = DateTime.now
-  val tRepo = repo + "2"
-
-  override def beforeAll() {
-    val userMilestones = Await.result(api.listMilestones(user, userRepo, MilestoneListOption(state=MilestoneState.all)), TIMEOUT)
-    userMilestones.foreach { m =>
-      Await.result(api.removeMilestone(user, userRepo, m.number), TIMEOUT)
-    }
-
-    val orgMilestones = Await.result(api.listMilestones(organization, tRepo, MilestoneListOption(state=MilestoneState.all)), TIMEOUT)
-    orgMilestones.foreach { m =>
-      Await.result(api.removeMilestone(organization, tRepo, m.number), TIMEOUT)
-    }
-
-    val nInput = new MilestoneInput(Some("test milestone"))
-    val nInput2 = new MilestoneInput(Some("test milestone 2"))
-
-    Await.result(api.createMilestone(user, userRepo, nInput), TIMEOUT)
-    Await.result(api.createMilestone(user, userRepo, nInput2), TIMEOUT)
-
-    Await.result(api.createMilestone(organization, tRepo, nInput), TIMEOUT)
-    Await.result(api.createMilestone(organization, tRepo, nInput2), TIMEOUT)
-  }
+  val tRepo = "test-repo2"
 
   describe("createIssue(owner, repo, input)") {
-    val input = IssueInput(Some("test issue"), Some("testing"), Some(user), Some(1), Seq("question"))
+    val input = IssueInput(Some("test issue"), Some("testing"), Some(user), None, Seq("question"))
 
     it("should create issue for user's own repo.") {
       val result = Await.result(api.createIssue(user, userRepo, input), TIMEOUT)
@@ -63,7 +42,6 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       assert(result.state == "open")
       assert(result.locked == false)
       assert(result.assignee.get.login == user)
-      assert(result.milestone.get.number == 1)
       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)
@@ -82,11 +60,11 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       assert(result.html_url == "https://github.com/" + organization + "/" + tRepo + "/issues/" + nOrg)
       assert(result.title == "test issue")
       assert(result.user.login == user)
-      assert(result.labels.head.name == "question")
+      assert(result.labels.isEmpty) //Label is not set if user is not the organization member.
       assert(result.state == "open")
       assert(result.locked == false)
-      assert(result.assignee.get.login == user)
-      assert(result.milestone.get.number == 1)
+      assert(result.assignee.isEmpty) //Assignee is not set if user is not the organization member.
+      assert(result.milestone.isEmpty) //Assignee is not set if user is not the organization member.
       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)
@@ -113,10 +91,10 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       assert(result.opt("assignee").isEmpty)
     }
 
-    it("should succeed with valid inputs on issues in organization's repo.") {
-      val result = Await.result(api.unassign(organization, tRepo, nOrg), TIMEOUT)
-      assert(result.opt("assignee").isEmpty)
-    }
+    // it("should succeed with valid inputs on issues in organization's repo.") {
+    //   val result = Await.result(api.unassign(organization, tRepo, nOrg), TIMEOUT)
+    //   assert(result.opt("assignee").isEmpty)
+    // }
   }
 
   describe("assign(owner, repo, number, assignee)") {
@@ -125,10 +103,10 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       assert(result.get("assignee.login") == user)
     }
 
-    it("should succeed with valid inputs on issues in organization's repo.") {
-      val result = Await.result(api.assign(organization, tRepo, nOrg, user), TIMEOUT)
-      assert(result.get("assignee.login") == user)
-    }
+    // it("should succeed with valid inputs on issues in organization's repo.") {
+    //   val result = Await.result(api.assign(organization, tRepo, nOrg, user), TIMEOUT)
+    //   assert(result.get("assignee.login") == user)
+    // }
   }
 
   describe("listAllIssues(option)") {
@@ -140,7 +118,7 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     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 == 2)
+      assert(result.length > 0)
       assert(result.head.title == "test issue")
     }
   }
@@ -154,21 +132,7 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     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")
     }
   }
@@ -193,21 +157,20 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     }
 
     it("should return only one issue from organization's repo when using options.") {
-      val option = new IssueListOption4Repository(Some(MilestoneSearchOption(1)), IssueState.open, Some(user), Some(user), labels=Seq("question"), since=Some(nTime))
+      val option = new IssueListOption4Repository(None, IssueState.open, None, Some(user), labels=Nil, since=Some(nTime))
       val result = Await.result(api.listRepositoryIssues(organization, tRepo, option), TIMEOUT)
       assert(result.length == 1)
       assert(result.head.title == "test issue")
     }
   }
 
   describe("editIssue(owner, repo, number, input)") {
-    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), Some(2), Seq("question", "bug"), Some(IssueState.closed))
+    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), None, Seq("question", "bug"), Some(IssueState.closed))
 
     it("should edit the issue in user's own repo.") {
       val result = Await.result(api.editIssue(user, userRepo, nUser, input), TIMEOUT)
       assert(result.title == "test issue edited")
       assert(result.body.get == "testing again")
-      assert(result.milestone.get.number == 2)
       assert(result.labels.head.name == "bug")
       assert(result.state == "closed")
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
@@ -217,8 +180,8 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
       val result = Await.result(api.editIssue(organization, tRepo, nOrg, input), TIMEOUT)
       assert(result.title == "test issue edited")
       assert(result.body.get == "testing again")
-      assert(result.milestone.get.number == 2)
-      assert(result.labels.head.name == "bug")
+      assert(result.milestone.isEmpty)
+      assert(result.labels.isEmpty)
       assert(result.state == "closed")
       assert(result.updated_at.toDateTime(DateTimeZone.UTC).getMillis() - DateTime.now(DateTimeZone.UTC).getMillis() <= 5000)
     }

src/test/scala/LabelOpSpec.scala

@@ -12,45 +12,45 @@ class LabelOpSpec extends FunSpec with Constants {
 
   describe("removeAllLabels") {
     it("should succeed") {
-      val result = Await.result(api.removeAllLabels(organization, repo, number), TIMEOUT)
+      val result = Await.result(api.removeAllLabels(user, userRepo, number), TIMEOUT)
       assert(result.length == 0)
     }
   }
 
   describe("addLabel") {
     it("should succeed") {
-      val result = Await.result(api.addLabels(organization, repo, number, "bug"), TIMEOUT)
+      val result = Await.result(api.addLabels(user, userRepo, number, "bug"), TIMEOUT)
       assert(result.length == 1)
       val label = result.head
       assert(label.name == "bug")
       assert(label.url.length > 0)
       assert(label.color.length == 6)
     }
   }
-  
+
   describe("replaceLabels") {
     it("should succeed") {
-      val result = Await.result(api.replaceLabels(organization, repo, number, "duplicate", "invalid"), TIMEOUT)
+      val result = Await.result(api.replaceLabels(user, userRepo, number, "duplicate", "invalid"), TIMEOUT)
       assert(result.length == 2)
       assert(result.filter(_.name == "duplicate").length == 1)
-      assert(result.filter(_.name == "invalid").length == 1)      
+      assert(result.filter(_.name == "invalid").length == 1)
     }
   }
-  
+
   describe("removeLabel") {
     it("should succeed") {
-      val result = Await.result(api.removeLabel(organization, repo, number, "duplicate"), TIMEOUT)
+      val result = Await.result(api.removeLabel(user, userRepo, number, "duplicate"), TIMEOUT)
       assert(result.length == 1)
 
-      val result2 = Await.result(api.removeLabel(organization, repo, number, "invalid"), TIMEOUT)
+      val result2 = Await.result(api.removeLabel(user, userRepo, number, "invalid"), TIMEOUT)
       assert(result2.length == 0)
     }
   }
-  
+
   describe("listLabels") {
     it("listLabels should succeed") {
-      Await.result(api.addLabels(organization, repo, number, "invalid"), TIMEOUT)
-      val result = Await.result(api.listLabels(organization, repo, number), TIMEOUT)
+      Await.result(api.addLabels(user, userRepo, number, "invalid"), TIMEOUT)
+      val result = Await.result(api.listLabels(user, userRepo, number), TIMEOUT)
       assert(result.length == 1)
       val label = result.head
       assert(label.name == "invalid")
@@ -61,40 +61,40 @@ class LabelOpSpec extends FunSpec with Constants {
 
   describe("listLabelDefs") {
     it("should succeed") {
-      val result = Await.result(api.listLabelDefs(organization, repo), TIMEOUT)
+      val result = Await.result(api.listLabelDefs(user, userRepo), TIMEOUT)
       assert(result.length > 0)
       val label = result.head
       assert(label.name.length > 0)
       assert(label.url.length > 0)
       assert(label.color.length == 6)
     }
   }
-  
+
   describe("getLabelDef") {
     it("should succeed") {
-      Await.result(api.getLabelDef(organization, repo, "question"), TIMEOUT).map { label =>
+      Await.result(api.getLabelDef(user, userRepo, "question"), TIMEOUT).map { label =>
         assert(label.name == "question")
         assert(label.url.length > 0)
         assert(label.color == "cc317c")
       }
     }
     it("should be None") {
-      assert(Await.result(api.getLabelDef(organization, repo, "hoge"), TIMEOUT).isEmpty)
+      assert(Await.result(api.getLabelDef(user, userRepo, "hoge"), TIMEOUT).isEmpty)
     }
   }
-  
+
   describe("createLabelDef") {
     it("should succeed") {
       val input = LabelInput(gName, "cc317c")
-      val label = Await.result(api.createLabelDef(organization, repo, input), TIMEOUT)
+      val label = Await.result(api.createLabelDef(user, userRepo, input), TIMEOUT)
       assert(label.name == gName)
       assert(label.url.length > 0)
       assert(label.color == "cc317c")
     }
     it("again should fail") {
       val input = LabelInput(gName, "cc317c")
       try {
-        val label = Await.result(api.createLabelDef(organization, repo, input), TIMEOUT)
+        val label = Await.result(api.createLabelDef(user, userRepo, input), TIMEOUT)
         fail
       } catch {
         case e: GitHubAPIException =>
@@ -103,25 +103,25 @@ class LabelOpSpec extends FunSpec with Constants {
       }
     }
   }
-  
+
   describe("updateLabelDef") {
     it("should succeed") {
       val input = LabelInput(gName, "84b6eb")
-      val label = Await.result(api.updateLabelDef(organization, repo, gName, input), TIMEOUT)
+      val label = Await.result(api.updateLabelDef(user, userRepo, gName, input), TIMEOUT)
       assert(label.name == gName)
       assert(label.url.length > 0)
       assert(label.color == "84b6eb")
     }
   }
-  
+
   describe("removeLabelDef") {
     it("should succeed") {
-      val result = Await.result(api.removeLabelDef(organization, repo, gName), TIMEOUT)
+      val result = Await.result(api.removeLabelDef(user, userRepo, gName), TIMEOUT)
       assert(result)
     }
     it("removeLabelDef again should fail") {
       try {
-        val result = Await.result(api.removeLabelDef(organization, repo, gName), TIMEOUT)
+        val result = Await.result(api.removeLabelDef(user, userRepo, gName), TIMEOUT)
         fail
       } catch {
         case e: NotFoundException =>