fix test executions

anthonyraymond · Dec 21, 2021 · c6b347b · c6b347b
1 parent 7a92838
commit c6b347b
Show file tree

Hide file tree

Showing 82 changed files with 127 additions and 132 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.araymond.joal</groupId>
     <artifactId>jack-of-all-trades</artifactId>
-    <version>2.1.28</version>
+    <version>2.1.29</version>
     <packaging>jar</packaging>
 
     <name>jack-of-all-trades</name>
@@ -145,12 +145,6 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <!-- Version inherited from spring-boot-starter-test -->
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>

diff --git a/src/test/java/org/araymond/joal/StaticClientFilesTester.java b/src/test/java/org/araymond/joal/StaticClientFilesTester.java
@@ -11,7 +11,7 @@
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.ttorrent.client.ConnectionHandler;
 import org.araymond.joal.core.ttorrent.client.ConnectionHandlerTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Files;

diff --git a/src/test/java/org/araymond/joal/conf/SpringConfTest.java b/src/test/java/org/araymond/joal/conf/SpringConfTest.java
@@ -1,9 +1,8 @@
 package org.araymond.joal.conf;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.task.TaskExecutor;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
 public class SpringConfTest {

diff --git a/src/test/java/org/araymond/joal/core/CoreEventListenerTest.java b/src/test/java/org/araymond/joal/core/CoreEventListenerTest.java
@@ -1,6 +1,6 @@
 package org.araymond.joal.core;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

diff --git a/src/test/java/org/araymond/joal/core/bandwith/BandwidthDispatcherTest.java b/src/test/java/org/araymond/joal/core/bandwith/BandwidthDispatcherTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.bandwith;
 
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.util.ArrayList;

diff --git a/src/test/java/org/araymond/joal/core/bandwith/RandomSpeedProviderTest.java b/src/test/java/org/araymond/joal/core/bandwith/RandomSpeedProviderTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.bandwith;
 
 import org.araymond.joal.core.config.AppConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.util.Set;

diff --git a/src/test/java/org/araymond/joal/core/bandwith/TorrentSeedStatsTest.java b/src/test/java/org/araymond/joal/core/bandwith/TorrentSeedStatsTest.java
@@ -1,6 +1,6 @@
 package org.araymond.joal.core.bandwith;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/src/test/java/org/araymond/joal/core/bandwith/weight/PeersAwareWeightCalculatorTest.java b/src/test/java/org/araymond/joal/core/bandwith/weight/PeersAwareWeightCalculatorTest.java
@@ -2,7 +2,7 @@
 
 import org.araymond.joal.core.bandwith.Peers;
 import org.assertj.core.data.Offset;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/src/test/java/org/araymond/joal/core/bandwith/weight/WeightHolderTest.java b/src/test/java/org/araymond/joal/core/bandwith/weight/WeightHolderTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.bandwith.weight;
 
 import org.araymond.joal.core.bandwith.Peers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/.../java/org/araymond/joal/core/client/emulated/BitTorrentClientConfigSerializationTest.java b/.../java/org/araymond/joal/core/client/emulated/BitTorrentClientConfigSerializationTest.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage.RequestEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientConfigTest.java b/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientConfigTest.java
@@ -8,7 +8,7 @@
 import org.araymond.joal.core.client.emulated.generator.peerid.PeerIdGeneratorTest;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.util.AbstractMap;

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientProviderTest.java b/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientProviderTest.java
@@ -5,7 +5,7 @@
 import org.araymond.joal.core.SeedManager;
 import org.araymond.joal.core.config.JoalConfigProvider;
 import org.araymond.joal.core.config.JoalConfigProviderTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.io.FileNotFoundException;
@@ -47,21 +47,23 @@ public void shouldReturnSameClientEveryTimes() throws FileNotFoundException {
         final BitTorrentClientProvider provider = createProvider();
 
         assertThat(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get());
+                .usingRecursiveComparison()
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get());
     }
 
     @Test
     public void shouldChangeClientEveryTimesGenerateIsCalled() throws FileNotFoundException {
         final BitTorrentClientProvider provider = createProvider();
 
         assertThat(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get())
-                .isEqualToComparingFieldByField(provider.get());
+                .usingRecursiveComparison()
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get())
+                .isEqualTo(provider.get());
     }
 
     @Test

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientTest.java b/src/test/java/org/araymond/joal/core/client/emulated/BitTorrentClientTest.java
@@ -16,7 +16,7 @@
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.ttorrent.client.ConnectionHandler;
 import org.araymond.joal.core.ttorrent.client.ConnectionHandlerTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/HttpHeaderSerializationTest.java b/src/test/java/org/araymond/joal/core/client/emulated/HttpHeaderSerializationTest.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.araymond.joal.core.client.emulated.BitTorrentClientConfig.HttpHeader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
