MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup [injection testFramework]: requireNotNull instead of assertNotNull

Browse Source 
GitOrigin-RevId: f17e978cb2e9810664be7d369de9c38aa7218323
This commit is contained in:
Max Medvedev
2026-08-12 17:51:50 +00:00
committed by intellij-monorepo-bot
parent 3be5fe0920
commit 0a533bfcf2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/fixtures/InjectionTestFixture.kt
+9 -10
View File
@@ -18,7 +18,6 @@ import com.intellij.psi.util.PsiTreeUtil
import com.intellij.testFramework.UsefulTestCase
import junit.framework.TestCase
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
@@ -37,8 +36,8 @@ class InjectionTestFixture(private val javaFixture: CodeInsightTestFixture) {
fun assertInjectedLangAtCaret(lang: String?) {
val injectedElement = injectedElement
if (lang != null) {
TestCase.assertNotNull("injection of '$lang' expected", injectedElement)
TestCase.assertEquals(lang, injectedElement!!.language.id)
requireNotNull(injectedElement) { "injection of '$lang' expected" }
TestCase.assertEquals(lang, injectedElement.language.id)
}
else {
TestCase.assertNull(injectedElement)
@@ -140,8 +139,8 @@ fun CodeInsightTestFixture.assertInjectedLanguage(langId: String?, vararg fragme
val injectedElement = injectedLanguageManager.findInjectedElementAt(file, pos)
if (langId != null) {
assertNotNull("There should be injected element at $pos with text '$text'", injectedElement)
assertEquals("Injected Language don't match", langId, injectedElement!!.language.id)
requireNotNull(injectedElement) { "There should be injected element at $pos with text '$text'" }
assertEquals("Injected Language don't match", langId, injectedElement.language.id)
}
else {
assertNull("There should be no injected element at $pos with text '$text'", injectedElement)
@@ -159,16 +158,16 @@ fun CodeInsightTestFixture.assertInjectedReference(referenceClass: Class<*>, var
val pos = documentText.indexOf(refText) + refText.length / 2
val element = provider.findElementAt(pos)
assertNotNull("There should be element at $pos", element)
requireNotNull(element) { "There should be element at $pos" }
val host = element as? PsiLanguageInjectionHost ?: element!!.parent as? PsiLanguageInjectionHost
assertNotNull("There should be injection host at $pos", host)
val host = element as? PsiLanguageInjectionHost ?: element.parent as? PsiLanguageInjectionHost
requireNotNull(host) { "There should be injection host at $pos" }
val references = host!!.references
val references = host.references
assertTrue("There should be references in element", references.isNotEmpty())
val reference = references.find { referenceClass.isInstance(it) }
assertNotNull("There should be reference of type ${referenceClass} in element", reference)
requireNotNull(reference) { "There should be reference of type ${referenceClass} in element" }
}
}
}