chore: avoid http requests from test suite

pajlads · Mar 6, 2025 · 9c04a65 · 9c04a65
1 parent d516450
commit 9c04a65
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/dinkplugin/message/DiscordMessageHandler.java b/src/main/java/dinkplugin/message/DiscordMessageHandler.java
@@ -128,6 +128,7 @@ public void createMessage(String webhookUrl, boolean sendImage, @NonNull Notific
             .filter(StringUtils::isNotBlank)
             .map(HttpUrl::parse)
             .filter(Objects::nonNull)
+            .filter(url -> !"example.com".equalsIgnoreCase(url.host()))
             .collect(Collectors.toList());
         if (urlList.isEmpty()) return;
 

diff --git a/src/test/java/dinkplugin/notifiers/ExternalPluginNotifierTest.java b/src/test/java/dinkplugin/notifiers/ExternalPluginNotifierTest.java
@@ -45,11 +45,11 @@ protected void setUp() {
     @Test
     void testNotify() {
         // fire event
-        plugin.onPluginMessage(new PluginMessage("dink", "notify", samplePayload("https://example.com/")));
+        plugin.onPluginMessage(new PluginMessage("dink", "notify", samplePayload(null)));
 
         // verify notification
         verifyCreateMessage(
-            "https://example.com/",
+            PRIMARY_WEBHOOK_URL,
             false,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -71,14 +71,14 @@ void testNotify() {
     @Test
     void testNoReplacements() {
         // fire event
-        var payload = samplePayload("https://example.com/");
+        var payload = samplePayload(null);
         payload.remove("replacements");
         payload.put("text", "text with no replacements");
         plugin.onPluginMessage(new PluginMessage("dink", "notify", payload));
 
         // verify notification
         verifyCreateMessage(
-            "https://example.com/",
+            PRIMARY_WEBHOOK_URL,
             false,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -98,14 +98,14 @@ void testNoReplacements() {
     @Test
     void testMissingReplacement() {
         // fire event
-        var payload = samplePayload("https://example.com/");
+        var payload = samplePayload(null);
         payload.remove("replacements");
         payload.put("text", "text with no custom replacement %USERNAME%");
         plugin.onPluginMessage(new PluginMessage("dink", "notify", payload));
 
         // verify notification
         verifyCreateMessage(
-            "https://example.com/",
+            PRIMARY_WEBHOOK_URL,
             false,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -126,14 +126,14 @@ void testMissingReplacement() {
     @Test
     void testPatternWithoutReplacement() {
         // fire event
-        var payload = samplePayload("https://example.com/");
+        var payload = samplePayload(null);
         payload.remove("replacements");
         payload.put("text", "text with no custom replacement %XD%");
         plugin.onPluginMessage(new PluginMessage("dink", "notify", payload));
 
         // verify notification
         verifyCreateMessage(
-            "https://example.com/",
+            PRIMARY_WEBHOOK_URL,
             false,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -154,7 +154,7 @@ void testPatternWithoutReplacement() {
     @Test
     void testFallbackUrl() {
         // update config mocks
-        String url = "https://discord.com/example";
+        String url = "https://example.com/";
         when(config.externalWebhook()).thenReturn(url);
 
         // fire event
@@ -191,7 +191,7 @@ void testImage() {
 
         // verify notification
         verifyCreateMessage(
-            null,
+            PRIMARY_WEBHOOK_URL,
             true,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -221,7 +221,7 @@ void testRequestImage() {
 
         // verify notification
         verifyCreateMessage(
-            null,
+            PRIMARY_WEBHOOK_URL,
             true,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)
@@ -254,7 +254,7 @@ void testRequestImageDenied() {
 
         // verify notification
         verifyCreateMessage(
-            null,
+            PRIMARY_WEBHOOK_URL,
             false,
             NotificationBody.builder()
                 .type(NotificationType.EXTERNAL_PLUGIN)

diff --git a/src/test/java/dinkplugin/notifiers/MockedNotifierTest.java b/src/test/java/dinkplugin/notifiers/MockedNotifierTest.java
@@ -180,7 +180,7 @@ protected void verifyCreateMessage(String url, boolean image, NotificationBody<?
         Mockito.verify(messageHandler).createMessage(url, image, body);
 
         // wait for http calls to complete
-        if (url != null && !url.isEmpty()) {
+        if (url != null && !url.isEmpty() && !"https://example.com/".equals(url)) {
             Dispatcher dispatcher = httpClient.dispatcher();
             while (dispatcher.queuedCallsCount() > 0 || dispatcher.runningCallsCount() > 0) {
                 // noinspection BusyWait - comply with discord's undocumented 30/60s ratelimit