Minor changes, to compile.

diff --git a/logic/pom.xml b/logic/pom.xml
index 205e869..d0af593 100644 (file)
--- a/logic/pom.xml
+++ b/logic/pom.xml
@@ -196,11 +196,11 @@
       <version>0.9.2-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
+    <!--    <dependency>
       <groupId>com.yammer.metrics</groupId>
       <artifactId>metrics-core</artifactId>
       <version>2.0.0-BETA18-SNAPSHOT</version>
-    </dependency>
+    </dependency>-->
 
     <dependency>
       <groupId>org.apache.lucene</groupId>

diff --git a/logic/src/test/scala/gr/grnet/aquarium/MasterConfTest.scala b/logic/src/test/scala/gr/grnet/aquarium/MasterConfTest.scala
index 685732c..969c7ea 100644 (file)
--- a/logic/src/test/scala/gr/grnet/aquarium/MasterConfTest.scala
+++ b/logic/src/test/scala/gr/grnet/aquarium/MasterConfTest.scala
@@ -38,7 +38,6 @@ package gr.grnet.aquarium
 import actor.DispatcherRole
 import org.junit.Test
 import org.junit.Assert._
-import org.junit.Assume.assumeTrue
 
 /**
  * 

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 387ef54..55fed94 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
@@ -41,7 +41,8 @@ import org.junit.Assert._
 import collection.mutable.ArrayBuffer
 import gr.grnet.aquarium.logic.events.ResourceEvent
 import org.junit.{Before, After, Test}
-import gr.grnet.aquarium.{MasterConf, LogicTestsAssumptions}
+import gr.grnet.aquarium.MasterConf._
+import gr.grnet.aquarium.LogicTestsAssumptions
 
 /**
  * @author Georgios Gousios <gousiosg@gmail.com>
@@ -57,9 +58,10 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
 
     val event = nextResourceEvent()
-    val store = MasterConf.MasterConf.eventStore
+    val store = MasterConf.eventStore
+    val result = store.storeEvent(event)
 
-    //assert(store.isJust)
+    assert(result.isJust)
   }
 
   @Test
@@ -67,7 +69,7 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
 
     val event = nextResourceEvent()
-    val store = MasterConf.MasterConf.eventStore
+    val store = MasterConf.eventStore
 
     val result1 = store.storeEvent(event)
     assert(result1.isJust)
@@ -80,7 +82,7 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
   def testfindEventsByUserId(): Unit = {
     assumeTrue(LogicTestsAssumptions.EnableMongoDBTests)
     val events = new ArrayBuffer[ResourceEvent]()
-    val store = MasterConf.MasterConf.eventStore
+    val store = MasterConf.eventStore
 
     (1 to 100).foreach {
       n =>
@@ -113,7 +115,7 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
     val a = getMongo
 
     val col = a.mongo.getDB(
-      MasterConf.MasterConf.get(MasterConf.Keys.persistence_db)
+      MasterConf.get(Keys.persistence_db)
     ).getCollection(MongoDBStore.EVENTS_COLLECTION)
 
     val res = col.find
@@ -121,5 +123,5 @@ class EventStoreTest extends TestMethods with RandomEventGenerator {
       col.remove(res.next)
   }
 
-  private def getMongo = MasterConf.MasterConf.eventStore.asInstanceOf[MongoDBStore]
+  private def getMongo = MasterConf.eventStore.asInstanceOf[MongoDBStore]
 }
\ No newline at end of file