From 6b792c36f0b03d6fb43632763d2fa79010593e68 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Sat, 23 Feb 2019 12:14:59 +0300 Subject: [PATCH] KotlinUastApiTest: using `kfail` alias --- plugins/uast-kotlin/tests/KotlinUastApiTest.kt | 16 ++++++++-------- .../uast-kotlin/tests/KotlinUastApiTest.kt.191 | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt index 256b32049d7..9b5413467d4 100644 --- a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt +++ b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt @@ -440,9 +440,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { "invoke", lambdaCall.methodName ) - val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected") + val receiver = lambdaCall.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("UParameter (name = selectItemFunction)", uParameter.asLogString()) } } @@ -463,9 +463,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { "invoke", lambdaCall.methodName ) - val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected") + val receiver = lambdaCall.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("ULocalVariable (name = baz)", uParameter.asLogString()) } } @@ -488,9 +488,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { localFunction.methodName ) assertNull(localFunction.resolve()) - val receiver = localFunction.receiver ?: kotlin.test.fail("receiver expected") + val receiver = localFunction.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("ULambdaExpression", uParameter.asLogString()) } } @@ -502,7 +502,7 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { val localVariable = file.findElementByTextFromPsi("val varWithType: String? = \"Not Null\"") val typeReference = localVariable.typeReference assertEquals("java.lang.String", typeReference?.getQualifiedName()) - val sourcePsi = typeReference?.sourcePsi ?: kotlin.test.fail("no sourcePsi") + val sourcePsi = typeReference?.sourcePsi ?: kfail("no sourcePsi") assertTrue("sourcePsi = $sourcePsi should be physical", sourcePsi.isPhysical) assertEquals("String?", sourcePsi.text) } @@ -518,7 +518,7 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { val localVariable = file.findElementByTextFromPsi("parameter: Int") val typeReference = localVariable.typeReference assertEquals("int", typeReference?.type?.presentableText) - val sourcePsi = typeReference?.sourcePsi ?: kotlin.test.fail("no sourcePsi") + val sourcePsi = typeReference?.sourcePsi ?: kfail("no sourcePsi") assertTrue("sourcePsi = $sourcePsi should be physical", sourcePsi.isPhysical) assertEquals("Int", sourcePsi.text) } diff --git a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 index abb0eb9e9f8..ee115572f34 100644 --- a/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 +++ b/plugins/uast-kotlin/tests/KotlinUastApiTest.kt.191 @@ -441,9 +441,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { "invoke", lambdaCall.methodName ) - val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected") + val receiver = lambdaCall.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("UParameter (name = selectItemFunction)", uParameter.asLogString()) } } @@ -464,9 +464,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { "invoke", lambdaCall.methodName ) - val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected") + val receiver = lambdaCall.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("ULocalVariable (name = baz)", uParameter.asLogString()) } } @@ -489,9 +489,9 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { localFunction.methodName ) assertNull(localFunction.resolve()) - val receiver = localFunction.receiver ?: kotlin.test.fail("receiver expected") + val receiver = localFunction.receiver ?: kfail("receiver expected") assertEquals("UReferenceExpression", receiver.asLogString()) - val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected") + val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kfail("uelement expected") assertEquals("ULambdaExpression", uParameter.asLogString()) } } @@ -518,7 +518,7 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { val localVariable = file.findElementByTextFromPsi("val varWithType: String? = \"Not Null\"") val typeReference = localVariable.typeReference assertEquals("java.lang.String", typeReference?.getQualifiedName()) - val sourcePsi = typeReference?.sourcePsi ?: kotlin.test.fail("no sourcePsi") + val sourcePsi = typeReference?.sourcePsi ?: kfail("no sourcePsi") assertTrue("sourcePsi = $sourcePsi should be physical", sourcePsi.isPhysical) assertEquals("String?", sourcePsi.text) } @@ -534,7 +534,7 @@ class KotlinUastApiTest : AbstractKotlinUastTest() { val localVariable = file.findElementByTextFromPsi("parameter: Int") val typeReference = localVariable.typeReference assertEquals("int", typeReference?.type?.presentableText) - val sourcePsi = typeReference?.sourcePsi ?: kotlin.test.fail("no sourcePsi") + val sourcePsi = typeReference?.sourcePsi ?: kfail("no sourcePsi") assertTrue("sourcePsi = $sourcePsi should be physical", sourcePsi.isPhysical) assertEquals("Int", sourcePsi.text) }