@@ -50,7 +50,7 @@ public void shouldDeserialize() throws IOException {
     @Test
     public void shouldSerializeAndDeserialize() throws IOException {
         final HttpHeader header = new HttpHeader("Connection", "close");
-        assertThat(mapper.readValue(mapper.writeValueAsString(header), HttpHeader.class)).isEqualToComparingFieldByField(header);
+        assertThat(mapper.readValue(mapper.writeValueAsString(header), HttpHeader.class)).usingRecursiveComparison().isEqualTo(header);
     }
 
 }
diff --git a/src/test/java/org/araymond/joal/core/client/emulated/HttpHeaderTest.java b/src/test/java/org/araymond/joal/core/client/emulated/HttpHeaderTest.java
@@ -1,6 +1,6 @@
 package org.araymond.joal.core.client.emulated;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.araymond.joal.core.client.emulated.BitTorrentClientConfig.HttpHeader;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...st/java/org/araymond/joal/core/client/emulated/generator/UrlEncoderSerializationTest.java b/...st/java/org/araymond/joal/core/client/emulated/generator/UrlEncoderSerializationTest.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.araymond.joal.core.client.emulated.utils.Casing;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/generator/UrlEncoderTest.java b/src/test/java/org/araymond/joal/core/client/emulated/generator/UrlEncoderTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator;
 
 import org.araymond.joal.core.client.emulated.utils.Casing;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

diff --git a/...a/org/araymond/joal/core/client/emulated/generator/key/AlwaysRefreshKeyGeneratorTest.java b/...a/org/araymond/joal/core/client/emulated/generator/key/AlwaysRefreshKeyGeneratorTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.nio.ByteBuffer;

diff --git a/...a/org/araymond/joal/core/client/emulated/generator/key/KeyGeneratorSerializationTest.java b/...a/org/araymond/joal/core/client/emulated/generator/key/KeyGeneratorSerializationTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.HashKeyAlgorithm;
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

diff --git a/src/test/java/org/araymond/joal/core/client/emulated/generator/key/KeyGeneratorTest.java b/src/test/java/org/araymond/joal/core/client/emulated/generator/key/KeyGeneratorTest.java
@@ -6,7 +6,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...va/org/araymond/joal/core/client/emulated/generator/key/NeverRefreshKeyGeneratorTest.java b/...va/org/araymond/joal/core/client/emulated/generator/key/NeverRefreshKeyGeneratorTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.nio.ByteBuffer;

diff --git a/...ore/client/emulated/generator/key/TimedOrAfterStartedAnnounceRefreshKeyGeneratorTest.java b/...ore/client/emulated/generator/key/TimedOrAfterStartedAnnounceRefreshKeyGeneratorTest.java
@@ -5,7 +5,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;

diff --git a/...va/org/araymond/joal/core/client/emulated/generator/key/TimedRefreshKeyGeneratorTest.java b/...va/org/araymond/joal/core/client/emulated/generator/key/TimedRefreshKeyGeneratorTest.java
@@ -5,7 +5,7 @@
 import org.araymond.joal.core.client.emulated.generator.key.algorithm.KeyAlgorithm;
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;

diff --git a/...ond/joal/core/client/emulated/generator/key/TorrentPersistentRefreshKeyGeneratorTest.java b/...ond/joal/core/client/emulated/generator/key/TorrentPersistentRefreshKeyGeneratorTest.java
@@ -6,7 +6,7 @@
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.torrent.torrent.MockedTorrent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;

