Merge pull request #13 from rinmalavi/wip-testing

Adapted PR#12 to work with windows.
ngs-doo · Nov 4, 2014 · 2bc1dc7 · 2bc1dc7
2 parents fcf410e + b0a45fe
commit 2bc1dc7
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 139 deletions.
diff --git a/http/src/test/resources/dsl/scalatest.dsl b/http/src/test/resources/dsl/scalatest.dsl
@@ -445,11 +445,11 @@ module connected
 module concept
 {
   mixin Concept;
- 
+
   value emptyConcept {
     has mixin Concept;
   }
- 
+
   value fieldedConcept {
     has mixin Concept;
     String s1;
@@ -460,4 +460,4 @@ module concept
     Concept? c;
     int i;
   }
-}
+}
diff --git a/http/src/test/scala/com/dslplatform/mock/Agg.scala b/http/src/test/scala/com/dslplatform/mock/Agg.scala
@@ -1,10 +1,10 @@
-package com.dslplatform.mock
-
-import com.dslplatform.api.client._
-import com.dslplatform.api.patterns._
-
-class Agg extends AggregateRoot {
-  def URI = "uri_value"
-}
-
-object Agg extends AggregateRootCompanion[Agg]{}
+package com.dslplatform.mock
+
+import com.dslplatform.api.client._
+import com.dslplatform.api.patterns._
+
+class Agg extends AggregateRoot {
+  def URI = "uri_value"
+}
+
+object Agg extends AggregateRootCompanion[Agg]{}
diff --git a/http/src/test/scala/AggregateEventTest.scala → ...dslplatform/test/AggregateEventTest.scala b/http/src/test/scala/AggregateEventTest.scala → ...dslplatform/test/AggregateEventTest.scala
@@ -1,11 +1,10 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.patterns.ServiceLocator
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
 import com.dslplatform.test.simple.SimpleRoot
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class AggregateEventTest extends Specification {
 
   def is = s2"""Aggregate Event simple
@@ -15,10 +14,9 @@ class AggregateEventTest extends Specification {
                                           ${Step(located.close())}
   """
 
-  val located = new located {}
+  val located = new Located
 
-  implicit val duration: scala.concurrent.duration.FiniteDuration = scala.concurrent.duration.FiniteDuration(1,
-    "seconds")
+  implicit val duration = scala.concurrent.duration.FiniteDuration(1, "seconds")
 
   def instantiateEventOnPersistedRoot = { implicit locator : ServiceLocator =>
     val uri = SimpleRoot().create()

diff --git a/http/src/test/scala/AuthHeaderTest.scala → ...com/dslplatform/test/AuthHeaderTest.scala b/http/src/test/scala/AuthHeaderTest.scala → ...com/dslplatform/test/AuthHeaderTest.scala
@@ -1,6 +1,8 @@
+package com.dslplatform.test
+
 import java.io.ByteArrayInputStream
 
-import com.dslplatform.api.client.{ HttpHeaderProvider, SettingsHeaderProvider, HttpClient }
+import com.dslplatform.api.client.{HttpClient, HttpHeaderProvider, SettingsHeaderProvider}
 import org.specs2._
 
 class AuthHeaderTest extends Specification {

diff --git a/http/src/test/scala/BootstrapTest.scala → .../com/dslplatform/test/BootstrapTest.scala b/http/src/test/scala/BootstrapTest.scala → .../com/dslplatform/test/BootstrapTest.scala
@@ -1,8 +1,10 @@
-import java.util.concurrent.{Executors, ExecutorService}
+package com.dslplatform.test
 
+import java.util.concurrent.{ExecutorService, Executors}
+
+import com.dslplatform.api.client.{ClientPersistableRepository, ClientSearchableRepository, HttpClient}
+import com.dslplatform.api.patterns.{PersistableRepository, SearchableRepository}
 import com.dslplatform.mock._
-import com.dslplatform.api.client.{ClientSearchableRepository, ClientPersistableRepository, HttpClient}
-import com.dslplatform.api.patterns.{SearchableRepository, PersistableRepository}
 import org.slf4j.{Logger, LoggerFactory}
 import org.specs2._
 

diff --git a/http/src/test/scala/CrudProxyTest.scala → .../com/dslplatform/test/CrudProxyTest.scala b/http/src/test/scala/CrudProxyTest.scala → .../com/dslplatform/test/CrudProxyTest.scala
@@ -1,8 +1,9 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.client.CrudProxy
 import com.dslplatform.test.complex.{BaseRoot, EmptyRoot}
 import com.dslplatform.test.simple.SimpleRoot
 import org.specs2._
-
 import org.specs2.specification.Step
 
 class CrudProxyTest extends Specification with Common {
@@ -20,7 +21,7 @@ class CrudProxyTest extends Specification with Common {
                           ${Step(located.close())}
       """
 
-  val located = new located {}
+  val located = new Located
 
   val crudProxy = located.resolved[CrudProxy]
 

diff --git a/http/src/test/scala/CubeTest.scala → ...scala/com/dslplatform/test/CubeTest.scala b/http/src/test/scala/CubeTest.scala → ...scala/com/dslplatform/test/CubeTest.scala
@@ -1,7 +1,9 @@
+package com.dslplatform.test
+
+import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
+import com.dslplatform.test.simple._
 import org.specs2._
 import org.specs2.specification.Step
-import com.dslplatform.test.simple._
-import com.dslplatform.api.patterns.{ServiceLocator, PersistableRepository}
 
 class CubeTest extends Specification with Common {
 
@@ -18,7 +20,7 @@ class CubeTest extends Specification with Common {
                                           ${Step(located.close())}
   """
 
-  private val located = new located {}
+  private val located = new Located
 
   private val name1 = rName
   private val name2 = rName

diff --git a/http/src/test/scala/DetailTest.scala → ...ala/com/dslplatform/test/DetailTest.scala b/http/src/test/scala/DetailTest.scala → ...ala/com/dslplatform/test/DetailTest.scala
@@ -1,11 +1,10 @@
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
+package com.dslplatform.test
+
+import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
 import com.dslplatform.test.detailtest._
-import com.dslplatform.api.patterns.{ServiceLocator, PersistableRepository}
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class DetailTest extends Specification with Common {
 
   def is = sequential ^ s2"""
@@ -16,7 +15,7 @@ class DetailTest extends Specification with Common {
                                       ${Step(located.close())}
   """
 
-  private val located = new located {}
+  private val located = new Located
 
   private val myNodeName = rString
   private val numOfLeafs = 27

diff --git a/...st/scala/DomainAndStandardProxyTest.scala → ...orm/test/DomainAndStandardProxyTest.scala b/...st/scala/DomainAndStandardProxyTest.scala → ...orm/test/DomainAndStandardProxyTest.scala
@@ -1,8 +1,9 @@
-import com.dslplatform.api.client.{ReportingProxy, DomainProxy, StandardProxy}
+package com.dslplatform.test
+
+import com.dslplatform.api.client.{DomainProxy, ReportingProxy, StandardProxy}
 import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
-import com.dslplatform.test.complex.{EmptyRoot, BaseRoot}
+import com.dslplatform.test.complex.{BaseRoot, EmptyRoot}
 import com.dslplatform.test.simple._
-
 import org.specs2._
 import org.specs2.specification.Step
 
@@ -46,7 +47,7 @@ class DomainAndStandardProxyTest extends Specification with Common {
                                                         ${Step(located.close())}
   """
 
-  val located = new located {}
+  val located = new Located
   val standardProxy = located.resolved[StandardProxy]
   val domainProxy = located.resolved[DomainProxy]
 

diff --git a/http/src/test/scala/EventSubmitTest.scala → ...om/dslplatform/test/EventSubmitTest.scala b/http/src/test/scala/EventSubmitTest.scala → ...om/dslplatform/test/EventSubmitTest.scala
@@ -1,11 +1,10 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.patterns.ServiceLocator
 import com.dslplatform.test.simple.TrivialEvent
 import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class EventSubmitTest extends Specification with Common {
 
   def is = s2"""
@@ -15,7 +14,7 @@ class EventSubmitTest extends Specification with Common {
                           ${Step(located.close())}
   """
 
-  val located = new located {}
+  val located = new Located
 
   def justInstantiate = {
     val sr = TrivialEvent()

diff --git a/...test/scala/GenericSearchBuilderTest.scala → ...tform/test/GenericSearchBuilderTest.scala b/...test/scala/GenericSearchBuilderTest.scala → ...tform/test/GenericSearchBuilderTest.scala
@@ -1,13 +1,11 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.client.GenericSearchBuilder
 import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
-
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
 import com.dslplatform.test.simple._
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class GenericSearchBuilderTest extends Specification with Common {
 
   def is = sequential ^ s2"""
@@ -17,7 +15,7 @@ class GenericSearchBuilderTest extends Specification with Common {
                                 ${Step(located.close())}
   """
 
-  private val located = new located {}
+  private val located = new Located
 
   private val numOfRoots = 27
   private val simpleRoots = for (i <- 1 to numOfRoots) yield SimpleRoot(rInt, rFloat, rName)

diff --git a/http/src/test/scala/located.scala → .../scala/com/dslplatform/test/Located.scala b/http/src/test/scala/located.scala → .../scala/com/dslplatform/test/Located.scala
@@ -1,28 +1,30 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.client.HttpClient
-import com.dslplatform.api.patterns.{PersistableRepository, AggregateRoot, ServiceLocator}
-import org.specs2.specification.{Scope, Outside}
-import scala.concurrent.{ExecutionContext, Await, Awaitable}
+import com.dslplatform.api.patterns.{AggregateRoot, PersistableRepository, ServiceLocator}
+import org.specs2.specification.{Outside, Scope}
+
 import scala.concurrent.duration._
+import scala.concurrent.{Await, Awaitable, ExecutionContext}
 import scala.reflect.runtime.universe.TypeTag
 
-trait Located {
+trait WithLocator {
   val locator = com.dslplatform.api.client.Bootstrap.init("/test-project.props")
 }
 
-trait located extends Outside[ServiceLocator] with Scope with Located with Close with Clean {
-
+class Located extends Outside[ServiceLocator] with Scope with WithLocator with Close with Clean {
   def outside: ServiceLocator = locator
 
   def resolved[D: TypeTag] = new Outside[D] {
     override def outside: D = locator.resolve[D]
   }
 }
 
-trait Close { this: Located =>
+trait Close { this: WithLocator =>
   def close() = locator.resolve[HttpClient].shutdown()
 }
 
-trait Clean  { this: Located =>
+trait Clean  { this: WithLocator =>
   def clean[T <: AggregateRoot: TypeTag] = {
     val repository = locator.resolve[PersistableRepository[T]]
     Await.result(repository.search().map(all => repository.delete(all))(locator.resolve[ExecutionContext]), Duration(10, SECONDS))
@@ -47,4 +49,4 @@ trait Common {
   def rInt(x: Int) = scala.util.Random.nextInt(x)
   def rFloat = scala.util.Random.nextFloat()
   def rDouble = scala.util.Random.nextDouble()
-}
+}
diff --git a/http/src/test/scala/ReportTest.scala → ...ala/com/dslplatform/test/ReportTest.scala b/http/src/test/scala/ReportTest.scala → ...ala/com/dslplatform/test/ReportTest.scala
@@ -1,11 +1,10 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.patterns.ServiceLocator
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
 import com.dslplatform.test.simple.R
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class ReportTest extends Specification with Common {
 
   def is = s2"""
@@ -14,7 +13,7 @@ class ReportTest extends Specification with Common {
                                           ${Step(located.close())}
   """
 
-  val located = new located {}
+  val located = new Located
 
   def populateResult = { locator: ServiceLocator =>
     val sr = R(i = 5)

diff --git a/http/src/test/scala/RootRepositoryTest.scala → ...dslplatform/test/RootRepositoryTest.scala b/http/src/test/scala/RootRepositoryTest.scala → ...dslplatform/test/RootRepositoryTest.scala
@@ -1,14 +1,13 @@
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
+package com.dslplatform.test
+
+import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
+import com.dslplatform.test.complex.{BaseRoot, EmptyRoot}
 import com.dslplatform.test.simple.SimpleRoot
-import com.dslplatform.api.patterns.{ServiceLocator, PersistableRepository}
-import com.dslplatform.test.complex.EmptyRoot
-import com.dslplatform.test.complex.BaseRoot
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class RootRepositoryTest extends Specification with Common {
+  val located = new Located
 
   def is = sequential ^ s2"""
     Simple root repository
@@ -21,8 +20,6 @@ class RootRepositoryTest extends Specification with Common {
                                           ${Step(located.close())}
   """
 
-  val located = new located {}
-
   def insert1 = { locator: ServiceLocator =>
     val sr = SimpleRoot(1, 2f, "3")
 
@@ -42,7 +39,7 @@ class RootRepositoryTest extends Specification with Common {
 
   def insert20 = { locator: ServiceLocator =>
     val numOfRoots = 20
-    val simpleRoots = for (i <- 1 to numOfRoots) yield SimpleRoot(i, i, i.toString)
+    val simpleRoots = for (i <- 1 to numOfRoots) yield SimpleRoot(i, i.toFloat, i.toString)
 
     locator.resolve[PersistableRepository[SimpleRoot]].insert(simpleRoots).map(_.size) must beEqualTo(numOfRoots).await
   }

diff --git a/http/src/test/scala/RootTest.scala → ...scala/com/dslplatform/test/RootTest.scala b/http/src/test/scala/RootTest.scala → ...scala/com/dslplatform/test/RootTest.scala
@@ -1,13 +1,11 @@
+package com.dslplatform.test
+
 import com.dslplatform.api.patterns.ServiceLocator
-import org.specs2._
-import org.junit.runner.RunWith
-import org.specs2.runner.JUnitRunner
+import com.dslplatform.test.complex.{BaseRoot, EmptyRoot}
 import com.dslplatform.test.simple.SimpleRoot
-import com.dslplatform.test.complex.BaseRoot
-import com.dslplatform.test.complex.EmptyRoot
+import org.specs2._
 import org.specs2.specification.Step
 
-@RunWith(classOf[JUnitRunner])
 class RootTest extends Specification with Common {
 
   def is = s2"""
@@ -22,7 +20,7 @@ class RootTest extends Specification with Common {
                                 ${Step(located.close())}
     """
 
-  val located = new located {}
+  val located = new Located
 
   def justInstantiate = {
     val sr = SimpleRoot(1, 2f, "3")