Permalink
Browse files

fix for sbt and new specs.

  • Loading branch information...
1 parent ce2a711 commit b5f32dfb314f1d0e5c1ce3e30502b2d9ff4bdef5 Robey Pointer committed May 4, 2010
@@ -23,8 +23,6 @@ import net.lag.logging.Logger
object StaticEdges extends Database {
- Configgy.configure("config/test.conf")
-
val poolConfig = Configgy.config.configMap("db.connection_pool")
val log = Logger.get
val config = Configgy.config
@@ -20,5 +20,7 @@ import net.lag.configgy.Configgy
import org.specs.Specification
abstract class ConfiguredSpecification extends Specification {
+ Configgy.configure("config/test.conf")
+
lazy val config = Configgy.config
}
@@ -28,8 +28,8 @@ import conversions.SelectOperation._
import test.{EdgesDatabase, StaticEdges}
-object EdgesSpec extends ConfiguredSpecification with EdgesDatabase with Eventually {
- val poolConfig = config.configMap("db.connection_pool")
+class EdgesSpec extends ConfiguredSpecification with EdgesDatabase {
+ lazy val poolConfig = config.configMap("db.connection_pool")
import StaticEdges._
@@ -24,7 +24,7 @@ import test.{EdgesDatabase, StaticEdges}
import thrift.{Page, QueryTerm, Results, SelectOperation, SelectOperationType}
-object IntersectionSpec extends ConfiguredSpecification with Eventually with EdgesDatabase {
+object IntersectionSpec extends ConfiguredSpecification with EdgesDatabase {
val poolConfig = config.configMap("db.connection_pool")
import StaticEdges._
@@ -26,7 +26,7 @@ import test.{EdgesDatabase, StaticEdges}
import thrift._
-object SelectCompilerSpec extends ConfiguredSpecification with Eventually with EdgesDatabase with JMocker with ClassMocker {
+object SelectCompilerSpec extends ConfiguredSpecification with EdgesDatabase with JMocker with ClassMocker {
val poolConfig = config.configMap("db.connection_pool")
import StaticEdges._
@@ -25,7 +25,7 @@ import conversions.Results._
import thrift.{Results, Page}
-object DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
+class DifferenceQuerySpec extends ConfiguredSpecification with JMocker {
"DifferenceQuery" should {
val query1 = new queries.SeqQuery(List(1,2,3,4,5,6,7,8,9,10,11,12))
val query2 = new queries.SeqQuery(List(3,4,7,11))

0 comments on commit b5f32df

Please sign in to comment.