Add more cases

Author: Goooler

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/RelocatorRemapperTest.kt

@@ -18,6 +18,12 @@ import org.gradle.api.file.FileCopyDetails
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 
+/**
+ * The cases reflect the cases in
+ * [com.github.jengelman.gradle.plugins.shadow.relocation.RelocatorsTest], but operate on the
+ * bytecode level to verify that the remapper correctly transforms class names in all relevant
+ * bytecode structures.
+ */
 class RelocatorRemapperTest {
   @TempDir lateinit var tempDir: Path
 
@@ -102,6 +108,51 @@ class RelocatorRemapperTest {
       .contains($$"Lcom/example/relocated/RelocatorRemapperTest$FixtureAnnotation;")
   }
 
+  @Test
+  fun remapArrayFieldDescriptorIsRelocated() {
+    val details = FixtureSubject::class.toFileCopyDetails()
+
+    val result = details.remapClass(relocators)
+
+    val classModel = ClassFile.of().parse(result)
+    val fieldDescriptors = classModel.fields().map { it.fieldType().stringValue() }
+    assertThat(fieldDescriptors).contains("[L$relocatedFixtureBase;")
+  }
+
+  @Test
+  fun remapArray2dFieldDescriptorIsRelocated() {
+    val details = FixtureSubject::class.toFileCopyDetails()
+
+    val result = details.remapClass(relocators)
+
+    val classModel = ClassFile.of().parse(result)
+    val fieldDescriptors = classModel.fields().map { it.fieldType().stringValue() }
+    assertThat(fieldDescriptors).contains("[[L$relocatedFixtureBase;")
+  }
+
+  @Test
+  fun remapMethodMultipleArgsIsRelocated() {
+    val details = FixtureSubject::class.toFileCopyDetails()
+
+    val result = details.remapClass(relocators)
+
+    val classModel = ClassFile.of().parse(result)
+    val methodDescriptors = classModel.methods().map { it.methodType().stringValue() }
+    assertThat(methodDescriptors)
+      .contains("(L$relocatedFixtureBase;L$relocatedFixtureBase;)L$relocatedFixtureBase;")
+  }
+
+  @Test
+  fun remapMethodPrimitivePlusClassIsRelocated() {
+    val details = FixtureSubject::class.toFileCopyDetails()
+
+    val result = details.remapClass(relocators)
+
+    val classModel = ClassFile.of().parse(result)
+    val methodDescriptors = classModel.methods().map { it.methodType().stringValue() }
+    assertThat(methodDescriptors).contains("(BL$relocatedFixtureBase;)L$relocatedFixtureBase;")
+  }
+
   @Test
   fun remapBaseClassNameIsRelocated() {
     // Verify relocation also works on a simple class (FixtureBase has no fields/methods
@@ -144,7 +195,13 @@ class RelocatorRemapperTest {
   @FixtureAnnotation
   class FixtureSubject : FixtureBase() {
     val field: FixtureBase = FixtureBase()
+    val arrayField: Array<FixtureBase> = emptyArray()
+    val array2dField: Array<Array<FixtureBase>> = emptyArray()
 
     fun method(arg: FixtureBase): FixtureBase = arg
+
+    fun methodMultiArgs(a: FixtureBase, b: FixtureBase): FixtureBase = a
+
+    fun methodWithPrimitivePlusClass(b: Byte, arg: FixtureBase): FixtureBase = arg
   }
 }