Promote shared test utilities to rqueue-test-util main sources

sonus21 · sonus21 · commit 3034d966a34b · 2026-05-01T08:14:49.000+05:30
The Redis-only service-impl tests that just moved to rqueue-redis depend on @CoreUnitTest, TestUtils, RqueueMessageTestUtils, and a few static helpers on QueueStatisticsTest — all of which lived in rqueue-core/src/test and were therefore invisible to other modules' test classpaths. Move the cross-module pieces into rqueue-test-util/src/main so any module already depending on rqueue-test-util as testImplementation picks them up: - CoreUnitTest, TestUtils, RqueueMessageTestUtils → rqueue-test-util/main - QueueStatisticsFixtures (extracted from QueueStatisticsTest static helpers) → rqueue-test-util/main; QueueStatisticsTest now delegates to it rqueue-test-util gains a compileOnly dep on rqueue-core (the shared utils reference QueueDetail/QueueConfig/RqueueMessage etc.) and an api dep on mockito-junit-jupiter so @CoreUnitTest's @ExtendWith(MockitoExtension.class) resolves from main sources. No runtime cycle: rqueue-core's main has no dep on rqueue-test-util — only its tests do. Add explicit imports for RqueueSystemManagerService / RqueueMessageMetadataService / RqueueQDetailService / RqueueDashboardChartService / RqueueUtilityService in the moved Redis tests; before the move they were in the same package as the service interfaces, so no imports were needed. Assisted-By: Claude Code
diff --git a/rqueue-core/src/test/java/com/github/sonus21/rqueue/models/db/QueueStatisticsTest.java b/rqueue-core/src/test/java/com/github/sonus21/rqueue/models/db/QueueStatisticsTest.java
@@ -16,10 +16,12 @@
 
 package com.github.sonus21.rqueue.models.db;
 
+import static com.github.sonus21.rqueue.models.db.QueueStatisticsFixtures.addData;
+import static com.github.sonus21.rqueue.models.db.QueueStatisticsFixtures.checkNonNull;
+import static com.github.sonus21.rqueue.models.db.QueueStatisticsFixtures.validate;
 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.junit.jupiter.api.Assertions.assertTrue;
 
 import com.github.sonus21.TestBase;
 import com.github.sonus21.rqueue.CoreUnitTest;
