Merge branch 'master' into renovate/com.willowtreeapps.assertk-assert…

…k-0.x

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ testcontainers = "1.19.7"
 
 [libraries]
 amazonCorretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:2.3.3"
-androidx-activity = "androidx.activity:activity-ktx:1.8.2"
+androidx-activity = "androidx.activity:activity-ktx:1.9.0"
 androidx-annotation = "androidx.annotation:annotation:1.7.1"
 androidx-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
 androidx-junit = "androidx.test.ext:junit:1.1.5"

okhttp/src/test/java/okhttp3/FakeRoutePlanner.kt

@@ -24,13 +24,9 @@ import okhttp3.internal.connection.RoutePlanner
 import okhttp3.internal.connection.RoutePlanner.ConnectResult
 
 class FakeRoutePlanner(
-  private val taskFaker: TaskFaker,
+  val factory: TestValueFactory = TestValueFactory(),
+  val taskFaker: TaskFaker = factory.taskFaker,
 ) : RoutePlanner, Closeable {
-  /**
-   * Note that we don't use the same [TaskFaker] for this factory. That way off-topic tasks like
-   * connection pool maintenance tasks don't add noise to route planning tests.
-   */
-  val factory = TestValueFactory()
   val pool = factory.newConnectionPool(routePlanner = this)
   val events = LinkedBlockingDeque<String>()
   var canceled = false

okhttp/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.kt

@@ -27,7 +27,6 @@ import okhttp3.FakeRoutePlanner
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.TestUtil.awaitGarbageCollection
-import okhttp3.TestValueFactory
 import okhttp3.internal.concurrent.TaskRunner
 import okhttp3.internal.connection.Locks.withLock
 import okhttp3.internal.http2.Http2
@@ -39,7 +38,9 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Test
 
 class ConnectionPoolTest {
-  private val factory = TestValueFactory()
+  private val routePlanner = FakeRoutePlanner()
+  private val factory = routePlanner.factory
+  private val taskFaker = routePlanner.taskFaker
   private val peer = MockHttp2Peer()
 
   /** The fake task runner prevents the cleanup runnable from being started.  */
@@ -50,8 +51,6 @@ class ConnectionPoolTest {
   private val addressC = factory.newAddress("c")
   private val routeC1 = factory.newRoute(addressC)
 
-  private val routePlanner = FakeRoutePlanner(factory.taskFaker)
-
   @AfterEach fun tearDown() {
     factory.close()
     peer.close()
@@ -205,7 +204,8 @@ class ConnectionPoolTest {
   }
 
   @Test fun connectionPreWarmingHttp1() {
-    val expireTime = factory.taskFaker.nanoTime + 1_000_000_000_000
+    taskFaker.advanceUntil(System.nanoTime())
+    val expireTime = taskFaker.nanoTime + 1_000_000_000_000
 
     routePlanner.autoGeneratePlans = true
     routePlanner.defaultConnectionIdleAtNanos = expireTime
@@ -219,19 +219,20 @@ class ConnectionPoolTest {
     // Connections are replaced if they idle out or are evicted from the pool
     evictAllConnections(pool)
     assertThat(pool.connectionCount()).isEqualTo(2)
-    forceConnectionsToExpire(pool, routePlanner, expireTime)
+    forceConnectionsToExpire(pool, expireTime)
     assertThat(pool.connectionCount()).isEqualTo(2)
 
     // Excess connections aren't removed until they idle out, even if no longer needed
     setPolicy(pool, address, ConnectionPool.AddressPolicy(1))
     assertThat(pool.connectionCount()).isEqualTo(2)
-    forceConnectionsToExpire(pool, routePlanner, expireTime)
+    forceConnectionsToExpire(pool, expireTime)
     assertThat(pool.connectionCount()).isEqualTo(1)
   }
 
   @Test fun connectionPreWarmingHttp2() {
-    val expireSooner = factory.taskFaker.nanoTime + 1_000_000_000_000
-    val expireLater = factory.taskFaker.nanoTime + 2_000_000_000_000
+    taskFaker.advanceUntil(System.nanoTime())
+    val expireSooner = taskFaker.nanoTime + 1_000_000_000_000
+    val expireLater = taskFaker.nanoTime + 2_000_000_000_000
 
     routePlanner.autoGeneratePlans = true
     val address = routePlanner.address
@@ -258,7 +259,7 @@ class ConnectionPoolTest {
 
     // Increase the connection's max so that the new connection is no longer needed
     updateMaxConcurrentStreams(http2Connection, 5)
-    forceConnectionsToExpire(pool, routePlanner, expireSooner)
+    forceConnectionsToExpire(pool, expireSooner)
     assertThat(pool.connectionCount()).isEqualTo(1)
   }
 
@@ -268,23 +269,22 @@ class ConnectionPoolTest {
     policy: ConnectionPool.AddressPolicy,
   ) {
     pool.setPolicy(address, policy)
-    routePlanner.factory.taskFaker.runTasks()
+    taskFaker.runTasks()
   }
 
   private fun evictAllConnections(pool: RealConnectionPool) {
     pool.evictAll()
     assertThat(pool.connectionCount()).isEqualTo(0)
-    routePlanner.factory.taskFaker.runTasks()
+    taskFaker.runTasks()
   }
 
   private fun forceConnectionsToExpire(
     pool: RealConnectionPool,
-    routePlanner: FakeRoutePlanner,
     expireTime: Long,
   ) {
     val idleTimeNanos = expireTime + pool.keepAliveDurationNs
     repeat(pool.connectionCount()) { pool.closeConnections(idleTimeNanos) }
-    routePlanner.factory.taskFaker.runTasks()
+    taskFaker.runTasks()
   }
 
   private fun connectHttp2(
@@ -316,7 +316,7 @@ class ConnectionPoolTest {
     assertThat(ackFrame.streamId).isEqualTo(0)
     assertThat(ackFrame.ack).isTrue()
 
-    routePlanner.factory.taskFaker.runTasks()
+    taskFaker.runTasks()
 
     return connection
   }
@@ -329,7 +329,7 @@ class ConnectionPoolTest {
     settings[Settings.MAX_CONCURRENT_STREAMS] = amount
     connection.readerRunnable.applyAndAckSettings(true, settings)
     assertThat(connection.peerSettings[Settings.MAX_CONCURRENT_STREAMS]).isEqualTo(amount)
-    routePlanner.factory.taskFaker.runTasks()
+    taskFaker.runTasks()
   }
 
   /** Use a helper method so there's no hidden reference remaining on the stack.  */

okhttp/src/test/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt

@@ -41,7 +41,12 @@ import org.junit.jupiter.api.Test
 internal class FastFallbackExchangeFinderTest {
   private val taskFaker = TaskFaker()
   private val taskRunner = taskFaker.taskRunner
-  private val routePlanner = FakeRoutePlanner(taskFaker)
+
+  /**
+   * Note that we don't use the same [TaskFaker] for this factory. That way off-topic tasks like
+   * connection pool maintenance tasks don't add noise to route planning tests.
+   */
+  private val routePlanner = FakeRoutePlanner(taskFaker = taskFaker)
   private val finder = FastFallbackExchangeFinder(routePlanner, taskRunner)
 
   @AfterEach