From 956337ad87a79c429344b9d8023edd469a4de461 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Mon, 14 Feb 2022 16:30:43 +0100
Subject: [PATCH] [KPM] IdeaKotlinProjectModelSerializableTest compare by
 string representation

KT-51262
KT-51220
---
 .../kotlin/gradle/kpm/KotlinExternalModelContainer.kt       | 4 ++++
 ...bleTest.kt => IdeaKotlinProjectModelSerializableTest.kt} | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/{KotlinIdeaProjectModelSerializableTest.kt => IdeaKotlinProjectModelSerializableTest.kt} (92%)

diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer.kt
index a34b8eaeb5f..d9e3104e24c 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/KotlinExternalModelContainer.kt
@@ -25,6 +25,10 @@ abstract class KotlinExternalModelContainer internal constructor() : Serializabl
         override fun <T : Any> contains(key: KotlinExternalModelKey<T>): Boolean = false
         override fun <T : Any> get(key: KotlinExternalModelKey<T>): T? = null
     }
+
+    override fun toString(): String {
+        return "KotlinExternalModelContainer(${ids.joinToString("; ", "[", "]")}"
+    }
 }
 
 abstract class KotlinMutableExternalModelContainer internal constructor() : KotlinExternalModelContainer() {
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/KotlinIdeaProjectModelSerializableTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt
similarity index 92%
rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/KotlinIdeaProjectModelSerializableTest.kt
rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt
index eddca8298ea..2e5892185fa 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/KotlinIdeaProjectModelSerializableTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKotlinProjectModelSerializableTest.kt
@@ -21,7 +21,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.fail
 
-class KotlinIdeaProjectModelSerializableTest : AbstractKpmExtensionTest() {
+class IdeaKotlinProjectModelSerializableTest : AbstractKpmExtensionTest() {
 
     @Test
     fun `test - serialize and deserialize - empty project`() {
@@ -61,8 +61,8 @@ class KotlinIdeaProjectModelSerializableTest : AbstractKpmExtensionTest() {
         }
 
         assertEquals(
-            model, deserializedModel,
-            "Expected deserializedModel to match source model"
+            model.toString(), deserializedModel.toString(),
+            "Expected deserializedModel string representation to match source model"
         )
     }
 }