@@ -31,34 +33,6 @@ public class QueueStatisticsTest extends TestBase {
 
   private final String id = "__rq::q-stat::slow-queue";
 
-  public static void validate(QueueStatistics queueStatistics, int count) {
-    assertEquals(count, queueStatistics.getJobRunTime().size());
-    assertEquals(count, queueStatistics.getTasksSuccessful().size());
-    assertEquals(count, queueStatistics.getTasksDiscarded().size());
-    assertEquals(count, queueStatistics.getTasksMovedToDeadLetter().size());
-    assertEquals(count, queueStatistics.getTasksRetried().size());
-  }
-
-  public static void checkNonNull(QueueStatistics queueStatistics, String date) {
-    assertNotNull(queueStatistics.jobRunTime(date));
-    assertTrue(queueStatistics.tasksSuccessful(date) > 0);
-    assertTrue(queueStatistics.tasksDiscarded(date) > 0);
-    assertTrue(queueStatistics.tasksMovedToDeadLetter(date) > 0);
-    assertTrue(queueStatistics.tasksRetried(date) > 0);
-  }
-
-  public static void addData(QueueStatistics queueStatistics, LocalDate localDate, int day) {
-    String date = localDate.minusDays(day).toString();
-    int val = 1 + (int) (Math.random() * 100);
-    queueStatistics.incrementSuccessful(date, val);
-    queueStatistics.incrementDiscard(date, val);
-    queueStatistics.incrementDeadLetter(date, val);
-    queueStatistics.incrementRetry(date, val);
-    int val2 = 1 + (int) (Math.random() * 100);
-    JobRunTime jobRunTime = new JobRunTime(val, val2, val * val2, val2);
-    queueStatistics.updateJobExecutionTime(date, jobRunTime);
-  }
-
   @Test
   void incrementDeadLetter() {
     QueueStatistics queueStatistics = new QueueStatistics(id);
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueDashboardChartServiceTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueDashboardChartServiceTest.java
@@ -31,7 +31,7 @@
 import com.github.sonus21.rqueue.dao.RqueueQStatsDao;
 import com.github.sonus21.rqueue.models.db.JobRunTime;
 import com.github.sonus21.rqueue.models.db.QueueStatistics;
-import com.github.sonus21.rqueue.models.db.QueueStatisticsTest;
+import com.github.sonus21.rqueue.models.db.QueueStatisticsFixtures;
 import com.github.sonus21.rqueue.models.enums.AggregationType;
 import com.github.sonus21.rqueue.models.enums.ChartDataType;
 import com.github.sonus21.rqueue.models.enums.ChartType;
@@ -50,6 +50,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 
 @Slf4j
 @CoreUnitTest
@@ -225,7 +227,7 @@ void getDashboardChartDataLatencyDaily() {
     QueueStatistics queueStatistics = new QueueStatistics(id);
     LocalDate localDate = DateTimeUtils.today();
     for (int i = 0; i < rqueueWebConfig.getHistoryDay(); i++) {
-      QueueStatisticsTest.addData(queueStatistics, localDate, i);
+      QueueStatisticsFixtures.addData(queueStatistics, localDate, i);
     }
     doReturn(Collections.singletonList(queueStatistics))
         .when(rqueueQStatsDao)
@@ -263,7 +265,7 @@ void getDashboardChartDataStatsDaily() {
     QueueStatistics queueStatistics = new QueueStatistics(id);
     LocalDate localDate = DateTimeUtils.today();
     for (int i = 0; i < rqueueWebConfig.getHistoryDay(); i++) {
-      QueueStatisticsTest.addData(queueStatistics, localDate, i);
+      QueueStatisticsFixtures.addData(queueStatistics, localDate, i);
     }
     doReturn(Collections.singletonList(queueStatistics))
         .when(rqueueQStatsDao)
@@ -301,7 +303,7 @@ void getDashboardChartDataStatsDailyMissingDays() {
     QueueStatistics queueStatistics = new QueueStatistics(id);
     LocalDate localDate = DateTimeUtils.today();
     for (int i = 10; i < rqueueWebConfig.getHistoryDay() - 10; i++) {
-      QueueStatisticsTest.addData(queueStatistics, localDate, i);
+      QueueStatisticsFixtures.addData(queueStatistics, localDate, i);
     }
     doReturn(Collections.singletonList(queueStatistics))
         .when(rqueueQStatsDao)
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueMessageMetadataServiceTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueMessageMetadataServiceTest.java
@@ -49,6 +49,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueMessageMetadataServiceTest extends TestBase {
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceBrokerRoutingTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceBrokerRoutingTest.java
@@ -52,6 +52,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueQDetailServiceBrokerRoutingTest extends TestBase {
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceTest.java
@@ -70,6 +70,9 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.messaging.converter.MessageConverter;
+import com.github.sonus21.rqueue.web.service.RqueueQDetailService;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueQDetailServiceTest extends TestBase {
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceImplTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceImplTest.java
@@ -14,7 +14,7 @@
  *
  */
 
-package com.github.sonus21.rqueue.redis.web.service.impl;
+package com.github.sonus21.rqueue.redis.web.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -39,6 +39,7 @@
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
+import com.github.sonus21.rqueue.redis.web.service.impl.RqueueSystemManagerServiceImpl;
 import com.github.sonus21.rqueue.utils.TestUtils;
 import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 import java.util.Arrays;
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceTest.java
@@ -44,6 +44,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueSystemManagerServiceTest extends TestBase {
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueUtilityServiceTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueUtilityServiceTest.java
@@ -57,6 +57,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
+import com.github.sonus21.rqueue.service.RqueueUtilityService;
 
 @CoreUnitTest
 class RqueueUtilityServiceTest extends TestBase {
diff --git a/rqueue-test-util/build.gradle b/rqueue-test-util/build.gradle
@@ -30,4 +30,13 @@ dependencies {
     api "org.hibernate.orm:hibernate-core:${hibernateCoreVersion}"
 
     api "com.athaydes.javanna:javanna:1.1"
+
+    // Needed so shared test-utility classes (e.g. @CoreUnitTest) can reference Mockito's
+    // JUnit Jupiter extension from main sources.
+    api "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
+
+    // Test fixtures that ship from main sources (TestUtils, QueueStatisticsFixtures) reference
+    // model and service types from rqueue-core. Marked compileOnly to avoid a hard runtime
+    // coupling — every consumer of rqueue-test-util already has rqueue-core on its classpath.
+    compileOnly project(":rqueue-core")
 }
diff --git a/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/CoreUnitTest.java b/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/CoreUnitTest.java
diff --git a/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/models/db/QueueStatisticsFixtures.java b/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/models/db/QueueStatisticsFixtures.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2020-2026 Sonu Kumar
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.github.sonus21.rqueue.models.db;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+
+/**
+ * Shared fixture helpers for {@link QueueStatistics}. Lives in {@code rqueue-test-util/src/main}
+ * so it can be consumed by both {@code rqueue-core}'s tests and downstream backend modules
+ * ({@code rqueue-redis}, {@code rqueue-nats}) that exercise dashboard/chart code.
+ */
+public final class QueueStatisticsFixtures {
+
+  private QueueStatisticsFixtures() {}
+
+  public static void validate(QueueStatistics queueStatistics, int count) {
+    assertEquals(count, queueStatistics.getJobRunTime().size());
+    assertEquals(count, queueStatistics.getTasksSuccessful().size());
+    assertEquals(count, queueStatistics.getTasksDiscarded().size());
+    assertEquals(count, queueStatistics.getTasksMovedToDeadLetter().size());
+    assertEquals(count, queueStatistics.getTasksRetried().size());
+  }
+
+  public static void checkNonNull(QueueStatistics queueStatistics, String date) {
+    assertNotNull(queueStatistics.jobRunTime(date));
+    assertTrue(queueStatistics.tasksSuccessful(date) > 0);
+    assertTrue(queueStatistics.tasksDiscarded(date) > 0);
+    assertTrue(queueStatistics.tasksMovedToDeadLetter(date) > 0);
+    assertTrue(queueStatistics.tasksRetried(date) > 0);
+  }
+
+  public static void addData(QueueStatistics queueStatistics, LocalDate localDate, int day) {
+    String date = localDate.minusDays(day).toString();
+    int val = 1 + (int) (Math.random() * 100);
+    queueStatistics.incrementSuccessful(date, val);
+    queueStatistics.incrementDiscard(date, val);
+    queueStatistics.incrementDeadLetter(date, val);
+    queueStatistics.incrementRetry(date, val);
+    int val2 = 1 + (int) (Math.random() * 100);
+    JobRunTime jobRunTime = new JobRunTime(val, val2, val * val2, val2);
+    queueStatistics.updateJobExecutionTime(date, jobRunTime);
+  }
+}
diff --git a/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/utils/RqueueMessageTestUtils.java b/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/utils/RqueueMessageTestUtils.java
diff --git a/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/utils/TestUtils.java b/rqueue-test-util/src/main/java/com/github/sonus21/rqueue/utils/TestUtils.java
