Upgrade assertj-gradle.

cthing · Jan 31, 2025 · a8ff884 · a8ff884
1 parent 889d154
commit a8ff884
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
 
 [libraries]
 assertJ = "org.assertj:assertj-core:3.26.3"
-assertJGradle = "org.cthing:assertj-gradle:2.0.0"
+assertJGradle = "org.cthing:assertj-gradle:3.0.0"
 commonsIO = "commons-io:commons-io:2.18.0"
 cthingAnnots = "org.cthing:cthing-annotations:2.0.0"
 jspecify = "org.jspecify:jspecify:1.0.0"

diff --git a/src/test/java/org/cthing/gradle/plugins/properties/PluginApplyTest.java b/src/test/java/org/cthing/gradle/plugins/properties/PluginApplyTest.java
@@ -28,25 +28,21 @@ public void testApply(@TempDir final File projectDir) {
         final Project project = ProjectBuilder.builder().withName("testProject").withProjectDir(projectDir).build();
         project.getPluginManager().apply("org.cthing.property-key-constants");
 
-        assertThat(project).hasExtensionWithType(PropertyKeyConstantsPlugin.EXTENSION_NAME,
-                                                 PropertyKeyConstantsExtension.class);
+        assertThat(project).hasExtensionSatisfying(PropertyKeyConstantsPlugin.EXTENSION_NAME,
+                                                   PropertyKeyConstantsExtension.class, extension -> {
+            assertThat(extension.getSourceAccess()).contains(SourceAccess.PUBLIC);
+            assertThat(extension.getSourceLayout()).contains(SourceLayout.NESTED_CLASSES);
+        });
+
+        assertThat(project).hasTaskSatisfying("generatePropertyKeyConstants", PropertyKeyConstantsTask.class, task -> {
+            assertThat(task.getClassname()).isEmpty();
+            assertThat(task.getOutputDirectory()).getString()
+                                                 .endsWith("build/generated-src/property-key-constants/main");
+            assertThat(task.getSourceAccess()).contains(SourceAccess.PUBLIC);
+            assertThat(task.getSourceLayout()).contains(SourceLayout.NESTED_CLASSES);
+        });
 
-        final PropertyKeyConstantsExtension extension =
-                (PropertyKeyConstantsExtension)project.getExtensions().getByName(PropertyKeyConstantsPlugin.EXTENSION_NAME);
-        assertThat(extension.getSourceAccess()).contains(SourceAccess.PUBLIC);
-        assertThat(extension.getSourceLayout()).contains(SourceLayout.NESTED_CLASSES);
-
-        assertThat(project).hasTaskWithType("generatePropertyKeyConstants", PropertyKeyConstantsTask.class);
         assertThat(project).hasTaskWithType("generateTestPropertyKeyConstants", PropertyKeyConstantsTask.class);
-
-        final PropertyKeyConstantsTask task =
-                (PropertyKeyConstantsTask)project.getTasks().getByName("generatePropertyKeyConstants");
-        assertThat(task.getClassname()).isEmpty();
-        assertThat(task.getOutputDirectory()).isPresent();
-        assertThat(task.getOutputDirectory().get().getAsFile().getPath())
-                .endsWith("build/generated-src/property-key-constants/main");
-        assertThat(task.getSourceAccess()).contains(SourceAccess.PUBLIC);
-        assertThat(task.getSourceLayout()).contains(SourceLayout.NESTED_CLASSES);
     }
 
     public static Stream<Arguments> basenameProvider() {