Cleanups

Author: Goooler

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

@@ -39,9 +39,12 @@ class RelocatorRemapperTest {
   // Internal name of the relocated FixtureBase for use in assertions.
   private val relocatedFixtureBase = $$"com/example/relocated/RelocatorRemapperTest$FixtureBase"
 
+  private val fixtureSubjectDetails
+    get() = FixtureSubject::class.toFileCopyDetails()
+
   @Test
   fun remapClassNotModified() {
-    val details = FixtureSubject::class.toFileCopyDetails()
+    val details = fixtureSubjectDetails
     // Relocator pattern does not match – original bytes must be returned as-is.
     val noMatchRelocators = setOf(SimpleRelocator("org.unrelated", "org.other"))
 
@@ -52,9 +55,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapClassNameIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     assertThat(classModel.thisClass().asInternalName())
@@ -63,19 +64,15 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapSuperclassIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     assertThat(classModel.superclass().get().asInternalName()).isEqualTo(relocatedFixtureBase)
   }
 
   @Test
   fun remapFieldDescriptorIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val fieldDescriptors = classModel.fields().map { it.fieldType().stringValue() }
@@ -84,9 +81,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapMethodDescriptorIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val methodDescriptors = classModel.methods().map { it.methodType().stringValue() }
@@ -95,9 +90,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapAnnotationIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val annotationsAttr = classModel.findAttribute(Attributes.runtimeVisibleAnnotations())
@@ -110,9 +103,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapArrayFieldDescriptorIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val fieldDescriptors = classModel.fields().map { it.fieldType().stringValue() }
@@ -121,9 +112,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapArray2dFieldDescriptorIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val fieldDescriptors = classModel.fields().map { it.fieldType().stringValue() }
@@ -132,9 +121,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapMethodMultipleArgsIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val methodDescriptors = classModel.methods().map { it.methodType().stringValue() }
@@ -144,9 +131,7 @@ class RelocatorRemapperTest {
 
   @Test
   fun remapMethodPrimitivePlusClassIsRelocated() {
-    val details = FixtureSubject::class.toFileCopyDetails()
-
-    val result = details.remapClass(relocators)
+    val result = fixtureSubjectDetails.remapClass(relocators)
 
     val classModel = ClassFile.of().parse(result)
     val methodDescriptors = classModel.methods().map { it.methodType().stringValue() }
@@ -187,13 +172,13 @@ class RelocatorRemapperTest {
 
   @Retention(AnnotationRetention.RUNTIME)
   @Target(AnnotationTarget.CLASS)
-  annotation class FixtureAnnotation
+  private annotation class FixtureAnnotation
 
-  open class FixtureBase
+  private open class FixtureBase
 
   @Suppress("unused") // Used by parsing bytecode.
   @FixtureAnnotation
-  class FixtureSubject : FixtureBase() {
+  private class FixtureSubject : FixtureBase() {
     val field: FixtureBase = FixtureBase()
     val arrayField: Array<FixtureBase> = emptyArray()
     val array2dField: Array<Array<FixtureBase>> = emptyArray()