Specs cleanup

Author: sfxcode

src/test/scala/com/sfxcode/nosql/mongo/TestDatabase.scala

@@ -2,16 +2,12 @@ package com.sfxcode.nosql.mongo
 
 import com.sfxcode.nosql.mongo.database.DatabaseProvider
 import com.sfxcode.nosql.mongo.model._
-import org.mongodb.scala._
+import org.bson.codecs.configuration.CodecRegistries._
+import org.mongodb.scala.bson.codecs.Macros._
 
-object TestDatabase extends ObservableImplicits {
+object TestDatabase {
 
-  val mongoClient: MongoClient = MongoClient()
-
-  import org.bson.codecs.configuration.CodecRegistries._
-  import org.mongodb.scala.bson.codecs.Macros._
-
-  private val registry = fromProviders(classOf[Person], classOf[Friend], classOf[CodecTest])
+  private val registry           = fromProviders(classOf[Person], classOf[Friend], classOf[CodecTest])
   private val universityRegistry = fromProviders(classOf[Student], classOf[Score], classOf[Grade])
 
   val provider =
@@ -24,17 +20,7 @@ object TestDatabase extends ObservableImplicits {
   object CodecDao extends MongoDAO[CodecTest](provider, "codec:codec-test")
 
   object StudentDAO extends MongoDAO[Book](provider, "university-students")
-  object GradeDAO extends MongoDAO[Book](provider, "university-grades")
 
-  def printDatabaseStatus(): Unit = {
-    val count: Long = PersonDAO.count()
-    printDebugValues("Database Status", "%s rows for collection person found".format(count))
-  }
-
-  def printDebugValues(name: String, result: Any): Unit = {
-    println()
-    println(name)
-    println(result)
-  }
+  object GradeDAO extends MongoDAO[Book](provider, "university-grades")
 
 }

src/test/scala/com/sfxcode/nosql/mongo/dao/PersonDAOSpec.scala

@@ -6,13 +6,7 @@ import com.sfxcode.nosql.mongo.TestDatabase.PersonDAO
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeAll
 
-class PersonDAOSpec extends Specification with BeforeAll {
-  sequential
-
-  override def beforeAll(): Unit = {
-    PersonDAO.drop().result()
-    PersonDAO.importJsonFile(File(Resource.getUrl("json/people.json"))).result()
-  }
+class PersonDAOSpec extends PersonSpecification {
 
   "PersonDAO" should {
 

src/test/scala/com/sfxcode/nosql/mongo/dao/PersonSpecification.scala

@@ -0,0 +1,18 @@
+package com.sfxcode.nosql.mongo.dao
+
+import better.files.{ File, Resource }
+import com.sfxcode.nosql.mongo.TestDatabase._
+import com.sfxcode.nosql.mongo._
+import org.specs2.mutable.Specification
+import org.specs2.specification.BeforeAll
+
+abstract class PersonSpecification extends Specification with BeforeAll {
+
+  sequential
+
+  override def beforeAll(): Unit = {
+    PersonDAO.drop().result()
+    PersonDAO.importJsonFile(File(Resource.getUrl("json/people.json"))).result()
+  }
+
+}

src/test/scala/com/sfxcode/nosql/mongo/database/DatabaseSpec.scala

@@ -5,18 +5,14 @@ import java.text.SimpleDateFormat
 import better.files.{ File, Resource }
 import com.sfxcode.nosql.mongo._
 import com.sfxcode.nosql.mongo.TestDatabase.PersonDAO
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.model.Person
 import org.json4s.DefaultFormats
 import org.json4s.native.Serialization.read
 import org.mongodb.scala.Document
 import org.specs2.specification.BeforeAll
 
-class DocumentExtensionsSpec extends DatabaseSpec with BeforeAll {
-
-  override def beforeAll(): Unit = {
-    PersonDAO.drop().result()
-    PersonDAO.importJsonFile(File(Resource.getUrl("json/people.json"))).result()
-  }
+class DocumentExtensionsSpec extends PersonSpecification {
 
   "Document" should {
 
@@ -35,9 +31,9 @@ class DocumentExtensionsSpec extends DatabaseSpec with BeforeAll {
     "be converted to plain json " in {
       val document: Document = PersonDAO.Raw.find(Map("id" -> 11)).result()
 
-      val s = document.asPlainJson
+      val s                = document.asPlainJson
       implicit val formats = DefaultFormats
-      val person: Person = read[Person](s)
+      val person: Person   = read[Person](s)
       person.id mustEqual 11
 
       val tags = person.tags

src/test/scala/com/sfxcode/nosql/mongo/database/DocumentExtensionsSpec.scala

@@ -3,6 +3,8 @@ package com.sfxcode.nosql.mongo.operation
 // #agg_imports
 import com.sfxcode.nosql.mongo.Aggregate._
 import com.sfxcode.nosql.mongo._
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
+import org.specs2.specification.BeforeAll
 // #agg_imports
 
 import com.sfxcode.nosql.mongo.TestDatabase._
@@ -11,9 +13,7 @@ import org.mongodb.scala.model.Aggregates.{ filter, group, sort }
 import org.mongodb.scala.model.Filters.{ and, equal }
 import org.specs2.mutable.{ Before, Specification }
 
-class AggregationSpec extends Specification with Before {
-
-  sequential
+class AggregationSpec extends PersonSpecification {
 
   // #agg_stages
   val filterStage: Bson = filter(and(equal("gender", "female"), notNullFilter("balance")))
@@ -57,5 +57,4 @@ class AggregationSpec extends Specification with Before {
 
   }
 
-  override def before: Any = printDatabaseStatus()
 }

src/test/scala/com/sfxcode/nosql/mongo/operation/AggregationSpec.scala

@@ -2,12 +2,13 @@ package com.sfxcode.nosql.mongo.operation
 
 import com.sfxcode.nosql.mongo.TestDatabase._
 import com.sfxcode.nosql.mongo._
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.model.Book
 import org.mongodb.scala.result.InsertOneResult
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeAll
 
-class BaseSpec extends Specification with BeforeAll {
+class BaseSpec extends PersonSpecification {
 
   sequential
 

src/test/scala/com/sfxcode/nosql/mongo/operation/BaseSpec.scala

@@ -2,18 +2,25 @@ package com.sfxcode.nosql.mongo.operation
 
 import com.sfxcode.nosql.mongo.TestDatabase._
 import com.sfxcode.nosql.mongo._
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.model.CodecTest
 import org.specs2.mutable.Specification
+import org.specs2.specification.BeforeAll
 
-class CrudSpec extends Specification {
+class CrudSpec extends PersonSpecification {
 
   sequential
 
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    CodecDao.drop().result()
+    CodecDao.insertOne(CodecTest()).result()
+  }
+
   "Crud Operations" should {
 
     "create Documents in" in {
-      CodecDao.drop().result()
-      CodecDao.insertOne(CodecTest()).result()
+
       CodecDao.count().result() must be equalTo 1
       val findOneResult = CodecDao.find("id", 1).resultOption()
       findOneResult must beSome[CodecTest]

src/test/scala/com/sfxcode/nosql/mongo/operation/CrudSpec.scala

@@ -2,13 +2,12 @@ package com.sfxcode.nosql.mongo.operation
 
 import com.sfxcode.nosql.mongo.TestDatabase._
 import com.sfxcode.nosql.mongo._
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.database.MongoIndex
 import org.specs2.mutable.Specification
 import org.specs2.specification.BeforeAll
 
-class IndexSpec extends Specification with BeforeAll {
-
-  sequential
+class IndexSpec extends PersonSpecification {
 
   "Base Index Operations" should {
 
@@ -91,6 +90,4 @@ class IndexSpec extends Specification with BeforeAll {
 
   }
 
-  override def beforeAll: Unit = BookDAO.drop().result()
-
 }

src/test/scala/com/sfxcode/nosql/mongo/operation/IndexSpec.scala

@@ -4,16 +4,11 @@ import better.files.{ File, Resource }
 import com.sfxcode.nosql.mongo.Sort._
 import com.sfxcode.nosql.mongo.TestDatabase._
 import com.sfxcode.nosql.mongo._
-import com.sfxcode.nosql.mongo.database.DatabaseSpec
+import com.sfxcode.nosql.mongo.dao.PersonSpecification
 import com.sfxcode.nosql.mongo.model.Person
 import org.specs2.specification.BeforeAll
 
-class SearchSpec extends DatabaseSpec with BeforeAll {
-
-  override def beforeAll(): Unit = {
-    PersonDAO.drop().result()
-    PersonDAO.importJsonFile(File(Resource.getUrl("json/people.json"))).result()
-  }
+class SearchSpec extends PersonSpecification {
 
   "Search Operations" should {