Reuse test server port (#57)

* Reuse test server port

* Fix tests

Author: zhxnlai

samples/guides/src/main/kotlin/app/cash/tempest/guides/DataModeling.kt

@@ -34,4 +34,4 @@ class DataModeling(private val db: MusicDb) {
     val mapper = DynamoDBMapper(client, mapperConfig)
     val db: MusicDb = LogicalDb(mapper)
   }
-}
+}

samples/guides2/src/main/kotlin/app/cash/tempest2/guides/AsynchronousProgramming.kt

@@ -32,4 +32,4 @@ class AsynchronousProgramming(
       .expressionValues(mapOf(":playlist_version" to AttributeValue.builder().n("$playlist_version").build()))
       .build()
   }
-}
+}

samples/guides2/src/main/kotlin/app/cash/tempest2/guides/DataModeling.kt

@@ -29,4 +29,4 @@ class DataModeling(private val db: MusicDb) {
       .build()
     val db: MusicDb = LogicalDb(enhancedClient)
   }
-}
+}

samples/guides2/src/main/kotlin/app/cash/tempest2/guides/QueryNScan.kt

@@ -86,7 +86,9 @@ class QueryNScan(
       .expression("run_length > :duration")
       .expressionValues(
         mapOf(
-          ":duration" to AttributeValue.builder().s(duration.toString()).build()))
+          ":duration" to AttributeValue.builder().s(duration.toString()).build()
+        )
+      )
       .build()
   }
 

settings.gradle.kts

@@ -19,7 +19,8 @@ include(":samples:guides-junit5")
 include(":samples:guides2")
 include(":samples:guides2-junit4")
 include(":samples:guides2-junit5")
-include(":samples:javarecord")
+// Don't enable this module, which depends on Java 14.
+// include(":samples:javarecord")
 include(":samples:musiclibrary")
 include(":samples:musiclibrary2")
 include(":samples:musiclibrary-testing")

tempest-testing-junit4/src/main/kotlin/app/cash/tempest/testing/TestDynamoDb.kt

@@ -79,7 +79,7 @@ class TestDynamoDb private constructor(
     }
 
     fun build(): TestDynamoDb {
-      val port = port ?: pickRandomPort()
+      val port = port ?: defaultPort(serverFactory.toString())
       return TestDynamoDb(
         DefaultTestDynamoDbClient(tables, port),
         serverFactory.create(port)
@@ -88,6 +88,12 @@ class TestDynamoDb private constructor(
   }
 
   companion object {
+    private val defaultPorts = ConcurrentHashMap<String, Int>()
+    fun defaultPort(key: String): Int {
+      // Only pick random port once to share one test server with multiple tests.
+      return defaultPorts.getOrPut(key, ::pickRandomPort)
+    }
+
     private val runningServers = ConcurrentHashMap.newKeySet<String>()
     private val log = getLogger<TestDynamoDb>()
   }

tempest-testing-junit5/src/main/kotlin/app/cash/tempest/testing/TestDynamoDb.kt

@@ -81,7 +81,7 @@ class TestDynamoDb private constructor(
     }
 
     fun build(): TestDynamoDb {
-      val port = port ?: pickRandomPort()
+      val port = port ?: defaultPort(serverFactory.toString())
       return TestDynamoDb(
         DefaultTestDynamoDbClient(tables, port),
         serverFactory.create(port)
@@ -90,6 +90,12 @@ class TestDynamoDb private constructor(
   }
 
   companion object {
+    private val defaultPorts = ConcurrentHashMap<String, Int>()
+    fun defaultPort(key: String): Int {
+      // Only pick random port once to share one test server with multiple tests.
+      return defaultPorts.getOrPut(key, ::pickRandomPort)
+    }
+
     private val runningServers = ConcurrentHashMap.newKeySet<String>()
     private val log = getLogger<TestDynamoDb>()
   }

tempest2-testing-junit4/src/main/kotlin/app/cash/tempest2/testing/TestDynamoDb.kt

@@ -79,7 +79,7 @@ class TestDynamoDb private constructor(
     }
 
     fun build(): TestDynamoDb {
-      val port = port ?: pickRandomPort()
+      val port = port ?: defaultPort(serverFactory.toString())
       return TestDynamoDb(
         DefaultTestDynamoDbClient(tables, port),
         serverFactory.create(port)
@@ -88,6 +88,12 @@ class TestDynamoDb private constructor(
   }
 
   companion object {
+    private val defaultPorts = ConcurrentHashMap<String, Int>()
+    fun defaultPort(key: String): Int {
+      // Only pick random port once to share one test server with multiple tests.
+      return defaultPorts.getOrPut(key, ::pickRandomPort)
+    }
+
     private val runningServers = ConcurrentHashMap.newKeySet<String>()
     private val log = getLogger<TestDynamoDb>()
   }

tempest2-testing-junit5/src/main/kotlin/app/cash/tempest2/testing/TestDynamoDb.kt

@@ -81,7 +81,7 @@ class TestDynamoDb private constructor(
     }
 
     fun build(): TestDynamoDb {
-      val port = port ?: pickRandomPort()
+      val port = port ?: defaultPort(serverFactory.toString())
       return TestDynamoDb(
         DefaultTestDynamoDbClient(tables, port),
         serverFactory.create(port)
@@ -90,6 +90,12 @@ class TestDynamoDb private constructor(
   }
 
   companion object {
+    private val defaultPorts = ConcurrentHashMap<String, Int>()
+    fun defaultPort(key: String): Int {
+      // Only pick random port once to share one test server with multiple tests.
+      return defaultPorts.getOrPut(key, ::pickRandomPort)
+    }
+
     private val runningServers = ConcurrentHashMap.newKeySet<String>()
     private val log = getLogger<TestDynamoDb>()
   }

tempest2/src/main/kotlin/app/cash/tempest2/internal/DynamoDbLogicalDb.kt

@@ -150,8 +150,9 @@ internal class DynamoDbLogicalDb(
       val writeRequest = toTransactionWriteRequest(writeSet)
       return dynamoDbEnhancedClient.transactWriteItems(writeRequest)
         .exceptionally { e ->
-          if (e is TransactionCanceledException) {
-            toTransactionWriteException(writeSet, e) as Void
+          // `e` is a java.util.concurrent.CancellationException.
+          if (e.cause is TransactionCanceledException) {
+            toTransactionWriteException(writeSet, e.cause as TransactionCanceledException) as Void
           } else {
             throw e
           }