mirror of
https://github.com/jlengrand/detekt.git
synced 2026-03-10 08:11:23 +00:00
Modularize test module (#2720)
* Extract KtCompiler to detekt-parser preparing a minimal test utils module * Fix potential memory leak in tests not closing settings * Move parsing and generic test utils to own module * Do not depend on test module for metrics, gradle plugin and generator modules * Exclude test-utils from coverage report as we do with test module * Explicitly depend on core-module in tests
This commit is contained in:
@@ -77,12 +77,14 @@ subprojects {
|
||||
|
||||
jacoco.toolVersion = Versions.JACOCO
|
||||
|
||||
val examplesOrTestUtils = setOf("detekt-test", "detekt-test-utils", "detekt-sample-extensions")
|
||||
|
||||
tasks {
|
||||
jacocoTestReport {
|
||||
executionData.setFrom(fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec"))
|
||||
|
||||
subprojects
|
||||
.filterNot { it.name in setOf("detekt-test", "detekt-sample-extensions") }
|
||||
.filterNot { it.name in examplesOrTestUtils }
|
||||
.forEach {
|
||||
this@jacocoTestReport.sourceSets(it.sourceSets.main.get())
|
||||
this@jacocoTestReport.dependsOn(it.tasks.test)
|
||||
|
||||
@@ -9,6 +9,7 @@ dependencies {
|
||||
api(kotlin("compiler-embeddable"))
|
||||
api(project(":detekt-psi-utils"))
|
||||
|
||||
testImplementation(project(":detekt-core"))
|
||||
testImplementation(project(":detekt-test"))
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.api
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.api
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.StringPrintStream
|
||||
import io.github.detekt.test.utils.StringPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.TestDetektion
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.gitlab.arturbosch.detekt.api
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.rules.shouldAnalyzeFile
|
||||
import io.gitlab.arturbosch.detekt.core.rules.visitFile
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.loadRuleSet
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.core.rules.createRuleSet
|
||||
import io.gitlab.arturbosch.detekt.core.rules.isActive
|
||||
import io.gitlab.arturbosch.detekt.core.rules.shouldAnalyzeFile
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
|
||||
@@ -3,8 +3,8 @@ package io.gitlab.arturbosch.detekt.api
|
||||
import io.gitlab.arturbosch.detekt.api.internal.isSuppressedBy
|
||||
import io.gitlab.arturbosch.detekt.core.rules.visitFile
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.cli.CliArgs
|
||||
import io.gitlab.arturbosch.detekt.core.KtCompiler
|
||||
import io.github.detekt.parser.KtCompiler
|
||||
import io.gitlab.arturbosch.detekt.core.isFile
|
||||
import java.io.PrintStream
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.cli
|
||||
|
||||
import com.beust.jcommander.ParameterException
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatExceptionOfType
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package io.gitlab.arturbosch.detekt.cli
|
||||
|
||||
import com.beust.jcommander.ParameterException
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.api.internal.PathFilters
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatExceptionOfType
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.api.SetupContext
|
||||
import io.gitlab.arturbosch.detekt.api.UnstableApi
|
||||
import io.gitlab.arturbosch.detekt.rules.documentation.LicenceHeaderLoaderExtension
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import org.assertj.core.api.Assertions.assertThatCode
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package io.gitlab.arturbosch.detekt.cli
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.FileProcessListener
|
||||
import io.gitlab.arturbosch.detekt.core.FileProcessorLocator
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.fail
|
||||
|
||||
@@ -5,9 +5,9 @@ import io.gitlab.arturbosch.detekt.cli.runners.ConfigExporter
|
||||
import io.gitlab.arturbosch.detekt.cli.runners.Runner
|
||||
import io.gitlab.arturbosch.detekt.cli.runners.SingleRuleRunner
|
||||
import io.gitlab.arturbosch.detekt.cli.runners.VersionPrinter
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.StringPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.StringPrintStream
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package io.gitlab.arturbosch.detekt.cli
|
||||
|
||||
import io.github.detekt.test.utils.StringPrintStream
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.cli.out.HtmlOutputReport
|
||||
import io.gitlab.arturbosch.detekt.cli.out.TxtOutputReport
|
||||
import io.gitlab.arturbosch.detekt.cli.out.XmlOutputReport
|
||||
import io.gitlab.arturbosch.detekt.core.DetektResult
|
||||
import io.gitlab.arturbosch.detekt.test.StringPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.utils.closeQuietly
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.cli
|
||||
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.CodeSmell
|
||||
import io.gitlab.arturbosch.detekt.api.CorrectableCodeSmell
|
||||
import io.gitlab.arturbosch.detekt.api.Debt
|
||||
@@ -10,8 +12,6 @@ import io.gitlab.arturbosch.detekt.api.Severity
|
||||
import io.gitlab.arturbosch.detekt.api.SourceLocation
|
||||
import io.gitlab.arturbosch.detekt.api.TextLocation
|
||||
import io.gitlab.arturbosch.detekt.core.ModificationNotification
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.jetbrains.kotlin.psi.KtElement
|
||||
import java.nio.file.Paths
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.gitlab.arturbosch.detekt.cli.baseline
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Finding
|
||||
import io.gitlab.arturbosch.detekt.cli.createFinding
|
||||
import io.gitlab.arturbosch.detekt.test.createTempDirectoryForTest
|
||||
import io.github.detekt.test.utils.createTempDirectoryForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.baseline
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.createTempFileForTest
|
||||
import io.github.detekt.test.utils.createTempFileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalStateException
|
||||
|
||||
@@ -13,7 +13,7 @@ import io.gitlab.arturbosch.detekt.core.processors.logicalLinesKey
|
||||
import io.gitlab.arturbosch.detekt.core.processors.sourceLinesKey
|
||||
import io.gitlab.arturbosch.detekt.core.whichDetekt
|
||||
import io.gitlab.arturbosch.detekt.test.TestDetektion
|
||||
import io.gitlab.arturbosch.detekt.test.createTempFileForTest
|
||||
import io.github.detekt.test.utils.createTempFileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
|
||||
@@ -6,7 +6,7 @@ import io.gitlab.arturbosch.detekt.cli.CliArgs
|
||||
import io.gitlab.arturbosch.detekt.cli.ReportLocator
|
||||
import io.gitlab.arturbosch.detekt.cli.parseArguments
|
||||
import io.gitlab.arturbosch.detekt.core.ProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Condition
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.cli.CliArgs
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.cli.createCliArgs
|
||||
import io.gitlab.arturbosch.detekt.test.createTempFileForTest
|
||||
import io.github.detekt.test.utils.createTempFileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -3,10 +3,10 @@ package io.gitlab.arturbosch.detekt.cli.runners
|
||||
import io.gitlab.arturbosch.detekt.cli.BuildFailure
|
||||
import io.gitlab.arturbosch.detekt.cli.config.InvalidConfig
|
||||
import io.gitlab.arturbosch.detekt.cli.createCliArgs
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.StringPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.createTempFileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.StringPrintStream
|
||||
import io.github.detekt.test.utils.createTempFileForTest
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatCode
|
||||
import org.assertj.core.api.Assertions.assertThatThrownBy
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.cli.createCliArgs
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.createTempFileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.createTempFileForTest
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatThrownBy
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.cli.runners
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.StringPrintStream
|
||||
import io.github.detekt.test.utils.StringPrintStream
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
|
||||
import io.github.detekt.parser.KtCompiler
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
|
||||
@@ -7,7 +7,7 @@ import io.gitlab.arturbosch.detekt.api.Rule
|
||||
import io.gitlab.arturbosch.detekt.api.RuleSet
|
||||
import io.gitlab.arturbosch.detekt.api.RuleSetProvider
|
||||
import io.gitlab.arturbosch.detekt.api.Severity
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.CodeSmell
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.api.Debt
|
||||
@@ -9,7 +10,6 @@ import io.gitlab.arturbosch.detekt.api.Rule
|
||||
import io.gitlab.arturbosch.detekt.api.RuleSet
|
||||
import io.gitlab.arturbosch.detekt.api.RuleSetProvider
|
||||
import io.gitlab.arturbosch.detekt.api.Severity
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.jetbrains.kotlin.psi.KtClassOrObject
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.internal.PathFilters
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
|
||||
import org.spekframework.spek2.Spek
|
||||
@@ -11,21 +11,17 @@ import java.nio.file.Paths
|
||||
|
||||
class KtTreeCompilerSpec : Spek({
|
||||
|
||||
fun fixture(vararg filters: String): KtTreeCompiler =
|
||||
KtTreeCompiler(settings = createProcessingSettings(path,
|
||||
pathFilters = PathFilters.of(emptyList(), filters.toList())))
|
||||
|
||||
describe("tree compiler functionality") {
|
||||
|
||||
it("should compile all files") {
|
||||
val ktFiles = fixture().compile(path)
|
||||
val ktFiles = fixture { compile(path) }
|
||||
assertThat(ktFiles.size)
|
||||
.describedAs("It should compile at least three files, but did ${ktFiles.size}")
|
||||
.isGreaterThanOrEqualTo(3)
|
||||
}
|
||||
|
||||
it("should filter the file 'Default.kt'") {
|
||||
val ktFiles = fixture("**/Default.kt").compile(path)
|
||||
val ktFiles = fixture("**/Default.kt") { compile(path) }
|
||||
val ktFile = ktFiles.find { it.name == "Default.kt" }
|
||||
assertThat(ktFile).describedAs("It should have no Default.kt file").isNull()
|
||||
}
|
||||
@@ -36,31 +32,37 @@ class KtTreeCompilerSpec : Spek({
|
||||
"**/*Test*",
|
||||
"**/*Complex*",
|
||||
"**/*KotlinScript*"
|
||||
).compile(path)
|
||||
) { compile(path) }
|
||||
assertThat(ktFiles).isEmpty()
|
||||
}
|
||||
|
||||
it("should also compile regular files") {
|
||||
assertThat(fixture().compile(path.resolve("Default.kt")).size).isEqualTo(1)
|
||||
assertThat(fixture { compile(path.resolve("Default.kt")) }.size).isEqualTo(1)
|
||||
}
|
||||
|
||||
it("throws an exception if given file does not exist") {
|
||||
val invalidPath = "NOTHERE"
|
||||
assertThatIllegalArgumentException()
|
||||
.isThrownBy { fixture().compile(Paths.get(invalidPath)) }
|
||||
.isThrownBy { fixture { compile(Paths.get(invalidPath)) } }
|
||||
.withMessage("Given path $invalidPath does not exist!")
|
||||
}
|
||||
|
||||
it("does not compile a folder with a css file") {
|
||||
val cssPath = Paths.get(resource("css"))
|
||||
val ktFiles = fixture().compile(cssPath)
|
||||
val ktFiles = fixture { compile(cssPath) }
|
||||
assertThat(ktFiles).isEmpty()
|
||||
}
|
||||
|
||||
it("does not compile a css file") {
|
||||
val cssPath = Paths.get(resource("css")).resolve("test.css")
|
||||
val ktFiles = fixture().compile(cssPath)
|
||||
val ktFiles = fixture { compile(cssPath) }
|
||||
assertThat(ktFiles).isEmpty()
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
internal inline fun <reified T> fixture(vararg filters: String, block: KtTreeCompiler.() -> T): T {
|
||||
val pathFilters = PathFilters.of(emptyList(), filters.toList())
|
||||
val settings = createProcessingSettings(path, pathFilters = pathFilters)
|
||||
return settings.use { block(KtTreeCompiler(settings = settings)) }
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.spekframework.spek2.Spek
|
||||
@@ -12,8 +12,8 @@ class ClassCountVisitorTest : Spek({
|
||||
|
||||
it("twoClassesInSeparateFile") {
|
||||
val files = arrayOf(
|
||||
compileForTest(path.resolve("Test.kt")),
|
||||
compileForTest(path.resolve("Default.kt"))
|
||||
compileForTest(path.resolve("Test.kt")),
|
||||
compileForTest(path.resolve("Default.kt"))
|
||||
)
|
||||
val count = getClassCount(files)
|
||||
assertThat(count).isEqualTo(2)
|
||||
@@ -27,8 +27,8 @@ class ClassCountVisitorTest : Spek({
|
||||
|
||||
it("testEnumAndInterface") {
|
||||
val files = arrayOf(
|
||||
compileForTest(path.resolve("../empty/EmptyEnum.kt")),
|
||||
compileForTest(path.resolve("../empty/EmptyInterface.kt"))
|
||||
compileForTest(path.resolve("../empty/EmptyEnum.kt")),
|
||||
compileForTest(path.resolve("../empty/EmptyInterface.kt"))
|
||||
)
|
||||
val count = getClassCount(files)
|
||||
assertThat(count).isEqualTo(2)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.spekframework.spek2.Spek
|
||||
@@ -12,8 +12,8 @@ class KtFileCountVisitorTest : Spek({
|
||||
|
||||
it("twoFiles") {
|
||||
val files = arrayOf(
|
||||
compileForTest(path.resolve("Default.kt")),
|
||||
compileForTest(path.resolve("Test.kt"))
|
||||
compileForTest(path.resolve("Default.kt")),
|
||||
compileForTest(path.resolve("Test.kt"))
|
||||
)
|
||||
val count = files
|
||||
.map { getData(it) }
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.spekframework.spek2.Spek
|
||||
@@ -12,8 +12,8 @@ class PackageCountVisitorTest : Spek({
|
||||
|
||||
it("twoClassesInSeparatePackage") {
|
||||
val files = arrayOf(
|
||||
compileForTest(path.resolve("Default.kt")),
|
||||
compileForTest(path.resolve("../empty/EmptyEnum.kt"))
|
||||
compileForTest(path.resolve("Default.kt")),
|
||||
compileForTest(path.resolve("../empty/EmptyEnum.kt"))
|
||||
)
|
||||
val count = files
|
||||
.map { getData(it) }
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.core.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.core.path
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.formatting
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.api.Detektion
|
||||
import io.gitlab.arturbosch.detekt.api.FileProcessListener
|
||||
@@ -8,7 +9,6 @@ import io.gitlab.arturbosch.detekt.core.DetektFacade
|
||||
import io.gitlab.arturbosch.detekt.core.rules.visitFile
|
||||
import io.gitlab.arturbosch.detekt.test.createProcessingSettings
|
||||
import io.gitlab.arturbosch.detekt.test.loadRuleSet
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package io.gitlab.arturbosch.detekt.formatting
|
||||
|
||||
import com.pinterest.ktlint.core.ast.visit
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.api.Finding
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtilRt
|
||||
import java.io.File
|
||||
import java.nio.file.Paths
|
||||
|
||||
@@ -88,5 +88,5 @@ dependencies {
|
||||
implementation(project(":detekt-formatting"))
|
||||
implementation("com.beust:jcommander:${Versions.JCOMMANDER}")
|
||||
|
||||
testImplementation(project(":detekt-test"))
|
||||
testImplementation(project(":detekt-test-utils"))
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.generator.printer
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.generator.printer.rulesetpage.ConfigPrinter
|
||||
import io.gitlab.arturbosch.detekt.generator.util.createRuleSetPage
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.generator.printer
|
||||
|
||||
import io.github.detekt.test.utils.resource
|
||||
import io.gitlab.arturbosch.detekt.generator.printer.rulesetpage.RuleSetPagePrinter
|
||||
import io.gitlab.arturbosch.detekt.generator.util.createRuleSetPage
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.generator.util
|
||||
|
||||
import io.gitlab.arturbosch.detekt.generator.collection.Collector
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
|
||||
fun <T> Collector<T>.run(code: String): List<T> {
|
||||
val ktFile = KtTestCompiler.compileFromContent(code.trimIndent())
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies {
|
||||
implementation(kotlin("gradle-plugin"))
|
||||
implementation(kotlin("gradle-plugin-api"))
|
||||
|
||||
testImplementation(project(":detekt-test"))
|
||||
testImplementation(project(":detekt-test-utils"))
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.createTempDirectoryForTest
|
||||
import io.github.detekt.test.utils.createTempDirectoryForTest
|
||||
import org.gradle.testkit.runner.BuildResult
|
||||
import org.gradle.testkit.runner.GradleRunner
|
||||
import java.io.File
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
dependencies {
|
||||
api(project(":detekt-api"))
|
||||
testImplementation(project(":detekt-test"))
|
||||
testImplementation(project(":detekt-test-utils"))
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.github.detekt.metrics
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.github.detekt.metrics
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.getFunctionByName
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.github.detekt.test.utils.getFunctionByName
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
dependencies {
|
||||
api(kotlin("compiler-embeddable"))
|
||||
implementation(project(":detekt-psi-utils"))
|
||||
testImplementation(project(":detekt-test-utils"))
|
||||
}
|
||||
|
||||
tasks.withType<Test> {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
package io.github.detekt.parser
|
||||
|
||||
import io.github.detekt.parser.createKotlinCoreEnvironment
|
||||
import io.github.detekt.psi.ABSOLUTE_PATH
|
||||
import io.github.detekt.psi.LINE_SEPARATOR
|
||||
import io.github.detekt.psi.RELATIVE_PATH
|
||||
@@ -10,6 +9,7 @@ import org.jetbrains.kotlin.com.intellij.psi.PsiFileFactory
|
||||
import org.jetbrains.kotlin.com.intellij.testFramework.LightVirtualFile
|
||||
import org.jetbrains.kotlin.idea.KotlinLanguage
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
|
||||
open class KtCompiler(
|
||||
@@ -19,7 +19,7 @@ open class KtCompiler(
|
||||
protected val psiFileFactory: PsiFileFactory = PsiFileFactory.getInstance(environment.project)
|
||||
|
||||
fun compile(root: Path, subPath: Path): KtFile {
|
||||
require(subPath.isFile()) { "Given sub path ($subPath) should be a regular file!" }
|
||||
require(Files.isRegularFile(subPath)) { "Given sub path ($subPath) should be a regular file!" }
|
||||
val relativePath =
|
||||
(if (root == subPath) subPath.fileName
|
||||
else root.fileName.resolve(root.relativize(subPath))).normalize()
|
||||
@@ -1,8 +1,8 @@
|
||||
package io.gitlab.arturbosch.detekt.core
|
||||
package io.github.detekt.parser
|
||||
|
||||
import io.github.detekt.psi.LINE_SEPARATOR
|
||||
import io.github.detekt.psi.RELATIVE_PATH
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import io.github.detekt.test.utils.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
|
||||
import org.assertj.core.api.Assertions.assertThatIllegalStateException
|
||||
@@ -14,6 +14,7 @@ class KtCompilerTest : Spek({
|
||||
|
||||
describe("Kotlin Compiler") {
|
||||
|
||||
val path = Paths.get(resource("/cases"))
|
||||
val ktCompiler = KtCompiler()
|
||||
|
||||
it("Kotlin file has extra user data") {
|
||||
7
detekt-parser/src/test/resources/cases/Default.kt
Normal file
7
detekt-parser/src/test/resources/cases/Default.kt
Normal file
@@ -0,0 +1,7 @@
|
||||
package cases
|
||||
|
||||
/**
|
||||
* A comment
|
||||
*/
|
||||
@Suppress("Unused")
|
||||
class Default
|
||||
0
detekt-parser/src/test/resources/css/test.css
Normal file
0
detekt-parser/src/test/resources/css/test.css
Normal file
@@ -1,4 +1,3 @@
|
||||
dependencies {
|
||||
implementation(kotlin("compiler-embeddable"))
|
||||
}
|
||||
|
||||
|
||||
@@ -4,5 +4,7 @@ dependencies {
|
||||
implementation(project(":detekt-api"))
|
||||
implementation(project(":detekt-metrics"))
|
||||
|
||||
testImplementation(project(":detekt-api"))
|
||||
testImplementation(project(":detekt-core"))
|
||||
testImplementation(project(":detekt-test"))
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import io.gitlab.arturbosch.detekt.rules.complexity.LongParameterList
|
||||
import io.gitlab.arturbosch.detekt.rules.complexity.StringLiteralDuplication
|
||||
import io.gitlab.arturbosch.detekt.rules.complexity.TooManyFunctions
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.rules.coroutines.RedundantSuspendModifier
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.bugs
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -5,9 +5,9 @@ import io.gitlab.arturbosch.detekt.api.Finding
|
||||
import io.gitlab.arturbosch.detekt.api.SetupContext
|
||||
import io.gitlab.arturbosch.detekt.api.UnstableApi
|
||||
import io.gitlab.arturbosch.detekt.api.internal.YamlConfig
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -5,7 +5,7 @@ import io.gitlab.arturbosch.detekt.core.rules.visitFile
|
||||
import io.gitlab.arturbosch.detekt.rules.Case
|
||||
import io.gitlab.arturbosch.detekt.rules.providers.EmptyCodeProvider
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import io.gitlab.arturbosch.detekt.test.yamlConfig
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -5,7 +5,7 @@ import io.gitlab.arturbosch.detekt.api.Rule
|
||||
import io.gitlab.arturbosch.detekt.rules.Case
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.Assertions.assertThatExceptionOfType
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.exceptions
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.api.internal.YamlConfig
|
||||
import io.gitlab.arturbosch.detekt.core.rules.createRuleSet
|
||||
import io.gitlab.arturbosch.detekt.core.rules.visitFile
|
||||
import io.gitlab.arturbosch.detekt.rules.providers.ExceptionsProvider
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.resource
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.github.detekt.psi.ABSOLUTE_PATH
|
||||
import io.gitlab.arturbosch.detekt.rules.naming.InvalidPackageDeclaration.Companion.ROOT_PACKAGE
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.gitlab.arturbosch.detekt.rules.naming
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.naming
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.performance
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
|
||||
@@ -4,8 +4,8 @@ import io.gitlab.arturbosch.detekt.api.SourceLocation
|
||||
import io.gitlab.arturbosch.detekt.rules.Case
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.rules.Case
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileForTest
|
||||
import io.github.detekt.test.utils.compileForTest
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Finding
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.rules.Case
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import io.gitlab.arturbosch.detekt.test.lint
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.TestConfig
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.assertThat
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLint
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style
|
||||
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.rules.style.optional
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.Config
|
||||
import io.gitlab.arturbosch.detekt.test.KtTestCompiler
|
||||
import io.github.detekt.test.utils.KtTestCompiler
|
||||
import io.gitlab.arturbosch.detekt.test.compileAndLintWithContext
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
|
||||
@@ -4,8 +4,8 @@ import io.gitlab.arturbosch.detekt.cli.CliArgs
|
||||
import io.gitlab.arturbosch.detekt.cli.config.InvalidConfig
|
||||
import io.gitlab.arturbosch.detekt.cli.console.red
|
||||
import io.gitlab.arturbosch.detekt.cli.runners.Runner
|
||||
import io.gitlab.arturbosch.detekt.test.NullPrintStream
|
||||
import io.gitlab.arturbosch.detekt.test.createTempDirectoryForTest
|
||||
import io.github.detekt.test.utils.NullPrintStream
|
||||
import io.github.detekt.test.utils.createTempDirectoryForTest
|
||||
import org.assertj.core.api.Assertions.assertThatCode
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package io.gitlab.arturbosch.detekt.sample.extensions.processors
|
||||
|
||||
import io.gitlab.arturbosch.detekt.api.DetektVisitor
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.spekframework.spek2.Spek
|
||||
import org.spekframework.spek2.style.specification.describe
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.gitlab.arturbosch.detekt.api.Detektion
|
||||
import io.gitlab.arturbosch.detekt.api.Finding
|
||||
import io.gitlab.arturbosch.detekt.api.Notification
|
||||
import io.gitlab.arturbosch.detekt.api.ProjectMetric
|
||||
import io.gitlab.arturbosch.detekt.test.compileContentForTest
|
||||
import io.github.detekt.test.utils.compileContentForTest
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.jetbrains.kotlin.com.intellij.openapi.util.Key
|
||||
import org.jetbrains.kotlin.com.intellij.util.keyFMap.KeyFMap
|
||||
|
||||
9
detekt-test-utils/build.gradle.kts
Normal file
9
detekt-test-utils/build.gradle.kts
Normal file
@@ -0,0 +1,9 @@
|
||||
dependencies {
|
||||
api(kotlin("stdlib-jdk8"))
|
||||
api("org.assertj:assertj-core:${Versions.ASSERTJ}")
|
||||
implementation(project(":detekt-parser"))
|
||||
implementation(project(":detekt-psi-utils"))
|
||||
implementation(kotlin("script-runtime"))
|
||||
implementation(kotlin("script-util"))
|
||||
implementation(kotlin("scripting-compiler-embeddable"))
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user