Refactored junit toolbox transitive dependencites to avoid conflicts

ably · Mar 5, 2024 · da107a9 · da107a9
1 parent 2fcf94e
commit da107a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,5 +13,9 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:1.10.19'
     testImplementation 'net.jodah:concurrentunit:0.4.2'
     testImplementation 'org.slf4j:slf4j-simple:1.7.30'
-    testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
+    testImplementation('com.googlecode.junit-toolbox:junit-toolbox:2.4') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-library'
+        exclude group: 'junit', module: 'junit'
+        exclude group: 'org.mockito', module: 'mockito-core'
+    }
 }
diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeChannelTest.java
@@ -1672,7 +1672,7 @@ public void channel_invalid_resume_reattach_channels() throws AblyException {
 
             AblyRealtime finalAbly = ably;
             Exception conditionError = new Helpers.ConditionalWaiter().
-                wait(() -> finalAbly.connection.connectionManager.msgSerial == 0, 5000);
+                wait(() -> finalAbly.connection.connectionManager.msgSerial == 0, 10000);
             assertNull(conditionError);
 
             attachedChannelWaiter.waitFor(ChannelState.attaching, ChannelState.attached);

diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeSuite.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeSuite.java
@@ -44,7 +44,6 @@ public static void tearDownAfterClass() throws Exception {
     }
 
     public static void main(String[] args) {
-        System.setProperty("maxParallelTestThreads", "4");
         Result result = JUnitCore.runClasses(RealtimeSuite.class);
         for(Failure failure : result.getFailures()) {
           System.out.println("Failed :: "+ failure.toString());