Stop using micronaut-platform and plugins for jackson test (#356)

micronaut-projects · Jan 10, 2024 · 42e5b51 · 42e5b51
1 parent 2c651c4
commit 42e5b51
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 47 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 micronaut-docs = "2.0.0"
 micronaut = "4.1.11"
-micronaut-platform = "4.1.6"
 micronaut-gradle-plugin = "4.1.2"
 groovy = "4.0.15"
 spock = "2.3-groovy-4.0"
@@ -24,7 +23,6 @@ micronaut-logging = "1.1.2"
 [libraries]
 # Core
 micronaut-core = { module = 'io.micronaut:micronaut-core-bom', version.ref = 'micronaut' }
-micronaut-platform = { module = 'io.micronaut.platform:micronaut-platform', version.ref = 'micronaut-platform' }
 micronaut-reactor = { module = "io.micronaut.reactor:micronaut-reactor-bom", version.ref = "micronaut-reactor" }
 micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
 micronaut-validation = { module = "io.micronaut.validation:micronaut-validation-bom", version.ref = "micronaut-validation" }

diff --git a/test-suite-jackson/build.gradle b/test-suite-jackson/build.gradle
@@ -1,29 +1,33 @@
 plugins {
-    id("io.micronaut.library")
-    id("io.micronaut.test-resources")
+    id 'java-library'
+    id 'groovy'
+    id("io.micronaut.build.internal.mqtt-tests")
 }
 
-version = "0.1"
-group = "example.micronaut"
-
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    annotationProcessor(mn.micronaut.inject.java)
+
     implementation(projects.micronautMqttv5)
+    implementation(mn.micronaut.inject)
     implementation(mn.micronaut.jackson.databind)
-    runtimeOnly(mn.snakeyaml)
+
     runtimeOnly(mnLogging.logback.classic)
 
+    testAnnotationProcessor(mn.micronaut.inject.java)
+
+    testImplementation(projects.testSuiteUtils)
+
     testImplementation(libs.awaitility)
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(mnTest.micronaut.test.junit5)
+
+    testRuntimeOnly(libs.junit.jupiter.engine)
 }
 
-micronaut {
-    version.set(libs.versions.micronaut.platform)
-    testRuntime("junit5")
-    processing {
-        incremental(true)
-        annotations("example.micronaut.*")
-    }
+tasks.named('test') {
+    useJUnitPlatform()
 }
diff --git a/test-suite-jackson/src/main/resources/application.yml b/test-suite-jackson/src/main/resources/application.yml
diff --git a/test-suite-jackson/src/test/java/example/micronaut/AbstractMQTTTest.java b/test-suite-jackson/src/test/java/example/micronaut/AbstractMQTTTest.java
@@ -0,0 +1,37 @@
+package example.micronaut;
+
+import io.micronaut.context.ApplicationContext;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public abstract class AbstractMQTTTest {
+
+    protected static GenericContainer mqttContainer = new GenericContainer(DockerImageName.parse("eclipse-mosquitto:1.6.12"))
+            .withExposedPorts(1883)
+            .waitingFor(new LogMessageWaitStrategy().withRegEx("(?s).*mosquitto version 1.6.12 running.*"))
+            .withClasspathResourceMapping("mosquitto.conf",
+                    "/mosquitto/config/mosquitto.conf",
+                    BindMode.READ_ONLY);
+
+    static {
+        mqttContainer.start();
+    }
+
+    protected ApplicationContext startContext() {
+        return ApplicationContext.run(getConfiguration(), "test");
+    }
+
+    protected Map<String, Object> getConfiguration() {
+        Map<String, Object> config = new HashMap<>();
+        config.put("mqtt.client.server-uri", "tcp://localhost:" + mqttContainer.getMappedPort(1883));
+        config.put("mqtt.client.client-id", UUID.randomUUID().toString());
+        config.put("spec.name", this.getClass().getSimpleName());
+        return config;
+    }
+}
diff --git a/test-suite-jackson/src/test/java/example/micronaut/SubscriptionTest.java b/test-suite-jackson/src/test/java/example/micronaut/SubscriptionTest.java
@@ -1,32 +1,29 @@
 package example.micronaut;
 
+import io.micronaut.context.ApplicationContext;
 import io.micronaut.mqtt.annotation.Topic;
 import io.micronaut.mqtt.annotation.v5.MqttPublisher;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
-import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@MicronautTest
-class SubscriptionTest {
-
-    @Inject
-    SmellClient client;
-
-    @Inject
-    SmellListener listener;
+class SubscriptionTest extends AbstractMQTTTest {
 
     @Test
     void checkSubscriptionsAreReceived() {
-        client.publishLivingroomSmell(new Odour("cheesy"));
+        try(ApplicationContext applicationContext = startContext()) {
+            SmellClient client = applicationContext.getBean(SmellClient.class);
+            SmellListener listener = applicationContext.getBean(SmellListener.class);
+
+            client.publishLivingroomSmell(new Odour("cheesy"));
 
-        await()
-            .atMost(5, TimeUnit.SECONDS)
-            .untilAsserted(() -> assertEquals("cheesy", listener.getSmell()));
+            await()
+                .atMost(5, TimeUnit.SECONDS)
+                .untilAsserted(() -> assertEquals("cheesy", listener.getSmell()));
+        }
     }
 
     @MqttPublisher