From f3ad1a019debdbdb2c39544a80bc75115183ecac Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 22 Oct 2013 01:09:22 +0900 Subject: [PATCH] Small fix for #147 --- ...countServiceSpec.scala => AccountServiceServiceSpec.scala} | 4 ++-- .../scala/{SpecBase.scala => service/ServiceSpecBase.scala} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/test/scala/service/{AccountServiceSpec.scala => AccountServiceServiceSpec.scala} (92%) rename src/test/scala/{SpecBase.scala => service/ServiceSpecBase.scala} (96%) diff --git a/src/test/scala/service/AccountServiceSpec.scala b/src/test/scala/service/AccountServiceServiceSpec.scala similarity index 92% rename from src/test/scala/service/AccountServiceSpec.scala rename to src/test/scala/service/AccountServiceServiceSpec.scala index 94358ac54..17bfb49f0 100644 --- a/src/test/scala/service/AccountServiceSpec.scala +++ b/src/test/scala/service/AccountServiceServiceSpec.scala @@ -3,14 +3,14 @@ package service import org.specs2.mutable.Specification import java.util.Date -class AccountServiceSpec extends Specification with SpecBase { +class AccountServiceServiceSpec extends Specification with ServiceSpecBase { "AccountService" should { val RootMailAddress = "root@localhost" "getAllUsers" in { withTestDB{ AccountService.getAllUsers must be like{ - case List(model.Account("root", RootMailAddress, _, true, _, _, _, None, None, false)) => ok + case List(model.Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false)) => ok } }} diff --git a/src/test/scala/SpecBase.scala b/src/test/scala/service/ServiceSpecBase.scala similarity index 96% rename from src/test/scala/SpecBase.scala rename to src/test/scala/service/ServiceSpecBase.scala index 3ab4a74a6..75bce03b0 100644 --- a/src/test/scala/SpecBase.scala +++ b/src/test/scala/service/ServiceSpecBase.scala @@ -7,7 +7,7 @@ import org.apache.commons.io.FileUtils import scala.util.Random import java.io.File -trait SpecBase { +trait ServiceSpecBase { def withTestDB[A](action: => A): A = { util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){