From 7e92f1abd54e322d1533060563e8f278bc802ced Mon Sep 17 00:00:00 2001 From: Tomofumi Tanaka Date: Mon, 16 Mar 2015 23:38:00 +0900 Subject: [PATCH] Fix test code package name --- .../core/servlet/InitializeListener.scala | 2 +- .../core}/api/JsonFormatSpec.scala | 12 ++++++--- .../core}/model/CommitStateSpec.scala | 5 ++-- .../service/AccessTokenServiceSpec.scala | 13 ++++++---- .../service/CommitStateServiceSpec.scala | 15 +++++++---- .../core}/service/IssuesServiceSpec.scala | 9 ++++--- .../core}/service/MergeServiceSpec.scala | 26 +++++++++++-------- .../core}/service/RepositoryServiceSpec.scala | 12 +++++---- .../core/service/ServiceSpecBase.scala | 12 ++++++--- .../core}/service/WebHookServiceSpec.scala | 5 ++-- .../core}/util/DirectorySpec.scala | 3 ++- 11 files changed, 71 insertions(+), 43 deletions(-) rename src/test/scala/{ => gitbucket/core}/api/JsonFormatSpec.scala (98%) rename src/test/scala/{ => gitbucket/core}/model/CommitStateSpec.scala (90%) rename src/test/scala/{ => gitbucket/core}/service/AccessTokenServiceSpec.scala (92%) rename src/test/scala/{ => gitbucket/core}/service/CommitStateServiceSpec.scala (97%) rename src/test/scala/{ => gitbucket/core}/service/IssuesServiceSpec.scala (95%) rename src/test/scala/{ => gitbucket/core}/service/MergeServiceSpec.scala (96%) rename src/test/scala/{ => gitbucket/core}/service/RepositoryServiceSpec.scala (92%) rename src/test/scala/{ => gitbucket/core}/service/WebHookServiceSpec.scala (97%) rename src/test/scala/{ => gitbucket/core}/util/DirectorySpec.scala (92%) diff --git a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala index a20bcfd95..96654f48e 100644 --- a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala +++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala @@ -21,7 +21,7 @@ object AutoUpdate { * The history of versions. A head of this sequence is the current BitBucket version. */ val versions = Seq( - // TODO(tanacasino): Add 3.1 migration + new Version(3, 1), new Version(3, 0), new Version(2, 8), new Version(2, 7) { diff --git a/src/test/scala/api/JsonFormatSpec.scala b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala similarity index 98% rename from src/test/scala/api/JsonFormatSpec.scala rename to src/test/scala/gitbucket/core/api/JsonFormatSpec.scala index 0f145a646..73d4ef7d1 100644 --- a/src/test/scala/api/JsonFormatSpec.scala +++ b/src/test/scala/gitbucket/core/api/JsonFormatSpec.scala @@ -1,10 +1,16 @@ -package api +package gitbucket.core.api + +import gitbucket.core.util.RepositoryName + import org.specs2.mutable.Specification -import java.util.{Date, Calendar, TimeZone} -import util.RepositoryName import org.json4s.jackson.JsonMethods.{pretty, parse} import org.json4s._ import org.specs2.matcher._ + +import java.util.{Calendar, TimeZone} + + + class JsonFormatSpec extends Specification { val date1 = { val d = Calendar.getInstance(TimeZone.getTimeZone("UTC")) diff --git a/src/test/scala/model/CommitStateSpec.scala b/src/test/scala/gitbucket/core/model/CommitStateSpec.scala similarity index 90% rename from src/test/scala/model/CommitStateSpec.scala rename to src/test/scala/gitbucket/core/model/CommitStateSpec.scala index 231322fbf..a161908d8 100644 --- a/src/test/scala/model/CommitStateSpec.scala +++ b/src/test/scala/gitbucket/core/model/CommitStateSpec.scala @@ -1,8 +1,9 @@ -package model +package gitbucket.core.model + +import gitbucket.core.model.CommitState._ import org.specs2.mutable.Specification -import CommitState._ class CommitStateSpec extends Specification { "CommitState" should { diff --git a/src/test/scala/service/AccessTokenServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala similarity index 92% rename from src/test/scala/service/AccessTokenServiceSpec.scala rename to src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala index 7729158c9..460e020fe 100644 --- a/src/test/scala/service/AccessTokenServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/AccessTokenServiceSpec.scala @@ -1,8 +1,11 @@ -package service +package gitbucket.core.service + +import gitbucket.core.model._ import org.specs2.mutable.Specification + import java.util.Date -import model._ + class AccessTokenServiceSpec extends Specification with ServiceSpecBase { @@ -18,7 +21,7 @@ class AccessTokenServiceSpec extends Specification with ServiceSpecBase { val tokenHash = AccessTokenService.tokenToHash(token) AccessTokenService.getAccessTokens("root") must be like{ - case List(model.AccessToken(`id`, "root", `tokenHash`, "note")) => ok + case List(AccessToken(`id`, "root", `tokenHash`, "note")) => ok } }} @@ -29,7 +32,7 @@ class AccessTokenServiceSpec extends Specification with ServiceSpecBase { AccessTokenService.generateAccessToken("user2", "note2") AccessTokenService.getAccessTokens("root") must be like{ - case List(model.AccessToken(`id`, "root", `tokenHash`, "note")) => ok + case List(AccessToken(`id`, "root", `tokenHash`, "note")) => ok } }} @@ -75,7 +78,7 @@ class AccessTokenServiceSpec extends Specification with ServiceSpecBase { "when update Account.userName then AccessToken.userName changed" in { withTestDB { implicit session => val user2 = generateNewAccount("user2") val (id, token) = AccessTokenService.generateAccessToken("user2", "note") - import model.Profile._ + import gitbucket.core.model.Profile._ import profile.simple._ Accounts.filter(_.userName === "user2".bind).map(_.userName).update("user3") diff --git a/src/test/scala/service/CommitStateServiceSpec.scala b/src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala similarity index 97% rename from src/test/scala/service/CommitStateServiceSpec.scala rename to src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala index 4983fc519..5bc109f4b 100644 --- a/src/test/scala/service/CommitStateServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/CommitStateServiceSpec.scala @@ -1,9 +1,14 @@ -package service -import org.specs2.mutable.Specification -import java.util.Date -import model._ -import model.Profile._ +package gitbucket.core.service + +import gitbucket.core.model._ +import gitbucket.core.model.Profile._ import profile.simple._ + +import org.specs2.mutable.Specification + +import java.util.Date + + class CommitStatusServiceSpec extends Specification with ServiceSpecBase with CommitStatusService with RepositoryService with AccountService{ val now = new java.util.Date() diff --git a/src/test/scala/service/IssuesServiceSpec.scala b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala similarity index 95% rename from src/test/scala/service/IssuesServiceSpec.scala rename to src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala index 8105f06eb..f4d75bb0d 100644 --- a/src/test/scala/service/IssuesServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala @@ -1,9 +1,12 @@ -package service +package gitbucket.core.service + +import gitbucket.core.model._ +import gitbucket.core.service.IssuesService._ import org.specs2.mutable.Specification + import java.util.Date -import model._ -import service.IssuesService._ + class IssuesServiceSpec extends Specification with ServiceSpecBase { "IssuesService" should { diff --git a/src/test/scala/service/MergeServiceSpec.scala b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala similarity index 96% rename from src/test/scala/service/MergeServiceSpec.scala rename to src/test/scala/gitbucket/core/service/MergeServiceSpec.scala index 9f0930449..ce4142a0b 100644 --- a/src/test/scala/service/MergeServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala @@ -1,18 +1,22 @@ -package service -import org.specs2.mutable.Specification -import java.util.Date -import model._ -import util.JGitUtil -import util.Directory._ -import java.nio.file._ -import util.Implicits._ -import util.ControlUtil._ +package gitbucket.core.service + +import gitbucket.core.model._ +import gitbucket.core.util.JGitUtil +import gitbucket.core.util.Directory._ +import gitbucket.core.util.Implicits._ +import gitbucket.core.util.ControlUtil._ + +import org.apache.commons.io.FileUtils import org.eclipse.jgit.api.Git import org.eclipse.jgit.dircache.DirCache import org.eclipse.jgit.lib._ -import org.eclipse.jgit.treewalk._ import org.eclipse.jgit.revwalk._ -import org.apache.commons.io.FileUtils +import org.eclipse.jgit.treewalk._ +import org.specs2.mutable.Specification + +import java.nio.file._ +import java.util.Date + class MergeServiceSpec extends Specification { sequential diff --git a/src/test/scala/service/RepositoryServiceSpec.scala b/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala similarity index 92% rename from src/test/scala/service/RepositoryServiceSpec.scala rename to src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala index 23a22150c..b8f7bd441 100644 --- a/src/test/scala/service/RepositoryServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/RepositoryServiceSpec.scala @@ -1,9 +1,11 @@ -package service +package gitbucket.core.service + +import gitbucket.core.model._ +import gitbucket.core.model.Profile._ + import org.specs2.mutable.Specification -import java.util.Date -import model._ -import model.Profile._ -import profile.simple._ + + class RepositoryServiceSpec extends Specification with ServiceSpecBase with RepositoryService with AccountService{ "RepositoryService" should { "renameRepository can rename CommitState" in { withTestDB { implicit session => diff --git a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala index d2fb7c462..103372bb0 100644 --- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala +++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala @@ -2,14 +2,18 @@ package gitbucket.core.service import gitbucket.core.servlet.AutoUpdate import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil} +import gitbucket.core.util.ControlUtil._ +import gitbucket.core.model._ import gitbucket.core.model.Profile._ import profile.simple._ -import ControlUtil._ -import java.sql.DriverManager + import org.apache.commons.io.FileUtils -import scala.util.Random + +import java.sql.DriverManager import java.io.File -import model._ + +import scala.util.Random + trait ServiceSpecBase { diff --git a/src/test/scala/service/WebHookServiceSpec.scala b/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala similarity index 97% rename from src/test/scala/service/WebHookServiceSpec.scala rename to src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala index 13c587cff..a3d3d34f8 100644 --- a/src/test/scala/service/WebHookServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/WebHookServiceSpec.scala @@ -1,8 +1,7 @@ -package service +package gitbucket.core.service import org.specs2.mutable.Specification -import java.util.Date -import model._ + class WebHookServiceSpec extends Specification with ServiceSpecBase { lazy val service = new WebHookPullRequestService with AccountService with RepositoryService with PullRequestService with IssuesService diff --git a/src/test/scala/util/DirectorySpec.scala b/src/test/scala/gitbucket/core/util/DirectorySpec.scala similarity index 92% rename from src/test/scala/util/DirectorySpec.scala rename to src/test/scala/gitbucket/core/util/DirectorySpec.scala index c40aafebf..a824fe8fe 100644 --- a/src/test/scala/util/DirectorySpec.scala +++ b/src/test/scala/gitbucket/core/util/DirectorySpec.scala @@ -1,7 +1,8 @@ -package util +package gitbucket.core.util import org.specs2.mutable._ + class DirectorySpec extends Specification { "GitBucketHome" should { "set under target in test scope" in {