fix: Fixed a bug in the timing of calling the handler.

Author: j5ik2o

docker-controller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerControllerHelper.scala

@@ -36,12 +36,14 @@ trait DockerControllerHelper {
   ): Unit = {
     logger.debug(s"createDockerContainer --- $testName")
     dockerController.pullImageIfNotExists()
+    beforeDockerContainerCreate(dockerController, testName)
     dockerController.createContainer()
     afterDockerContainerCreated(dockerController, testName)
   }
 
   protected def startDockerContainer(dockerController: DockerController, testName: Option[String]): Unit = {
     logger.debug(s"startDockerContainer --- $testName")
+    beforeDocketContainerStart(dockerController, testName)
     dockerController.startContainer()
     val waitPredicateOpt = waitPredicatesSettings.get(dockerController)
     waitPredicateOpt.foreach { waitPredicate =>
@@ -52,33 +54,51 @@ trait DockerControllerHelper {
 
   protected def stopDockerContainer(dockerController: DockerController, testName: Option[String]): Unit = {
     logger.debug(s"stopDockerContainer --- $testName")
-    beforeDockerContainerStopped(dockerController, testName)
+    beforeDockerContainerStop(dockerController, testName)
     dockerController.stopContainer()
+    afterDockerContainerStopped(dockerController, testName)
   }
 
   protected def removeDockerContainer(
       dockerController: DockerController,
       testName: Option[String]
   ): Unit = {
     logger.debug(s"removeDockerContainer --- $testName")
-    beforeDockerContainerRemoved(dockerController, testName)
+    beforeDockerContainerRemove(dockerController, testName)
     dockerController.removeContainer()
+    afterDockerContainerRemoved(dockerController, testName)
+  }
+
+  protected def beforeDockerContainerCreate(dockerController: DockerController, testName: Option[String]): Unit = {
+    logger.debug(s"beforeDockerContainerCreate --- $testName")
   }
 
   protected def afterDockerContainerCreated(dockerController: DockerController, testName: Option[String]): Unit = {
     logger.debug(s"afterDockerContainerCreated --- $testName")
   }
 
-  protected def beforeDockerContainerRemoved(dockerController: DockerController, testName: Option[String]): Unit = {
-    logger.debug(s"beforeDockerContainerRemoved --- $testName")
+  protected def beforeDockerContainerRemove(dockerController: DockerController, testName: Option[String]): Unit = {
+    logger.debug(s"beforeDockerContainerRemove --- $testName")
+  }
+
+  protected def afterDockerContainerRemoved(dockerController: DockerController, testName: Option[String]): Unit = {
+    logger.debug(s"afterDockerContainerRemoved --- $testName")
+  }
+
+  protected def beforeDocketContainerStart(dockerController: DockerController, testName: Option[String]): Unit = {
+    logger.debug(s"beforeDocketContainerStart --- $testName")
   }
 
   protected def afterDocketContainerStarted(dockerController: DockerController, testName: Option[String]): Unit = {
     logger.debug(s"afterDocketContainerStarted --- $testName")
   }
 
-  protected def beforeDockerContainerStopped(dockerController: DockerController, testName: Option[String]): Unit = {
+  protected def beforeDockerContainerStop(dockerController: DockerController, testName: Option[String]): Unit = {
     logger.debug(s"beforeDockerContainerStopped --- $testName")
   }
 
+  protected def afterDockerContainerStopped(dockerController: DockerController, testName: Option[String]): Unit = {
+    logger.debug(s"afterDockerContainerStopped --- $testName")
+  }
+
 }

docker-controller-scala-scalatest/src/main/scala/com/github/j5ik2o/dockerController/DockerControllerSpecSupport.scala

@@ -15,9 +15,11 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
       testName: Option[String]
   ): Boolean = {
     if (this.createRemoveLifecycle == createRemoveLifecycle) {
+      beforeCreateContainers()
       for (dockerController <- dockerControllers) {
         createDockerContainer(dockerController, testName)
       }
+      afterCreateContainers()
       true
     } else false
   }
@@ -27,9 +29,11 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
       testName: Option[String]
   ): Boolean = {
     if (this.startStopLifecycle == startStopLifecycle) {
+      beforeStartContainers()
       for (dockerController <- dockerControllers) {
         startDockerContainer(dockerController, testName)
       }
+      afterStartContainers()
       true
     } else false
   }
@@ -39,9 +43,11 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
       testName: Option[String]
   ): Boolean = {
     if (this.startStopLifecycle == startStopLifecycle) {
+      beforeStopContainers()
       for (dockerController <- dockerControllers) {
         stopDockerContainer(dockerController, testName)
       }
+      afterStopContainers()
       true
     } else false
   }
@@ -51,17 +57,23 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
       testName: Option[String]
   ): Boolean = {
     if (this.createRemoveLifecycle == createRemoveLifecycle) {
+      beforeRemoveContainers()
       for (dockerController <- dockerControllers) {
         removeDockerContainer(dockerController, testName)
       }
+      afterRemoveContainers()
       true
     } else false
   }
 
   protected def beforeCreateContainers(): Unit = {}
-  protected def afterRemoveContainers(): Unit = {}
+  protected def afterCreateContainers(): Unit = {}
+  protected def beforeStartContainers(): Unit = {}
   protected def afterStartContainers(): Unit = {}
   protected def beforeStopContainers(): Unit = {}
+  protected def afterStopContainers(): Unit = {}
+  protected def beforeRemoveContainers(): Unit = {}
+  protected def afterRemoveContainers(): Unit = {}
 
   abstract override def run(testName: Option[String], args: Args): Status = {
     (createRemoveLifecycle, startStopLifecycle) match {
@@ -75,13 +87,9 @@ trait DockerControllerSpecSupport extends SuiteMixin with DockerControllerHelper
       var created = false
       var started = false
       try {
-        beforeCreateContainers()
         created = createDockerContainers(DockerContainerCreateRemoveLifecycle.ForAllTest, testName)
         started = startDockerContainers(DockerContainerStartStopLifecycle.ForAllTest, testName)
-        afterStartContainers()
-        val result = super.run(testName, args)
-        beforeStopContainers()
-        result
+        super.run(testName, args)
       } finally {
         try {
           if (started)