From fb90899eebb7f6adca48e50a6f7bf16f3495bf44 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 5 Sep 2025 13:06:13 +0200
Subject: [PATCH] ZipTest - add case "multiple dirs with same empty prefix"

GitOrigin-RevId: e2e7030557f2b85df26e80f510057898bd4d0e68
---
 .../org/jetbrains/intellij/build/ZipTest.kt   | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/ZipTest.kt b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/ZipTest.kt
index 3915605a36fd..c60bfa298dc2 100644
--- a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/ZipTest.kt
+++ b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/ZipTest.kt
@@ -38,6 +38,7 @@ import java.util.zip.CRC32
 import java.util.zip.Deflater
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
+import kotlin.io.path.name
 import kotlin.random.Random
 
 class ZipTest {
@@ -203,30 +204,47 @@ class ZipTest {
   @Test
   fun `small file`(@TempDir tempDir: Path) {
     val dir = tempDir.resolve("dir")
-    val file = dir.resolve("samples/nested_dir/__init__.py")
-    Files.createDirectories(file.parent)
-    val data = "\n"
-    Files.writeString(file, data)
+    val data = createTestFileInDir(dir)
 
     val archiveFile = tempDir.resolve("archive.zip")
     zipWithCompression(archiveFile, mapOf(dir to ""))
 
+    val name = "samples-dir/nested_dir-dir/__init__.py"
 
     java.util.zip.ZipFile(archiveFile.toFile()).use { jdkZipFile ->
-      val entry = jdkZipFile.getEntry("samples/nested_dir/__init__.py")
+      val entry = jdkZipFile.getEntry(name)
       assertThat(entry).isNotNull()
       val crc = CRC32().also { it.update(data.toByteArray()) }.value
       assertThat(entry.crc).isEqualTo(crc)
     }
 
     HashMapZipFile.load(archiveFile).use { zipFile ->
-      val entry = zipFile.getRawEntry("samples/nested_dir/__init__.py")
+      val entry = zipFile.getRawEntry(name)
       assertThat(entry).isNotNull()
       assertThat(entry!!.isCompressed).isFalse()
       assertThat(entry.getData(zipFile).decodeToString()).isEqualTo(data)
     }
   }
 
+  @Test
+  fun `multiple dirs with same empty prefix`(@TempDir tempDir: Path) {
+    val dir1 = tempDir.resolve("dir1")
+    val dir2 = tempDir.resolve("dir2")
+
+    createTestFileInDir(dir1)
+    createTestFileInDir(dir2)
+
+    val archiveFile = tempDir.resolve("archive.zip")
+    zipWithCompression(archiveFile, mapOf(dir1 to "", dir2 to ""))
+
+    HashMapZipFile.load(archiveFile).use { zipFile ->
+      assertThat(zipFile.entries.map { it.name }).containsExactlyInAnyOrder(
+        "samples-dir1/nested_dir-dir1/__init__.py",
+        "samples-dir2/nested_dir-dir2/__init__.py"
+      )
+    }
+  }
+
   @Test
   fun undeclared(@TempDir tempDir: Path) {
     val archiveFile = tempDir.resolve("archive.zip")
@@ -623,6 +641,14 @@ class ZipTest {
   }
 }
 
+private fun createTestFileInDir(dir: Path): String {
+  val file = dir.resolve("samples-${dir.name}/nested_dir-${dir.name}/__init__.py")
+  Files.createDirectories(file.parent)
+  val data = "\n"
+  Files.writeString(file, data)
+  return data
+}
+
 // check both IKV- and non-IKV variants of an immutable zip file
 internal fun checkZip(file: Path, checker: (ZipFile) -> Unit) {
   readZipFile(file) { name, dataProvider ->