Test Updates

Author: sfxcode

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

@@ -2,6 +2,7 @@ package com.sfxcode.nosql.mongo
 
 import com.sfxcode.nosql.mongo.database.DatabaseProvider
 import com.sfxcode.nosql.mongo.model._
+import com.sfxcode.nosql.mongo.operation.CrudObserver
 import org.mongodb.scala._
 
 object TestDatabase extends ObservableImplicits {
@@ -23,15 +24,15 @@ object TestDatabase extends ObservableImplicits {
 
   class BookDocumentDAO extends MongoDAO[Document](database, "books")
 
-  object LineDAO extends MongoDAO[Line](database, "lines")
+  object LineDAO extends MongoDAO[Line](database, "lines") with CrudObserver[Line]
 
   object PersonDAO extends MongoDAO[Person](database, "person")
 
   PersonDAO.dropResult()
 
   val persons: List[Person] = Person.personList
 
-  PersonDAO.insertValuesResult(persons)
+  PersonDAO.insertManyResult(persons)
 
   def printDatabaseStatus(): Unit = {
     printDebugValues("Database Status", "%s rows for collection person found".format(PersonDAO.countResult()))

src/test/scala/com/sfxcode/nosql/mongo/demo/tour/QuickTour.scala

@@ -10,7 +10,7 @@ object QuickTour extends App {
 
   val line = Line(1, "default", 3, Position(1, 3), Position(3, 7))
 
-  LineDAO.insert(line)
+  LineDAO.insertOneResult(line)
 
   printDebugValues("LineDAO.findAll", LineDAO.find())
 

src/test/scala/com/sfxcode/nosql/mongo/demo/tour/TestTour.scala

@@ -22,7 +22,7 @@ object TestTour extends App {
 
   assert(BookDAO.count().headResult() == 0)
 
-  BookDAO.insert(scalaBook)
+  BookDAO.insertOneResult(scalaBook)
 
   val books: List[Book] = BookDAO.find().resultList()
 

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

@@ -1,26 +1,33 @@
 package com.sfxcode.nosql.mongo.operation
 
-import com.sfxcode.nosql.mongo._
-import com.sfxcode.nosql.mongo.Sort._
+// #agg_imports
 import com.sfxcode.nosql.mongo.Field._
+import com.sfxcode.nosql.mongo.Filter._
+import com.sfxcode.nosql.mongo.Sort._
+import com.sfxcode.nosql.mongo._
+// #agg_imports
 
 import com.sfxcode.nosql.mongo.TestDatabase._
-
 import org.mongodb.scala.bson.conversions.Bson
 import org.mongodb.scala.model.Aggregates.{ filter, group, sort }
-import org.mongodb.scala.model.Filters.equal
-
+import org.mongodb.scala.model.Filters.{ and, equal }
 import org.specs2.mutable.{ Before, Specification }
 
 class AggregationSpec extends Specification with Before {
 
   sequential
 
-  val groupStage: Bson = group(Map("age" -> "$age"), sumField("balance"), firstField("age"))
+  // #agg_stages
+  val filterStage: Bson = filter(and(
+    equal("gender", "female"),
+    notNullFilter("balance")))
 
-  val filterStage: Bson = filter(equal("gender", "female"))
+  val groupStage: Bson = group(
+    Map("age" -> "$age"),
+    sumField("balance"), firstField("age"))
 
   val sortStage: Bson = sort(sortByKey("age"))
+  // #agg_stages
 
   "Search" should {
 
@@ -35,15 +42,18 @@ class AggregationSpec extends Specification with Before {
     }
 
     "support aggregation filter and group" in {
-
+      // #agg_execute
       val aggregator = List(filterStage, groupStage, sortStage)
 
       val aggregated = PersonDAO.Raw.findAggregated(aggregator).resultList()
 
+      // #agg_execute
+
       aggregated.size must be equalTo 21
 
+      // #agg_convert
       val list: List[Map[String, Any]] = aggregated
-
+      // #agg_convert
       list.foreach(m => println(m("age") + " -> " + m("balance")))
 
       list.head("age") must be equalTo 20

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

@@ -13,13 +13,13 @@ class BaseSpec extends Specification with BeforeAll {
   "Base Operations" should {
 
     "count collection size in" in {
-      BookDAO.insertResult(Book.scalaBook())
+      BookDAO.insertOneResult(Book.scalaBook())
 
       BookDAO.countResult() must be equalTo 1
 
       val scalaBook = Book(Some(2), "Programming In Scala", 852, Author("Martin Odersky"), List(2, 4, 10))
 
-      BookDAO.insertResult(scalaBook)
+      BookDAO.insertOneResult(scalaBook)
 
       BookDAO.countResult() must be equalTo 2
 

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

@@ -13,22 +13,22 @@ class CrudSpec extends Specification {
 
     "create Documents in" in {
       LineDAO.dropResult()
-      LineDAO.insertResult(Line.line())
+      LineDAO.insertOneResult(Line.line())
       LineDAO.countResult() must be equalTo 1
 
     }
 
     "update Doduments" in {
       LineDAO.dropResult()
-      LineDAO.insertResult(Line.line())
+      LineDAO.insertOneResult(Line.line())
       LineDAO.countResult() must be equalTo 1
 
       val line = LineDAO.find().headResult()
 
       line.name must be equalTo "default"
 
       line.name = "test"
-      LineDAO.updateResult(line)
+      LineDAO.replaceOneResult(line)
 
       val line2 = LineDAO.find().headResult()
       line2.name must be equalTo "test"
@@ -37,10 +37,10 @@ class CrudSpec extends Specification {
 
     "delete Documents in" in {
       LineDAO.dropResult()
-      LineDAO.insertResult(Line.line(2))
+      LineDAO.insertOneResult(Line.line(2))
       LineDAO.countResult() must be equalTo 1
       val line = LineDAO.find(Map("id" -> 2)).headResult()
-      LineDAO.deleteByValueResult(line)
+      LineDAO.deleteOneResult(line)
       LineDAO.countResult() must be equalTo 0
 
     }

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

@@ -2,6 +2,7 @@ package com.sfxcode.nosql.mongo.operation
 
 import com.sfxcode.nosql.mongo.TestDatabase._
 import com.sfxcode.nosql.mongo._
+import com.sfxcode.nosql.mongo.Sort._
 import com.sfxcode.nosql.mongo.model.Person
 import org.specs2.mutable.{ Before, Specification }
 
@@ -58,7 +59,7 @@ class SearchSpec extends Specification with Before {
 
     "support findOne with Filter" in {
 
-      val females = PersonDAO.find(Map("gender" -> "female")).resultList()
+      val females = PersonDAO.find(Map("gender" -> "female"), sortByKey("name")).resultList()
 
       females.size must be equalTo 98
 

src/test/scala/com/sfxcode/nosql/mongo/relation/RelationDemoDatabase.scala

@@ -19,7 +19,7 @@ object RelationDemoDatabase {
       NodeDAO.parentRelation.removeFromCache(parentId)
       NodeDAO.childrenRelation.removeFromCache(node.id)
       val newNode = copy(parentId = node.id)
-      NodeDAO.updateResult(newNode)
+      NodeDAO.replaceOneResult(newNode)
     }
 
     def children: List[Node] = {

src/test/scala/com/sfxcode/nosql/mongo/relation/RelationSpec.scala

@@ -58,10 +58,10 @@ class RelationSpec extends Specification with Before {
 
     val personList = Person.personList.take(10)
     personList.foreach(person => {
-      UserDAO.insertResult(User(person.id, person.name, person.guid))
-      LoginDAO.insertResult(Login(person.guid, person.email, person.email.reverse))
+      UserDAO.insertOneResult(User(person.id, person.name, person.guid))
+      LoginDAO.insertOneResult(Login(person.guid, person.email, person.email.reverse))
       person.friends.foreach(f => {
-        FriendDAO.insertResult(Friend((person.id + 11) * (f.id + 3), f.name, person.id))
+        FriendDAO.insertOneResult(Friend((person.id + 11) * (f.id + 3), f.name, person.id))
       })
     })