From dec067af8cb85d7f0eba601800e73f5b404f1126 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 20 Nov 2020 17:31:15 +0300 Subject: [PATCH] [IR] stop overwriting testdata for dumpKotlinLike and use assertEqualsToFile --- .../kotlin/ir/AbstractIrTextTestCase.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt index 343146a7b2e..f163f172535 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt @@ -113,6 +113,12 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() { KotlinTestUtils.assertEqualsToFile(irTreeFileLabel.expectedTextFile, actualTrees) verify(irFile) + // Check that deep copy produces an equivalent result + val irFileCopy = irFile.deepCopyWithSymbols() + val copiedTrees = irFileCopy.dumpTreesFromLineNumber(irTreeFileLabel.lineNumber, normalizeNames = true) + TestCase.assertEquals("IR dump mismatch after deep copy with symbols", actualTrees, copiedTrees) + verify(irFileCopy) + val kotlinLikeDump = irFile.dumpKotlinLike( KotlinLikeDumpOptions( printFileName = false, @@ -121,17 +127,7 @@ abstract class AbstractIrTextTestCase : AbstractIrGeneratorTestCase() { ) ) val kotlinLikeDumpExpectedFile = irTreeFileLabel.expectedTextFile.withReplacedExtensionOrNull(".txt", ".kt.txt")!! -// KotlinTestUtils.assertEqualsToFile(kotlinLikeDumpExpectedFile, kotlinLikeDump) - - val kotlinLikeDumpExpectedText = if (kotlinLikeDumpExpectedFile.exists()) kotlinLikeDumpExpectedFile.readText() else "" - kotlinLikeDumpExpectedFile.writeText(kotlinLikeDump) - assertEquals(kotlinLikeDumpExpectedText, kotlinLikeDump) - - // Check that deep copy produces an equivalent result - val irFileCopy = irFile.deepCopyWithSymbols() - val copiedTrees = irFileCopy.dumpTreesFromLineNumber(irTreeFileLabel.lineNumber, normalizeNames = true) - TestCase.assertEquals("IR dump mismatch after deep copy with symbols", actualTrees, copiedTrees) - verify(irFileCopy) + KotlinTestUtils.assertEqualsToFile(kotlinLikeDumpExpectedFile, kotlinLikeDump) } try {