From b686c1f1610e5dc227e440be69d6a2b1e71a3ed9 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 10 Jun 2020 16:47:00 +0300 Subject: [PATCH] diff: refresh viewers in headless tests DiffViewerBase no longer calls 'rediff' in 'init' if component is not shown. Fix regression after d12e363559743f0682e92768fe97333bd1ce5ba4 GitOrigin-RevId: 5053460e8fc6c888c010b65a2e3bd979d5ad30b4 --- .../tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt | 1 + .../intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt b/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt index 3f7b40904c49..f2e46c272305 100644 --- a/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt +++ b/platform/diff-impl/tests/testSrc/com/intellij/diff/merge/MergeTestBase.kt @@ -59,6 +59,7 @@ abstract class MergeTestBase : HeavyDiffTestCase() { val viewer = TextMergeTool.INSTANCE.createComponent(context, request) as TextMergeViewer try { val toolbar = viewer.init() + viewer.viewer.rediff() UIUtil.dispatchAllInvocationEvents() val builder = TestBuilder(viewer, toolbar.toolbarActions ?: emptyList()) diff --git a/platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt b/platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt index 5828b5884cdb..f9bbae5f66c3 100644 --- a/platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt +++ b/platform/diff-impl/tests/testSrc/com/intellij/openapi/diff/impl/settings/DiffColorSettingsTest.kt @@ -27,6 +27,7 @@ class DiffColorSettingsTest : HeavyDiffTestCase() { try { panel = DiffPreviewPanel() val viewer = panel.testGetViewer() + viewer.rediff() assertEquals(viewer.changes.size, 6) assertContainsRange(viewer, TextDiffType.MODIFIED)