diff --git a/...ymond/joal/core/client/emulated/generator/key/TorrentVolatileRefreshKeyGeneratorTest.java b/...ymond/joal/core/client/emulated/generator/key/TorrentVolatileRefreshKeyGeneratorTest.java
@@ -5,7 +5,7 @@
 import org.araymond.joal.core.client.emulated.utils.Casing;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.torrent.torrent.MockedTorrent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...ed/generator/key/algorithm/DigitRangeTransformedToHexWithoutLeadingZeroAlgorithmTest.java b/...ed/generator/key/algorithm/DigitRangeTransformedToHexWithoutLeadingZeroAlgorithmTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.key.algorithm;
 
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/.../org/araymond/joal/core/client/emulated/generator/key/algorithm/HashKeyAlgorithmTest.java b/.../org/araymond/joal/core/client/emulated/generator/key/algorithm/HashKeyAlgorithmTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.key.algorithm;
 
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/.../joal/core/client/emulated/generator/key/algorithm/HashNoLeadingZeroKeyAlgorithmTest.java b/.../joal/core/client/emulated/generator/key/algorithm/HashNoLeadingZeroKeyAlgorithmTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.key.algorithm;
 
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
 

diff --git a/...ymond/joal/core/client/emulated/generator/key/algorithm/RegexPatternKeyAlgorithmTest.java b/...ymond/joal/core/client/emulated/generator/key/algorithm/RegexPatternKeyAlgorithmTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.key.algorithm;
 
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...st/java/org/araymond/joal/core/client/emulated/generator/numwant/NumwantProviderTest.java b/...st/java/org/araymond/joal/core/client/emulated/generator/numwant/NumwantProviderTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.numwant;
 
 import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage.RequestEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/...araymond/joal/core/client/emulated/generator/peerid/AlwaysRefreshPeerIdGeneratorTest.java b/...araymond/joal/core/client/emulated/generator/peerid/AlwaysRefreshPeerIdGeneratorTest.java
@@ -3,7 +3,7 @@
 import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage.RequestEvent;
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.PeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.nio.ByteBuffer;

diff --git a/...org/araymond/joal/core/client/emulated/generator/peerid/NeverRefreshKeyGeneratorTest.java b/...org/araymond/joal/core/client/emulated/generator/peerid/NeverRefreshKeyGeneratorTest.java
@@ -3,7 +3,7 @@
 import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage.RequestEvent;
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.PeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.nio.ByteBuffer;

diff --git a/...araymond/joal/core/client/emulated/generator/peerid/PeerIdGeneratorSerializationTest.java b/...araymond/joal/core/client/emulated/generator/peerid/PeerIdGeneratorSerializationTest.java
@@ -1,7 +1,7 @@
 package org.araymond.joal.core.client.emulated.generator.peerid;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 

diff --git a/...est/java/org/araymond/joal/core/client/emulated/generator/peerid/PeerIdGeneratorTest.java b/...est/java/org/araymond/joal/core/client/emulated/generator/peerid/PeerIdGeneratorTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.RegexPatternPeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

diff --git a/.../araymond/joal/core/client/emulated/generator/peerid/TimedRefreshPeerIdGeneratorTest.java b/.../araymond/joal/core/client/emulated/generator/peerid/TimedRefreshPeerIdGeneratorTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.PeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;

diff --git a/...al/core/client/emulated/generator/peerid/TorrentPersistentRefreshPeerIdGeneratorTest.java b/...al/core/client/emulated/generator/peerid/TorrentPersistentRefreshPeerIdGeneratorTest.java
@@ -5,7 +5,7 @@
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.RegexPatternPeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.torrent.torrent.MockedTorrent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.time.LocalDateTime;

diff --git a/...joal/core/client/emulated/generator/peerid/TorrentVolatileRefreshPeerIdGeneratorTest.java b/...joal/core/client/emulated/generator/peerid/TorrentVolatileRefreshPeerIdGeneratorTest.java
@@ -4,7 +4,7 @@
 import org.araymond.joal.core.client.emulated.generator.peerid.generation.PeerIdAlgorithm;
 import org.araymond.joal.core.torrent.torrent.InfoHash;
 import org.araymond.joal.core.torrent.torrent.MockedTorrent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...lient/emulated/generator/peerid/generation/RandomPoolWithChecksumPeerIdAlgorithmTest.java b/...lient/emulated/generator/peerid/generation/RandomPoolWithChecksumPeerIdAlgorithmTest.java
@@ -2,7 +2,7 @@
 
 import org.araymond.joal.core.client.emulated.TorrentClientConfigIntegrityException;
 import org.araymond.joal.core.client.emulated.generator.peerid.PeerIdGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;