Add quotes to hashmap string keys

square · Jan 6, 2022 · 9f5e1cb · 9f5e1cb
1 parent c2b838e
commit 9f5e1cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/shark/src/main/java/shark/internal/AndroidReferenceReaders.kt b/shark/src/main/java/shark/internal/AndroidReferenceReaders.kt
@@ -146,8 +146,9 @@ internal enum class AndroidReferenceReaders : OptionalFactory {
               valueObjectId = value.asObjectId!!,
               isLowPriority = false,
               lazyDetailsResolver = {
+                val keyAsString = key.asObject?.asInstance?.readAsJavaString()?.let { "\"$it\"" }
                 val keyAsName =
-                  key.asObject?.asInstance?.readAsJavaString() ?: key.asObject?.toString() ?: "null"
+                  keyAsString ?: key.asObject?.toString() ?: "null"
                 LazyDetails(
                   name = keyAsName,
                   locationClassObjectId = locationClassObjectId,

diff --git a/shark/src/main/java/shark/internal/InternalSharedExpanderHelpers.kt b/shark/src/main/java/shark/internal/InternalSharedExpanderHelpers.kt
@@ -72,8 +72,9 @@ internal class InternalSharedHashMapReferenceReader(
               valueObjectId = value.asObjectId!!,
               isLowPriority = false,
               lazyDetailsResolver = {
+                val keyAsString = key.asObject?.asInstance?.readAsJavaString()?.let { "\"$it\"" }
                 val keyAsName =
-                  key.asObject?.asInstance?.readAsJavaString() ?: key.asObject?.toString() ?: "null"
+                  keyAsString ?: key.asObject?.toString() ?: "null"
                 LazyDetails(
                   name = keyAsName,
                   locationClassObjectId = declaringClassId,

diff --git a/shark/src/test/java/shark/OpenJdkInstanceRefReadersTest.kt b/shark/src/test/java/shark/OpenJdkInstanceRefReadersTest.kt
@@ -304,7 +304,7 @@ class OpenJdkInstanceRefReadersTest {
     val refPath = findLeak(OpenJdkInstanceRefReaders.HASH_MAP)
 
     with(refPath.first()) {
-      assertThat(referenceDisplayName).isEqualTo("[StringKey]")
+      assertThat(referenceDisplayName).isEqualTo("[\"StringKey\"]")
     }
   }
 

diff --git a/shark/src/test/java/shark/internal/AndroidReferenceReadersHprofTest.kt b/shark/src/test/java/shark/internal/AndroidReferenceReadersHprofTest.kt
@@ -27,7 +27,7 @@ class AndroidReferenceReadersHprofTest {
 
     val mapReference =
       leakTrace.referencePath.single { it.owningClassSimpleName == "HashMap" }
-    assertThat(mapReference.referenceName).isEqualTo("leaking")
+    assertThat(mapReference.referenceName).isEqualTo("\"leaking\"")
     assertThat(mapReference.referenceType).isEqualTo(ARRAY_ENTRY)
   }
 }