Changed deprecations

Author: sksamuel

src/main/kotlin/io/kotest/extensions/testcontainers/Extensions.kt

@@ -3,30 +3,30 @@ package io.kotest.extensions.testcontainers
 import io.kotest.core.TestConfiguration
 import org.testcontainers.lifecycle.Startable
 
-@Deprecated("use ContainerExtension")
-fun <T : Startable> T.perTest(): StartablePerTestListener<T> = StartablePerTestListener<T>(this)
+fun <T : Startable> T.perTest(): StartablePerTestListener<T> = StartablePerTestListener(this)
 
-@Deprecated("use ContainerExtension")
-fun <T : Startable> T.perSpec(): StartablePerSpecListener<T> = StartablePerSpecListener<T>(this)
+fun <T : Startable> T.perSpec(): StartablePerSpecListener<T> = StartablePerSpecListener(this)
 
-@Deprecated("use ContainerExtension")
+fun <T : Startable> T.perProject(): StartablePerProjectListener<T> = StartablePerProjectListener(this)
+
+@Deprecated("use perProject()")
 fun <T : Startable> T.perProject(containerName: String): StartablePerProjectListener<T> =
-   StartablePerProjectListener<T>(this, containerName)
+   StartablePerProjectListener<T>(this)
 
-@Deprecated("use ContainerExtension")
+@Deprecated("use perTest")
 fun <T : Startable> TestConfiguration.configurePerTest(startable: T): T {
    listener(StartablePerTestListener(startable))
    return startable
 }
 
-@Deprecated("use ContainerExtension")
+@Deprecated("use perSpec")
 fun <T : Startable> TestConfiguration.configurePerSpec(startable: T): T {
    listener(StartablePerSpecListener(startable))
    return startable
 }
 
-@Deprecated("use ContainerExtension")
+@Deprecated("use perProject")
 fun <T : Startable> TestConfiguration.configurePerProject(startable: T, containerName: String): T {
-   listener(StartablePerProjectListener(startable, containerName))
+   listener(StartablePerProjectListener(startable))
    return startable
 }

src/main/kotlin/io/kotest/extensions/testcontainers/StartablePerProjectListener.kt

@@ -19,9 +19,11 @@ import org.testcontainers.lifecycle.Startable
  * @see
  * [StartablePerTestListener]
  * */
-@Deprecated("use ContainerExtension")
-class StartablePerProjectListener<T : Startable>(val startable: T, val containerName: String) : TestListener, ProjectListener {
-   override val name = containerName
+class StartablePerProjectListener<T : Startable>(private val startable: T) : TestListener, ProjectListener {
+
+   @Deprecated("The containerName arg is no longer used")
+   constructor(startable: T, containerName: String) : this(startable)
+
    private val testLifecycleAwareListener = TestLifecycleAwareListener(startable)
 
    override suspend fun beforeProject() {

src/main/kotlin/io/kotest/extensions/testcontainers/StartablePerSpecListener.kt

@@ -22,8 +22,7 @@ import org.testcontainers.lifecycle.TestLifecycleAware
  * @see
  * [StartablePerTestListener]
  * */
-@Deprecated("use ContainerExtension")
-class StartablePerSpecListener<T : Startable>(val startable: T) : TestListener {
+class StartablePerSpecListener<T : Startable>(private val startable: T) : TestListener {
    private val testLifecycleAwareListener = TestLifecycleAwareListener(startable)
 
    override suspend fun beforeSpec(spec: Spec) {

src/main/kotlin/io/kotest/extensions/testcontainers/StartablePerTestListener.kt

@@ -19,8 +19,8 @@ import org.testcontainers.lifecycle.TestLifecycleAware
  *
  * @see[StartablePerSpecListener]
  * */
-@Deprecated("use ContainerExtension")
-class StartablePerTestListener<T : Startable>(val startable: T) : TestListener {
+class StartablePerTestListener<T : Startable>(private val startable: T) : TestListener {
+
    private val testLifecycleAwareListener = TestLifecycleAwareListener(startable)
 
    override suspend fun beforeTest(testCase: TestCase) {

src/main/kotlin/io/kotest/extensions/testcontainers/TestLifecycleAwareListener.kt

@@ -9,7 +9,6 @@ import org.testcontainers.lifecycle.TestLifecycleAware
 import java.net.URLEncoder
 import java.util.Optional
 
-@Deprecated("use ContainerExtension")
 class TestLifecycleAwareListener(startable: Startable) : TestListener {
    private val testLifecycleAware = startable as? TestLifecycleAware
 
@@ -22,7 +21,6 @@ class TestLifecycleAwareListener(startable: Startable) : TestListener {
    }
 }
 
-@Deprecated("use ContainerExtension")
 internal fun TestCase.toTestDescription() = object : TestDescription {
 
    override fun getFilesystemFriendlyName(): String {