iss #33: [wip] Co2Report servlet tests 4 - fix parallel exec

maizy · Nov 29, 2016 · 8e4eba9 · 8e4eba9
1 parent 085f76f
commit 8e4eba9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ambient7-webapp/build.sbt b/ambient7-webapp/build.sbt
@@ -24,3 +24,5 @@ containerPort := 22480
   (test in Test).value
 }
 scalastyleFailOnError := true
+// TODO remove shared DB connection pool and turn on
+parallelExecution in Test := false
diff --git a/...nt7-webapp/src/test/resources/logback.xml → ...ebapp/src/test/resources/logback-test.xml b/...nt7-webapp/src/test/resources/logback.xml → ...ebapp/src/test/resources/logback-test.xml
diff --git a/ambient7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/BaseServletTest.scala b/ambient7-webapp/src/test/scala/ru/maizy/ambient7/webapp/tests/BaseServletTest.scala
@@ -7,7 +7,7 @@ package ru.maizy.ambient7.webapp.tests
 
 import com.typesafe.scalalogging.LazyLogging
 import org.flywaydb.core.Flyway
-import org.scalatest.{ FlatSpecLike, Matchers }
+import org.scalatest.{ BeforeAndAfterAll, FlatSpecLike, Matchers }
 import org.scalatra.test.scalatest.ScalatraSuite
 import scalikejdbc.ConnectionPool
 import ru.maizy.ambient7.webapp.AppConfig
@@ -49,16 +49,12 @@ abstract class BaseServletTest
   with FlatSpecLike
   with Matchers
   with LazyLogging
+  with BeforeAndAfterAll
 {
   val bootstrap = new TestsBootstrap {}
 
-  protected override def afterAll(): Unit = {
-    super.afterAll()
-    bootstrap.destroyWebApp()
-  }
-
-
   protected override def beforeAll(): Unit = {
+    logger.info("before all")
     super.beforeAll()
     bootstrap.loadTestConfig()
     setupConfig(bootstrap.appConfig)
@@ -67,6 +63,12 @@ abstract class BaseServletTest
     initServlets(bootstrap.appConfig)
   }
 
+  protected override def afterAll(): Unit = {
+    logger.info("after all")
+    bootstrap.destroyWebApp()
+    super.afterAll()
+  }
+
   private[tests] def setupBootstrapBeforeTests(): Unit = {}
 
   def setupConfig(config: AppConfig): Unit = {}