[ABI Validation] Add more vertical spacing to KLib dumps

Fixes Kotlin/binary-compatibility-validator#196 
Pull request Kotlin/binary-compatibility-validator#225

Moved from Kotlin/binary-compatibility-validator@3477c15

Author: fzhinkin

libraries/tools/abi-validation/src/functionalTest/kotlin/kotlinx/validation/test/KlibVerificationTests.kt

@@ -36,7 +36,7 @@ private fun KlibVerificationTests.checkKlibDump(
 
     val expected = readFileList(expectedDumpFileName)
 
-    Assertions.assertThat(generatedDump.readText()).isEqualToIgnoringNewLines(expected)
+    Assertions.assertThat(generatedDump.readText()).isEqualTo(expected)
 }
 
 internal class KlibVerificationTests : BaseKotlinGradleTest() {
@@ -155,7 +155,7 @@ internal class KlibVerificationTests : BaseKotlinGradleTest() {
             assertTrue(jvmApiDump.exists(), "No API dump for JVM")
 
             val jvmExpected = readFileList("/examples/classes/AnotherBuildConfig.dump")
-            Assertions.assertThat(jvmApiDump.readText()).isEqualToIgnoringNewLines(jvmExpected)
+            Assertions.assertThat(jvmApiDump.readText()).isEqualTo(jvmExpected)
         }
     }
 
@@ -357,6 +357,28 @@ internal class KlibVerificationTests : BaseKotlinGradleTest() {
         )
     }
 
+    @Test
+    fun `check sorting for target-specific declarations`() {
+        val runner = test {
+            baseProjectSetting()
+            addToSrcSet("/examples/classes/TopLevelDeclarations.kt")
+            addToSrcSet("/examples/classes/TopLevelDeclarationsExp.kt")
+            addToSrcSet("/examples/classes/TopLevelDeclarationsLinuxOnly.kt", "linuxMain")
+            addToSrcSet("/examples/classes/TopLevelDeclarationsMingwOnly.kt", "mingwMain")
+            addToSrcSet("/examples/classes/TopLevelDeclarationsAndroidOnly.kt", "androidNativeMain")
+
+
+            runner {
+                arguments.add(":klibApiDump")
+            }
+        }
+
+        checkKlibDump(
+            runner.build(), "/examples/classes/TopLevelDeclarations.klib.diverging.dump",
+            dumpTask = ":klibApiDump"
+        )
+    }
+
     @Test
     fun `infer a dump for a target with custom name`() {
         val runner = test {

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.clash.dump

@@ -9,9 +9,12 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }
+
 // Targets: [linux]
 final fun (org.different.pack/BuildConfig).org.different.pack/linuxArm64Specific(): kotlin/Int // org.different.pack/linuxArm64Specific|[email protected](){}[0]

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.custom.dump

@@ -8,7 +8,9 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.dump

@@ -8,7 +8,9 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.linuxX64Only.dump

@@ -8,7 +8,9 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.renamedTarget.dump

@@ -8,7 +8,9 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
-    final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
+    final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfig.klib.web.dump

@@ -8,7 +8,9 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfigLinux.klib.grouping.dump

@@ -9,9 +9,12 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }
+
 // Targets: [linux]
 final fun (org.different.pack/BuildConfig).org.different.pack/linuxArm64Specific(): kotlin/Int // org.different.pack/linuxArm64Specific|[email protected](){}[0]

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfigLinuxArm64Extra.klib.dump

@@ -8,9 +8,12 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
 }
+
 // Targets: [linuxArm64]
 final fun (org.different.pack/BuildConfig).org.different.pack/linuxArm64Specific(): kotlin/Int // org.different.pack/linuxArm64Specific|[email protected](){}[0]

libraries/tools/abi-validation/src/functionalTest/resources/examples/classes/AnotherBuildConfigModified.klib.dump

@@ -8,8 +8,10 @@
 // Library unique name: <testproject>
 final class org.different.pack/BuildConfig { // org.different.pack/BuildConfig|null[0]
     constructor <init>() // org.different.pack/BuildConfig.<init>|<init>(){}[0]
+
     final val p1 // org.different.pack/BuildConfig.p1|{}p1[0]
         final fun <get-p1>(): kotlin/Int // org.different.pack/BuildConfig.p1.<get-p1>|<get-p1>(){}[0]
+
     final fun f1(): kotlin/Int // org.different.pack/BuildConfig.f1|f1(){}[0]
     final fun f2(): kotlin/Int // org.different.pack/BuildConfig.f2|f2(){}[0]
 }