Use assertj-gradle in unit tests.

cthing · Dec 25, 2024 · d687c56 · d687c56
1 parent 499ed1b
commit d687c56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -59,6 +59,7 @@ dependencies {
     compileOnly(libs.cthingAnnots)
 
     testImplementation(libs.assertJ)
+    testImplementation(libs.assertJGradle)
     testImplementation(libs.commonsIO)
     testImplementation(libs.junitApi)
     testImplementation(libs.junitParams)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,6 +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:1.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
@@ -9,7 +9,6 @@
 import java.util.stream.Stream;
 
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -18,6 +17,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.cthing.assertj.gradle.GradleProjectAssert.assertThat;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 
@@ -28,21 +28,19 @@ 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");
 
-        final Object extensionObj = project.getExtensions().findByName(PropertyKeyConstantsPlugin.EXTENSION_NAME);
-        assertThat(extensionObj).isNotNull();
-        assertThat(extensionObj).isInstanceOf(PropertyKeyConstantsExtension.class);
+        assertThat(project).hasExtensionWithType(PropertyKeyConstantsPlugin.EXTENSION_NAME,
+                                                 PropertyKeyConstantsExtension.class);
 
-        final PropertyKeyConstantsExtension extension = (PropertyKeyConstantsExtension)extensionObj;
+        final PropertyKeyConstantsExtension extension =
+                (PropertyKeyConstantsExtension)project.getExtensions().getByName(PropertyKeyConstantsPlugin.EXTENSION_NAME);
         assertThat(extension.getSourceAccess().get()).isEqualTo(SourceAccess.PUBLIC);
         assertThat(extension.getSourceLayout().get()).isEqualTo(SourceLayout.NESTED_CLASSES);
 
-        final Task mainTask = project.getTasks().findByName("generatePropertyKeyConstants");
-        assertThat(mainTask).isNotNull().isInstanceOf(PropertyKeyConstantsTask.class);
+        assertThat(project).hasTaskWithType("generatePropertyKeyConstants", PropertyKeyConstantsTask.class);
+        assertThat(project).hasTaskWithType("generateTestPropertyKeyConstants", PropertyKeyConstantsTask.class);
 
-        final Task testTask = project.getTasks().findByName("generateTestPropertyKeyConstants");
-        assertThat(testTask).isNotNull().isInstanceOf(PropertyKeyConstantsTask.class);
-
-        final PropertyKeyConstantsTask task = (PropertyKeyConstantsTask)mainTask;
+        final PropertyKeyConstantsTask task =
+                (PropertyKeyConstantsTask)project.getTasks().getByName("generatePropertyKeyConstants");
         assertThat(task.getClassname().isPresent()).isFalse();
         assertThat(task.getOutputDirectory().get().getAsFile().getPath())
                 .endsWith("build/generated-src/property-key-constants/main");