chore: replace all junit assertions with assertj assertions (#1469)

* chore: replace all junit assertions with assertj assertions

Co-authored-by: Timon Back <timonback@users.noreply.github.com>

* chore: configure linting with spotless to disallow Junit assertions

Co-authored-by: Timon Back <timonback@users.noreply.github.com>

---------

Co-authored-by: Timon Back <timonback@users.noreply.github.com>

Author: sam0r040

build.gradle

@@ -81,8 +81,10 @@ allprojects {
             licenseHeader("// SPDX-License-Identifier: Apache-2.0", "package|import|public")
 
             importOrder('', 'javax', 'java', '\\#')
-            replaceRegex("Remove wildcard imports", "import( static)?\\s+[^*\\s]+\\*;(\\r\\n|\\r|\\n)", "\$2")
+
             removeUnusedImports()
+            forbidWildcardImports()
+            forbidRegex("ForbidJunitAssertions", ".*org.junit.jupiter.api.Assertions.*", "Replace Junit assertions with AssertJ assertThat()")
 
             trimTrailingWhitespace()
             endWithNewline()

springwolf-add-ons/springwolf-common-model-converters/build.gradle

@@ -22,6 +22,7 @@ dependencies {
 
     implementation libs.money.api
 
+    testImplementation libs.assertj.core
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
     testRuntimeOnly libs.junit.plattform.launcher

springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/enums/NameInReffedSchemaModelConverterTest.java

@@ -7,8 +7,7 @@
 
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class NameInReffedSchemaModelConverterTest {
 
@@ -17,26 +16,26 @@ class NameInReffedSchemaModelConverterTest {
     private final ModelConverters converters = new ModelConverters();
 
     @Test
-    void testNameIsAddedToReffedSchema() {
+    void nameIsAddedToReffedSchema() {
         // given
         converters.addConverter(modelsConverter);
 
         // when
         final Map<String, Schema> models = converters.readAll(MyRootObject.class);
 
         // then
-        assertNotNull(models);
-        assertEquals(2, models.size());
+        assertThat(models).isNotNull();
+        assertThat(models.size()).isEqualTo(2);
         Schema myRootObject = models.get("MyRootObject");
-        assertNotNull(myRootObject);
-        assertEquals("MyRootObject", myRootObject.getName());
+        assertThat(myRootObject).isNotNull();
+        assertThat(myRootObject.getName()).isEqualTo("MyRootObject");
         Schema myEnumObjectField = (Schema) myRootObject.getProperties().get("myEnumObjectField");
-        assertEquals("myEnumObjectField", myEnumObjectField.getName());
-        assertEquals("#/components/schemas/MyEnumObject", myEnumObjectField.get$ref());
+        assertThat(myEnumObjectField.getName()).isEqualTo("myEnumObjectField");
+        assertThat(myEnumObjectField.get$ref()).isEqualTo("#/components/schemas/MyEnumObject");
 
         Schema myEnumObject = models.get("MyEnumObject");
-        assertNotNull(myEnumObject);
-        assertEquals("MyEnumObject", myEnumObject.getName());
+        assertThat(myEnumObject).isNotNull();
+        assertThat(myEnumObject.getName()).isEqualTo("MyEnumObject");
     }
 
     @io.swagger.v3.oas.annotations.media.Schema(enumAsRef = true)

springwolf-add-ons/springwolf-common-model-converters/src/test/java/io/github/springwolf/addons/common_model_converters/converters/monetaryamount/MonetaryAmountConverterTest.java

@@ -8,9 +8,7 @@
 
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 class MonetaryAmountConverterTest {
 
@@ -19,7 +17,7 @@ class MonetaryAmountConverterTest {
     private final ModelConverters converters = new ModelConverters();
 
     @Test
-    void testMonetaryAmountConverter() {
+    void monetaryAmountConverter() {
         // given
         converters.addConverter(modelsConverter);
 
@@ -28,24 +26,24 @@ void testMonetaryAmountConverter() {
 
         // then
         final Schema model = models.get("MonetaryAmount");
-        assertNotNull(model);
+        assertThat(model).isNotNull();
 
-        assertEquals(2, model.getProperties().size());
+        assertThat(model.getProperties().size()).isEqualTo(2);
 
         final Schema amountProperty = (Schema) model.getProperties().get("amount");
-        assertNotNull(amountProperty);
+        assertThat(amountProperty).isNotNull();
 
         final Schema currencyProperty = (Schema) model.getProperties().get("currency");
-        assertNotNull(currencyProperty);
+        assertThat(currencyProperty).isNotNull();
 
         final Schema missingProperty = (Schema) model.getProperties().get("missing");
-        assertNull(missingProperty);
+        assertThat(missingProperty).isNull();
 
         // then
         final Schema originalModel = models.get("javax.money.MonetaryAmount");
-        assertNotNull(originalModel);
+        assertThat(originalModel).isNotNull();
 
-        assertNull(originalModel.getType());
-        assertEquals("#/components/schemas/MonetaryAmount", originalModel.get$ref());
+        assertThat(originalModel.getType()).isNull();
+        assertThat(originalModel.get$ref()).isEqualTo("#/components/schemas/MonetaryAmount");
     }
 }

springwolf-add-ons/springwolf-generic-binding/src/test/java/io/github/springwolf/addons/generic_binding/annotation/processor/AsyncGenericOperationBindingProcessorTest.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.util.StringValueResolver;
 
 import java.util.Arrays;
@@ -23,7 +23,7 @@ class AsyncGenericOperationBindingProcessorTest {
             new AsyncGenericOperationBindingProcessor(stringValueResolver);
 
     @Test
-    void testClassWithoutAnnotation() {
+    void classWithoutAnnotation() {
         // when
         List<ProcessedOperationBinding> result = getProcessedOperationBindings(ClassWithoutAnnotation.class);
 
@@ -32,7 +32,7 @@ void testClassWithoutAnnotation() {
     }
 
     @Test
-    void testClassWithAnnotationHasABinding() {
+    void classWithAnnotationHasABinding() {
         // when
         List<ProcessedOperationBinding> result = getProcessedOperationBindings(ClassWithAnnotation.class);
 
@@ -130,7 +130,7 @@ void arrayPropertyTest() {
             assertThat(result).isEqualTo(Map.of("key", List.of("value1", "value2", "value3 is long")));
         }
 
-        @CsvSource(value = {"asdf[sdf]", "[sdf][sdf]", "[sd[sdf]]", "[kdkd]dkkd", "[kdkd"})
+        @ValueSource(strings = {"asdf[sdf]", "[sdf][sdf]", "[sd[sdf]]", "[kdkd]dkkd", "[kdkd"})
         @ParameterizedTest
         void arrayParsingShouldBeIgnored(String value) {
             // given

springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaCustomizerTest.java

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package io.github.springwolf.addons.json_schema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import io.github.springwolf.asyncapi.v3.model.AsyncAPI;
 import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
 import io.github.springwolf.asyncapi.v3.model.components.Components;
@@ -29,7 +28,7 @@ void setUp() {
     }
 
     @Test
-    public void handleEmptySchemaTest() {
+    void handleEmptySchemaTest() {
         // given
         AsyncAPI asyncAPI = createAsyncApi();
 
@@ -41,7 +40,7 @@ public void handleEmptySchemaTest() {
     }
 
     @Test
-    public void shouldAddJsonSchemaExtensionTest() throws JsonProcessingException {
+    void shouldAddJsonSchemaExtensionTest() throws Exception {
         // given
         AsyncAPI asyncAPI = createAsyncApi();
         SchemaObject schemaObject = new SchemaObject();

springwolf-add-ons/springwolf-json-schema/src/test/java/io/github/springwolf/addons/json_schema/JsonSchemaGeneratorTest.java

@@ -24,7 +24,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -41,8 +40,7 @@ class JsonSchemaGeneratorTest {
 
     @ParameterizedTest
     @MethodSource
-    public void validateJsonSchemaTest(String expectedJsonSchema, Supplier<Schema<?>> asyncApiSchema)
-            throws IOException {
+    void validateJsonSchemaTest(String expectedJsonSchema, Supplier<Schema<?>> asyncApiSchema) throws Exception {
         // given
         SchemaObject actualSchema = swaggerSchemaUtil.mapSchema(asyncApiSchema.get());
 

springwolf-add-ons/springwolf-kotlinx-serialization-model-converter/src/test/java/io/github/springwolf/addons/kotlinx_serialization_model_converter/converter/KotlinxSerializationTypeConverterTest.java

@@ -12,8 +12,6 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -31,7 +29,7 @@ void setUp() {
     }
 
     @Test
-    void validateGeneratedJson() throws IOException {
+    void validateGeneratedJson() throws Exception {
         final KotlinxSerializationModelConverter modelConverter = new KotlinxSerializationModelConverter();
         final ModelConverters converters = new ModelConverters();
         converters.addConverter(modelConverter);
@@ -43,7 +41,7 @@ void validateGeneratedJson() throws IOException {
     }
 
     @Test
-    void validateGeneratedFqnJson() throws IOException {
+    void validateGeneratedFqnJson() throws Exception {
         final KotlinxSerializationModelConverter modelConverter = new KotlinxSerializationModelConverter(true);
         final ModelConverters converters = new ModelConverters();
         converters.addConverter(modelConverter);
@@ -57,7 +55,7 @@ void validateGeneratedFqnJson() throws IOException {
     @Nested
     class TestListProperty {
         @Test
-        void testClassWithListProperty() {
+        void classWithListProperty() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithListProperty.class));
             Schema<?> schema = result.get(ClassWithListProperty.class.getSimpleName());
 
@@ -70,7 +68,7 @@ void testClassWithListProperty() {
         }
 
         @Test
-        void testClassWithCollectionProperty() {
+        void classWithCollectionProperty() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithCollectionProperty.class));
             Schema<?> schema = result.get(ClassWithCollectionProperty.class.getSimpleName());
 
@@ -86,7 +84,7 @@ void testClassWithCollectionProperty() {
     @Nested
     class TestSetProperty {
         @Test
-        void testClassWithSetProperty() {
+        void classWithSetProperty() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithSetProperty.class));
             Schema<?> schema = result.get(ClassWithSetProperty.class.getSimpleName());
 
@@ -103,7 +101,7 @@ void testClassWithSetProperty() {
     @Nested
     class TestEnumProperty {
         @Test
-        void testClassWithEnumProperty() {
+        void classWithEnumProperty() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithEnumProperty.class));
             Schema<?> schema = result.get(ClassWithEnumProperty.class.getSimpleName());
 
@@ -120,7 +118,7 @@ void testClassWithEnumProperty() {
     @Nested
     class TestNestedClass {
         @Test
-        void testClassWithNestedProperty() {
+        void classWithNestedProperty() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithNestedProperty.class));
             Schema<?> schema = result.get(ClassWithNestedProperty.class.getSimpleName());
 
@@ -140,7 +138,7 @@ void testClassWithNestedProperty() {
     @Nested
     class TestSealedClass {
         @Test
-        void testSealedClassSerialization() {
+        void sealedClassSerialization() {
             var result = modelConverters.readAll(new AnnotatedType(ClassWithPolymorphism.class));
             assertThat(result).hasSize(3);
             assertThat(result.get(Dog.class.getSimpleName())).isNotNull();

springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/amqp/AMQPBindingTest.java

@@ -10,7 +10,6 @@
 import io.github.springwolf.asyncapi.v3.model.operation.Operation;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -20,7 +19,7 @@ class AMQPBindingTest {
     private static final DefaultAsyncApiSerializerService serializer = new DefaultAsyncApiSerializerService();
 
     @Test
-    void shouldSerializeAMQPChannelBindingQueue() throws IOException {
+    void shouldSerializeAMQPChannelBindingQueue() throws Exception {
 
         var asyncapi = AsyncAPI.builder()
                 .channels(Map.of(
@@ -49,7 +48,7 @@ void shouldSerializeAMQPChannelBindingQueue() throws IOException {
     }
 
     @Test
-    void shouldSerializeAMQPChannelBindingRouting() throws IOException {
+    void shouldSerializeAMQPChannelBindingRouting() throws Exception {
 
         var asyncapi = AsyncAPI.builder()
                 .channels(Map.of(
@@ -78,7 +77,7 @@ void shouldSerializeAMQPChannelBindingRouting() throws IOException {
     }
 
     @Test
-    void shouldSerializeAMQPOperationBinding() throws IOException {
+    void shouldSerializeAMQPOperationBinding() throws Exception {
 
         var asyncapi = AsyncAPI.builder()
                 .operations(Map.of(
@@ -111,7 +110,7 @@ void shouldSerializeAMQPOperationBinding() throws IOException {
     }
 
     @Test
-    void shouldSerializeAMQPMessageBinding() throws IOException {
+    void shouldSerializeAMQPMessageBinding() throws Exception {
         var asyncapi = AsyncAPI.builder()
                 .channels(Map.of(
                         "userSignup",

springwolf-asyncapi/src/test/java/io/github/springwolf/asyncapi/v3/bindings/googlepubsub/GooglePubSubBindingTest.java

@@ -11,7 +11,6 @@
 import io.github.springwolf.asyncapi.v3.model.schema.MultiFormatSchema;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -21,7 +20,7 @@ class GooglePubSubBindingTest {
     private static final DefaultAsyncApiSerializerService serializer = new DefaultAsyncApiSerializerService();
 
     @Test
-    void shouldSerializeGooglePubSubMessage() throws IOException {
+    void shouldSerializeGooglePubSubMessage() throws Exception {
         var asyncapi = AsyncAPI.builder()
                 .components(Components.builder()
                         .messages(Map.of(
@@ -84,7 +83,7 @@ void shouldSerializeGooglePubSubMessage() throws IOException {
     }
 
     @Test
-    void shouldSerializeGooglePubSubChannel() throws IOException {
+    void shouldSerializeGooglePubSubChannel() throws Exception {
         var asyncapi = AsyncAPI.builder()
                 .channels(Map.of(
                         "topic-avro-schema",