Upgrade SonarPlugin for Gradle 8 compatibility

bakdata · Feb 21, 2024 · 960c980 · 960c980
1 parent aea4c42
commit 960c980
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/sonar/src/test/kotlin/com/bakdata/gradle/SonarPluginTest.kt b/sonar/src/test/kotlin/com/bakdata/gradle/SonarPluginTest.kt
@@ -137,10 +137,7 @@ internal class SonarPluginTest {
         val parent = ProjectBuilder.builder().withName("parent").build()
         val child1 = ProjectBuilder.builder().withName("child1").withParent(parent).build()
 
-// FIXME If original type is SAM type, then candidate should have same type constructor and corresponding function type
-//originalExpectType: (java.util.function.Consumer<(ACTUAL..ACTUAL?)>..java.util.function.Consumer<(ACTUAL..ACTUAL?)>?), candidateExpectType: Nothing
-//functionTypeByOriginal: (((ACTUAL..ACTUAL?)) -> kotlin.Unit..(((ACTUAL..ACTUAL?)) -> kotlin.Unit)?), functionTypeByCandidate: null
-//        assertThatCode { child1.pluginManager.apply("com.bakdata.sonar") }
-//                .satisfies { assertThat(it.cause?.message).contains("top-level project") }
+        assertThatCode { child1.pluginManager.apply("com.bakdata.sonar") }
+                .satisfies { assertThat(it.cause).hasMessageContaining("top-level project") }
     }
 }
diff --git a/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginTest.kt b/sonatype/src/test/kotlin/com/bakdata/gradle/SonatypePluginTest.kt
@@ -112,11 +112,8 @@ internal class SonatypePluginTest {
         val parent = ProjectBuilder.builder().withName("parent").build()
         val child1 = ProjectBuilder.builder().withName("child1").withParent(parent).build()
 
-// FIXME If original type is SAM type, then candidate should have same type constructor and corresponding function type
-//originalExpectType: (java.util.function.Consumer<(ACTUAL..ACTUAL?)>..java.util.function.Consumer<(ACTUAL..ACTUAL?)>?), candidateExpectType: Nothing
-//functionTypeByOriginal: (((ACTUAL..ACTUAL?)) -> kotlin.Unit..(((ACTUAL..ACTUAL?)) -> kotlin.Unit)?), functionTypeByCandidate: null
-//        Assertions.assertThatCode { child1.apply(plugin = "com.bakdata.sonatype") }
-//                .satisfies { Assertions.assertThat(it.cause?.message).contains("top-level project") }
+        Assertions.assertThatCode { child1.apply(plugin = "com.bakdata.sonatype") }
+                .satisfies { Assertions.assertThat(it.cause).hasMessageContaining("top-level project") }
     }
 
 }