Make a defensive copy in InMemoryFileSystem (#8061)

square · Oct 17, 2023 · b76e210 · b76e210
1 parent a64a116
commit b76e210
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/okhttp-testing-support/src/main/kotlin/okhttp3/internal/io/InMemoryFileSystem.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/io/InMemoryFileSystem.kt
@@ -35,6 +35,9 @@ class InMemoryFileSystem : FileSystem, TestRule {
   private val openSources = IdentityHashMap<Source, File>()
   private val openSinks = IdentityHashMap<Sink, File>()
 
+  val allPaths: Set<File>
+    get() = files.keys.toSet()
+
   override fun apply(base: Statement, description: Description): Statement {
     return object : Statement() {
       override fun evaluate() {
@@ -119,7 +122,4 @@ class InMemoryFileSystem : FileSystem, TestRule {
   }
 
   override fun toString() = "InMemoryFileSystem"
-  fun allPaths(): MutableSet<File> {
-    return files.keys
-  }
 }
diff --git a/okhttp/src/test/java/okhttp3/CacheTest.java b/okhttp/src/test/java/okhttp3/CacheTest.java
@@ -317,7 +317,7 @@ private void testResponseCaching(TransferKind transferKind) throws IOException {
     Response response1 = client.newCall(request).execute();
     assertThat(response1.body().string()).isEqualTo("ABC");
 
-    File cacheEntry = fileSystem.allPaths().stream()
+    File cacheEntry = fileSystem.getAllPaths().stream()
             .filter((e) -> e.getName().endsWith(".0"))
             .findFirst()
             .orElseThrow(Exception::new);