Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,12 @@ abstract class HttpWsCallResult : EnterpriseActionResult {
return observed.deepCopy<JsonNode>()
}

// Preserve a size difference recorded by an earlier observation.
// Its elements can no longer be merged using the original indices.
if (merged.size() != original.size()) {
return merged
}

for (i in 0 until observed.size()) {
merged.set(i, mergeJsonDiffFromOriginal(original[i], observed[i], merged[i]))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,24 @@ internal class RestCallResultTest {

assertEquals("first", original.getMergedFlakyBody())
}

@Test
fun testMergedFlakyBodyPreservesArraySizeChangesAcrossObservations(){
for (changedArray in listOf("[]", "[1]", "[1,2,3]")) {
val original = createCallResult("""{"items":[1,2]}""")
original.recordFlakyObservation(createCallResult("""{"items":$changedArray}"""), 1)
original.recordFlakyObservation(createCallResult("""{"items":[1,3]}"""), 2)

assertEquals("""{"items":$changedArray}""", original.getMergedFlakyBody())
}
}

@Test
fun testMergedFlakyBodyPreservesNestedArraySizeChangeAndOtherDeltas(){
val original = createCallResult("""{"items":[{"values":[1,2]}],"first":"a","second":"b"}""")
original.recordFlakyObservation(createCallResult("""{"items":[{"values":[]}],"first":"x","second":"b"}"""), 1)
original.recordFlakyObservation(createCallResult("""{"items":[{"values":[1,3]}],"first":"a","second":"y"}"""), 2)

assertEquals("""{"items":[{"values":[]}],"first":"x","second":"y"}""", original.getMergedFlakyBody())
}
}
Loading