Merge pull request #111 from delphi-hub/bugfix/actorSystem

Trying to fix race condition for CI tests

Author: 24santoshr

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerConnection.scala

@@ -20,14 +20,14 @@ import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.Uri.{Path, Query}
 import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
 import akka.stream.Materializer
-import de.upb.cs.swt.delphi.instanceregistry.Configuration
+import de.upb.cs.swt.delphi.instanceregistry.{Configuration, Registry}
 
 import scala.concurrent.Future
 
 object DockerConnection {
 
 
-  def fromEnvironment(configuration: Configuration) (implicit system: ActorSystem, mat: Materializer): DockerConnection = {
+  def fromEnvironment(configuration: Configuration): DockerConnection = {
     DockerHttpConnection(configuration.dockerUri)
   }
 }
@@ -48,10 +48,11 @@ trait DockerConnection {
 
 }
 
-case class DockerHttpConnection(
-                                 baseUri: Uri,
-                               )(implicit val system: ActorSystem, val materializer: Materializer)
+case class DockerHttpConnection(baseUri: Uri)
   extends DockerConnection {
+  override def system: ActorSystem = Registry.system
+  override implicit def materializer: Materializer = Registry.materializer
+
   override def sendRequest(request: HttpRequest): Future[HttpResponse] = {
     Http(system).singleRequest(request)
   }

src/test/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandlerTest.scala

@@ -28,9 +28,6 @@ import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers}
 
 class RequestHandlerTest extends FlatSpec with Matchers with BeforeAndAfterEach {
 
-  implicit val system : ActorSystem = ActorSystem("test_system")
-  implicit val materializer : ActorMaterializer = ActorMaterializer()
-
   val configuration: Configuration = new Configuration()
   val dao: InstanceDAO = new DynamicInstanceDAO(configuration)
   val authDAO: AuthDAO = new DynamicAuthDAO(configuration)

src/test/scala/de/upb/cs/swt/delphi/instanceregistry/connection/ServerTest.scala

@@ -74,8 +74,6 @@ class ServerTest
     */
   override def afterAll(): Unit = {
     requestHandler.shutdown()
-    Await.ready(Registry.system.terminate(), Duration.Inf)
-    Await.ready(system.terminate(), Duration.Inf)
   }
 
   "The Server" should {