Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2337) Scala 2.13.0 (#2348)

Browse Source
This commit is contained in:
takako shimamoto
2019-08-04 21:47:48 +09:00
committed by Naoki Takezoe
parent 88db21ef07
commit 33b46869b6
34 changed files with 83 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
View File

@@ -7,8 +7,6 @@ import io.github.gitbucket.solidbase.Solidbase
import liquibase.database.core.H2Database
import liquibase.database.jvm.JdbcConnection
import gitbucket.core.model._
import gitbucket.core.model.Profile._
import gitbucket.core.model.Profile.profile._
import gitbucket.core.model.Profile.profile.blockingApi._
import org.apache.commons.io.FileUtils
import java.sql.DriverManager
@@ -17,7 +15,7 @@ import java.io.File
import gitbucket.core.controller.Context
import gitbucket.core.service.SystemSettingsService.{Ssh, SystemSettings}
import javax.servlet.http.{HttpServletRequest, HttpSession}
import org.scalatest.mockito.MockitoSugar
import org.scalatestplus.mockito.MockitoSugar
import org.mockito.Mockito._
import scala.util.Random

5
src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala
View File

@@ -29,7 +29,7 @@ class WebHookServiceSpec extends FunSuite with ServiceSpecBase {
assert(service.getPullRequestsByRequestForWebhook("user1", "repo1", "master1") == Map.empty)
val r = service.getPullRequestsByRequestForWebhook("user2", "repo2", "master2").mapValues(_.map(_.url).toSet)
val r = service.getPullRequestsByRequestForWebhook("user2", "repo2", "master2").view.mapValues(_.map(_.url).toSet)
assert(r.size == 3)
assert(r((issue1, issueUser, pullreq1, user1, user2)) == Set("webhook1-1", "webhook1-2"))
@@ -39,7 +39,8 @@ class WebHookServiceSpec extends FunSuite with ServiceSpecBase {
// when closed, it not founds.
service.updateClosed("user1", "repo1", issue1.issueId, true)
val r2 = service.getPullRequestsByRequestForWebhook("user2", "repo2", "master2").mapValues(_.map(_.url).toSet)
val r2 =
service.getPullRequestsByRequestForWebhook("user2", "repo2", "master2").view.mapValues(_.map(_.url).toSet)
assert(r2.size == 2)
assert(r2((issue3, issueUser, pullreq3, user3, user2)) == Set("webhook3-1", "webhook3-2"))
assert(r2((issue32, issueUser, pullreq32, user3, user2)) == Set("webhook3-1", "webhook3-2"))

5
src/test/scala/gitbucket/core/util/JGitUtilSpec.scala
View File

@@ -1,15 +1,12 @@
package gitbucket.core.util
import GitSpecUtil._
import gitbucket.core.util.SyntaxSugars.using
import org.apache.commons.io.IOUtils
import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.diff.DiffEntry.ChangeType
import org.eclipse.jgit.lib.Constants
import org.eclipse.jgit.treewalk.TreeWalk
import org.scalatest.FunSuite
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
class JGitUtilSpec extends FunSuite {

2
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
View File

@@ -10,7 +10,7 @@ import gitbucket.core.service.RequestCache
import gitbucket.core.service.SystemSettingsService.{Ssh, SystemSettings}
import org.mockito.Mockito._
import org.scalatest.FunSpec
import org.scalatest.mockito.MockitoSugar
import org.scalatestplus.mockito.MockitoSugar
import play.twirl.api.Html
class AvatarImageProviderSpec extends FunSpec with MockitoSugar {

2
src/test/scala/gitbucket/core/view/HelpersSpec.scala
View File

@@ -3,7 +3,7 @@ package gitbucket.core.view
import gitbucket.core.controller.Context
import gitbucket.core.service.RepositoryService.RepositoryInfo
import org.scalatest.FunSpec
import org.scalatest.mockito.MockitoSugar
import org.scalatestplus.mockito.MockitoSugar
import java.util.Date
import java.util.TimeZone

2
src/test/scala/gitbucket/core/view/MarkdownSpec.scala
View File

@@ -3,7 +3,7 @@ package gitbucket.core.view
import gitbucket.core.controller.Context
import gitbucket.core.service.RepositoryService.RepositoryInfo
import org.scalatest.FunSpec
import org.scalatest.mockito.MockitoSugar
import org.scalatestplus.mockito.MockitoSugar
import org.mockito.Mockito._
class MarkdownSpec extends FunSpec with MockitoSugar {