Skip to content

Commit 0011a5c

Browse files
committed
Fix tests.
1 parent 574b83b commit 0011a5c

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

src/functionalTest/kotlin/org/checkerframework/plugin/gradle/CFGroovyPluginFunctionalTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class CFGroovyPluginFunctionalTest : GroovyPluginFunctionalTest() {
5151
fun `test excludeTestsTrue`() {
5252
buildFile.appendText(
5353
"""
54-
compileTestJava{}
54+
compileTestJava{}
5555
5656
checkerFramework {
5757
version = "$TEST_CF_VERSION"
@@ -73,6 +73,7 @@ class CFGroovyPluginFunctionalTest : GroovyPluginFunctionalTest() {
7373

7474
assertThat(result.task(":compileTestJava")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
7575
assertThat(result.output).containsMatch("Note: TaintingChecker is type-checking .*Success.java")
76-
assertThat(result.output).doesNotContain("Note: TaintingChecker is type-checking .*Test.java")
76+
assertThat(result.output)
77+
.doesNotContainMatch("Note: TaintingChecker is type-checking .*Test.java")
7778
}
7879
}

src/functionalTest/kotlin/org/checkerframework/plugin/gradle/CFPluginFunctionalTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ class CfPluginFunctionalTest : KotlinPluginFunctionalTest() {
483483

484484
assertThat(result.task(":compileTestJava")?.outcome).isEqualTo(TaskOutcome.SUCCESS)
485485
assertThat(result.output).containsMatch("Note: TaintingChecker is type-checking .*Success.java")
486-
assertThat(result.output).doesNotContain("Note: TaintingChecker is type-checking .*Test.java")
486+
assertThat(result.output)
487+
.doesNotContainMatch("Note: TaintingChecker is type-checking .*Test.java")
487488
}
488489
}

src/main/kotlin/org/checkerframework/plugin/gradle/CheckerFrameworkPlugin.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@ class CheckerFrameworkPlugin @Inject constructor() : Plugin<Project> {
104104
options.compilerArgumentProviders.add(CheckerFrameworkCompilerArgumentProvider(cfExtension))
105105
options.forkOptions.jvmArgumentProviders.add(CheckerFrameworkJvmArgumentProvider())
106106
doFirst {
107+
if (
108+
skipCf ||
109+
!cfCompileOptions.enabled.getOrElse(true) ||
110+
(cfExtension.excludeTests.getOrElse(false) && isTestName(name))
111+
) {
112+
return@doFirst
113+
}
107114
if (cfExtension.checkers.isPresent) {
108115
val checkers = cfExtension.checkers.get()
109116
if (checkers.isEmpty()) {
@@ -252,7 +259,8 @@ class CheckerFrameworkPlugin @Inject constructor() : Plugin<Project> {
252259

253260
/** Return true if the Name is a test name. */
254261
private fun isTestName(taskName: String): Boolean {
255-
return taskName.matches(Regex("(T|(^|[A-Z_])t)est($|[A-Z_])"))
262+
println("#$taskName#")
263+
return taskName.matches(Regex(".*(T|(^|[A-Z_])t)est.*"))
256264
}
257265

258266
/** Provides extraJavacArgs to the compiler. */

0 commit comments

Comments
 (0)