From b199403c579ba6b5ccc8e9f68b314f05b7995221 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 31 Mar 2020 16:42:37 +0300 Subject: [PATCH] 201: Revert adding RUN_SLOW_ASSERTIONS enabling in KtUsefulTestCase --- .../kotlin/test/testFramework/KtUsefulTestCase.java | 4 ++++ .../kotlin/test/testFramework/KtUsefulTestCase.java.201 | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java index 4c808dff94d..c3bf76c4b25 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java @@ -97,8 +97,12 @@ public abstract class KtUsefulTestCase extends TestCase { // Radar #5755208: Command line Java applications need a way to launch without a Dock icon. System.setProperty("apple.awt.UIElement", "true"); + // -- KOTLIN ADDITIONAL START -- + FlexibleTypeImpl.RUN_SLOW_ASSERTIONS = true; AbstractTypeChecker.RUN_SLOW_ASSERTIONS = true; + + // -- KOTLIN ADDITIONAL END -- } protected boolean shouldContainTempFiles() { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.201 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.201 index decc4368d61..38058c3f08d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.201 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java.201 @@ -63,6 +63,8 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.testFramework.MockComponentManagerCreationTracer; +import org.jetbrains.kotlin.types.AbstractTypeChecker; +import org.jetbrains.kotlin.types.FlexibleTypeImpl; import org.junit.Assert; import org.junit.ComparisonFailure; @@ -124,6 +126,13 @@ public abstract class KtUsefulTestCase extends TestCase { catch (Exception e) { throw new RuntimeException(e); } + + // -- KOTLIN ADDITIONAL START -- + + FlexibleTypeImpl.RUN_SLOW_ASSERTIONS = true; + AbstractTypeChecker.RUN_SLOW_ASSERTIONS = true; + + // -- KOTLIN ADDITIONAL END -- } /**