From 949c67078d7af9690eca7eab5cb3c521a8f39112 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 26 Aug 2020 13:23:21 +0300 Subject: [PATCH] NJ2K: fix testdata of MultiFileTestGenerated.testNullabilityByDFa --- .../testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt | 6 +++++- tests/mute-common.csv | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt b/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt index a35995987ce..dd0cdcbf95c 100644 --- a/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt +++ b/nj2k/testData/multiFile/NullabilityByDFa/SomeServiceUsage.kt @@ -39,6 +39,10 @@ class SomeServiceUsage { // nullable, safe-call fun aString6(): String? { val s = serviceNullable - return s?.nullableString() + return if (s != null) { + s.nullableString() + } else { + null + } } } \ No newline at end of file diff --git a/tests/mute-common.csv b/tests/mute-common.csv index 1fdade23e28..a02be0c3d18 100644 --- a/tests/mute-common.csv +++ b/tests/mute-common.csv @@ -64,7 +64,6 @@ org.jetbrains.kotlin.idea.resolve.ReferenceResolveTestGenerated.DelegatedPropert org.jetbrains.kotlin.tools.projectWizard.wizard.ProjectTemplateNewWizardProjectImportTestGenerated.GradleGroovy.testMultiplatformApplication,,, org.jetbrains.kotlin.tools.projectWizard.wizard.ProjectTemplateNewWizardProjectImportTestGenerated.GradleKts.testMultiplatformApplication,,, org.jetbrains.kotlin.gradle.NewMultiplatformIT.testJavaSupportInJvmTargets,,, -org.jetbrains.kotlin.nj2k.NewJavaToKotlinConverterMultiFileTestGenerated.testNullabilityByDFa,,, org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testJvmOverloadsFunctions,,, FLAKY org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testReturnInnerClasses,,, FLAKY org.jetbrains.kotlin.checkers.JavaAgainstKotlinBinariesCheckerTestGenerated.testThrowsOnGenericMethod,,, FLAKY