pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit 7f908e6d62e36c6b4fe1ec723b29723aeea636a1 parent e2b1c3f22ca678c9678e24fb6568c66506af9374 Author: Jul <jul@9o.is> Date: Wed, 21 May 2014 18:09:00 -0400 remove mongo deprecations in test cases Diffstat:
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/test/scala/inc/pyc/MongoTestKit.scala b/src/test/scala/inc/pyc/MongoTestKit.scala @@ -1,14 +1,13 @@ package inc.pyc import org.scalatest._ - import net.liftweb._ import common._ import http._ +import util._ import mongodb._ import util.{Props, StackableMaker} import util.Helpers.randomString - import com.mongodb.{MongoClient, ServerAddress} // The sole mongo object for testing @@ -33,7 +32,7 @@ trait MongoBeforeAndAfterAll extends BeforeAndAfterAll { def debug = false // db won't be dropped if this is true - lazy val identifier = new MongoIdentifier { + lazy val identifier = new ConnectionIdentifier { val jndiName = dbName } @@ -55,7 +54,7 @@ trait MongoBeforeAndAfterAll extends BeforeAndAfterAll { trait MongoSuite extends AbstractSuite with MongoBeforeAndAfterAll { this: Suite => - def mongoIdentifier: StackableMaker[MongoIdentifier] + def mongoIdentifier: StackableMaker[ConnectionIdentifier] abstract override def withFixture(test: NoArgTest) { mongoIdentifier.doWith(identifier) { @@ -70,7 +69,7 @@ trait MongoSuite extends AbstractSuite with MongoBeforeAndAfterAll { trait MongoSessionSuite extends AbstractSuite with MongoBeforeAndAfterAll { this: Suite => - def mongoIdentifier: StackableMaker[MongoIdentifier] + def mongoIdentifier: StackableMaker[ConnectionIdentifier] // Override with `val` to share session amongst tests. protected def session = new LiftSession("", randomString(20), Empty) diff --git a/src/test/scala/inc/pyc/model/AtmApplicationSpec.scala b/src/test/scala/inc/pyc/model/AtmApplicationSpec.scala @@ -16,7 +16,7 @@ class AtmApplicationSpec extends BaseMongoSessionWordSpec { rec.email("test@example.com") rec.validate.length should equal (0) - rec.save + rec.save() val recFromDb = AtmApplication.find(rec.id.get) recFromDb.isDefined should equal (true) diff --git a/src/test/scala/inc/pyc/model/NearAtmNotifySpec.scala b/src/test/scala/inc/pyc/model/NearAtmNotifySpec.scala @@ -16,7 +16,7 @@ class NearAtmNotifySpec extends BaseMongoSessionWordSpec { rec.postal("12345") rec.validate.length should equal (0) - rec.save + rec.save() val recFromDb = NearAtmNotify.find(rec.id.get) recFromDb.isDefined should equal (true) diff --git a/src/test/scala/inc/pyc/model/SearchedPostalSpec.scala b/src/test/scala/inc/pyc/model/SearchedPostalSpec.scala @@ -6,7 +6,7 @@ class SearchedPostalSpec extends BaseMongoWordSpec { "save, retrieve properly and set counter to one" in { val rec = SearchedPostal.createRecord.postal("12345") - rec.save + rec.save() val recFromDb = SearchedPostal.find(rec.id.get) recFromDb.isDefined should equal (true) @@ -17,10 +17,10 @@ class SearchedPostalSpec extends BaseMongoWordSpec { "increment count if same postal is saved more than once" in { val rec = SearchedPostal.createRecord.postal("54321") - rec.save + rec.save() - SearchedPostal.createRecord.postal("54321").save - SearchedPostal.createRecord.postal("54321").save + SearchedPostal.createRecord.postal("54321").save() + SearchedPostal.createRecord.postal("54321").save() val recFromDb = SearchedPostal.find(rec.id.get) recFromDb.isDefined should equal (true) diff --git a/src/test/scala/inc/pyc/model/UserSpec.scala b/src/test/scala/inc/pyc/model/UserSpec.scala @@ -24,7 +24,7 @@ class UserSpec extends BaseMongoSessionWordSpec { // save to db newUser.password.hashIt - newUser.save + newUser.save() // retrieve from db and compare val userFromDb = User.find(newUser.id.get) @@ -50,7 +50,7 @@ class UserSpec extends BaseMongoSessionWordSpec { newUser.validate.length should equal (0) // save to db - newUser.save + newUser.save() // retrieve from db and compare val userFromDb = User.find(newUser.id.get)