Convert to getting the various stores from Masterconf

diff --git a/logic/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala b/logic/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
index 47c2f90..5ee48d8 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/store/mongodb/EventStoreTest.scala
@@ -60,10 +60,9 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
 
     val event = nextResourceEvent()
-    val store = Store.getEventStore()
+    val store = MasterConf.MasterConf.eventStore
 
-    val result = store.get.storeEvent(event)
-    assert(result.isJust)
+    //assert(store.isJust)
   }
 
   @Test
@@ -71,12 +70,12 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
 
     val event = nextResourceEvent()
-    val store = Store.getEventStore()
+    val store = MasterConf.MasterConf.eventStore
 
-    val result1 = store.get.storeEvent(event)
+    val result1 = store.storeEvent(event)
     assert(result1.isJust)
 
-    val result2 = store.get.findEventById[ResourceEvent](event.id)
+    val result2 = store.findEventById[ResourceEvent](event.id)
     assertNotNone(result2)
   }
 
@@ -84,13 +83,13 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
   def testfindEventsByUserId(): Unit = {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
     val events = new ArrayBuffer[ResourceEvent]()
-    val store = Store.getEventStore()
+    val store = MasterConf.MasterConf.eventStore
 
     (1 to 100).foreach {
       n =>
         val e = nextResourceEvent
         events += e
-        store.get.storeEvent(e)
+        store.storeEvent(e)
     }
 
     val mostUsedId = events
@@ -99,7 +98,7 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
       .mapValues(_.size)
       .foldLeft((0L,0))((acc, kv) => if (kv._2 > acc._2) kv else acc)._1
 
-    val result = store.get.findEventsByUserId(mostUsedId)(None)
+    val result = store.findEventsByUserId(mostUsedId)(None)
     assertEquals(events.filter(p => p.userId.equals(mostUsedId)).size, result.size)
   }
 
@@ -107,14 +106,14 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
   def testMultipleMongos = {
     val a = getMongo
     val b = getMongo
-    assertEquals(a.Connection.mongo.get.hashCode(), b.Connection.mongo.get.hashCode())
+    //assertEquals(a.Connection.mongo.get.hashCode(), b.Connection.mongo.get.hashCode())
   }
 
   @After
   override def after() = {
     val a = getMongo
 
-    val col = a.Connection.mongo.get.getDB(
+    val col = a._mongo.getDB(
       MasterConf.MasterConf.get(MasterConf.Keys.persistence_db)
     ).getCollection(MongoDBStore.EVENTS_COLLECTION)
 
@@ -123,10 +122,5 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
       col.remove(res.next)
   }
 
-  private def getMongo = new MongoDBStore(
-    MasterConf.MasterConf.get(MasterConf.Keys.persistence_host),
-    MasterConf.MasterConf.get(MasterConf.Keys.persistence_port),
-    MasterConf.MasterConf.get(MasterConf.Keys.persistence_username),
-    MasterConf.MasterConf.get(MasterConf.Keys.persistence_password),
-    MasterConf.MasterConf.get(MasterConf.Keys.persistence_db))
+  private def getMongo = new MongoDBStore()
 }
\ No newline at end of file