Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve core tests #7232

Merged
merged 2 commits into from
Apr 27, 2024
Merged

Improve core tests #7232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a53c630
Don't repeat code
BraisGabin Apr 12, 2024
0eb262c
Improve the rule in the tests of Analyzer
BraisGabin Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/AnalyzerSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ import io.gitlab.arturbosch.detekt.test.yamlConfigFromContent
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.com.intellij.psi.PsiElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test
import org.junit.jupiter.params.ParameterizedTest
Expand Down Expand Up @@ -405,31 +409,32 @@ private class NoEmptyFile(config: Config) : Rule(config, "TestDescription") {
}
}

private class MaxLineLength(config: Config) : Rule(config, "TestDescription") {
private open class MaxLineLength(config: Config) : Rule(config, "TestDescription") {
private val lengthThreshold: Int = config.valueOrDefault("maxLineLength", 10)
override fun visitKtFile(file: KtFile) {
super.visitKtFile(file)
var offset = 0
for (line in file.text.lineSequence()) {
if (line.length > lengthThreshold) {
report(CodeSmell(Entity.atPackageOrFirstDecl(file), description))
val ktElement = file.findFirstMeaningfulKtElementInParents(offset..(offset + line.length))
report(CodeSmell(Entity.from(ktElement), description))
}
offset += line.length + 1 // \n
}
}
}

@RequiresTypeResolution
private class RequiresTypeResolutionMaxLineLength(config: Config) : Rule(config, "TestDescription") {
private val lengthThreshold: Int = config.valueOrDefault("maxLineLength", 10)
override fun visitKtFile(file: KtFile) {
super.visitKtFile(file)
for (line in file.text.lineSequence()) {
if (line.length > lengthThreshold) {
report(CodeSmell(Entity.atPackageOrFirstDecl(file), description))
}
}
private fun KtFile.findFirstMeaningfulKtElementInParents(range: IntRange): PsiElement {
return elementsInRange(TextRange.create(range.first, range.last))
.asSequence()
.plus(findElementAt(range.last))
.mapNotNull { it?.getNonStrictParentOfType() }
.first { it.text.isNotBlank() }
}
}

@RequiresTypeResolution
private class RequiresTypeResolutionMaxLineLength(config: Config) : MaxLineLength(config)

private class FaultyRule(config: Config) : Rule(config, "") {
override fun visitKtFile(file: KtFile) {
throw object : IllegalStateException("Deliberately triggered error.") {}
Expand Down