Merge pull request #6619 from napoly/upgrade_junit4_to_junit5_jupiter

Replacing JUnit4 with JUnit5 Jupiter
bisq-network · May 7, 2023 · b907769 · b907769
2 parents d177491 + e19ffe2
commit b907769
Show file tree

Hide file tree

Showing 252 changed files with 1,476 additions and 1,500 deletions.
diff --git a/apitest/src/test/java/bisq/apitest/JUnitHelper.java b/apitest/src/test/java/bisq/apitest/JUnitHelper.java
diff --git a/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java b/apitest/src/test/java/bisq/apitest/scenario/OfferTest.java
@@ -20,8 +20,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -84,7 +84,7 @@ public void testCreateOfferUsingMarketPriceMargin() {
         test.testCreateUSDBTCBuyOfferWithTriggerPrice();
     }
 
-    @Ignore
+    @Disabled
     @Test
     @Order(5)
     public void testCreateBSQOffers() {

diff --git a/assets/build.gradle b/assets/build.gradle
@@ -15,4 +15,6 @@ dependencies {
     implementation libs.google.guava
     implementation libs.apache.commons.lang3
     implementation libs.slf4j.api
+    testImplementation libs.hamcrest
+    testImplementation libs.junit.jupiter.api
 }
diff --git a/assets/src/test/java/bisq/asset/AbstractAssetTest.java b/assets/src/test/java/bisq/asset/AbstractAssetTest.java
@@ -17,10 +17,10 @@
 
 package bisq.asset;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Abstract base class for all {@link Asset} unit tests. Subclasses must implement the

diff --git a/assets/src/test/java/bisq/asset/coins/ActiniumTest.java b/assets/src/test/java/bisq/asset/coins/ActiniumTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ActiniumTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/AdeptioTest.java b/assets/src/test/java/bisq/asset/coins/AdeptioTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AdeptioTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/AeonTest.java b/assets/src/test/java/bisq/asset/coins/AeonTest.java
@@ -18,7 +18,7 @@
  package bisq.asset.coins;
 
  import bisq.asset.AbstractAssetTest;
- import org.junit.Test;
+ import org.junit.jupiter.api.Test;
 
  public class AeonTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/AmitycoinTest.java b/assets/src/test/java/bisq/asset/coins/AmitycoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AmitycoinTest extends AbstractAssetTest {
 
@@ -45,4 +45,4 @@ public void testInvalidAddresses() {
         assertInvalidAddress("KEKlulzlksadfwe");
         assertInvalidAddress("HOleeSheetdsdjqwqwpoo3");
     }
-}  
+}
diff --git a/assets/src/test/java/bisq/asset/coins/AnimecoinTest.java b/assets/src/test/java/bisq/asset/coins/AnimecoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AnimecoinTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/ArqmaTest.java b/assets/src/test/java/bisq/asset/coins/ArqmaTest.java
@@ -18,7 +18,7 @@
  package bisq.asset.coins;
 
  import bisq.asset.AbstractAssetTest;
- import org.junit.Test;
+ import org.junit.jupiter.api.Test;
 
  public class ArqmaTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/AskcoinTest.java b/assets/src/test/java/bisq/asset/coins/AskcoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AskcoinTest extends AbstractAssetTest {
 
@@ -45,4 +45,4 @@ public void testInvalidAddresses() {
         assertInvalidAddress("null");
         assertInvalidAddress("xidjfwi23ii0");
     }
-}
+}
diff --git a/assets/src/test/java/bisq/asset/coins/AustraliacashTest.java b/assets/src/test/java/bisq/asset/coins/AustraliacashTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AustraliacashTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BSQTest.java b/assets/src/test/java/bisq/asset/coins/BSQTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BSQTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BeamTest.java b/assets/src/test/java/bisq/asset/coins/BeamTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BeamTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BitDaricTest.java b/assets/src/test/java/bisq/asset/coins/BitDaricTest.java
@@ -16,7 +16,7 @@
  */
 package bisq.asset.coins;
 import bisq.asset.AbstractAssetTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 public class BitDaricTest extends AbstractAssetTest {
     public BitDaricTest() {
         super(new BitDaric());

diff --git a/assets/src/test/java/bisq/asset/coins/BitcoinRhodiumTest.java b/assets/src/test/java/bisq/asset/coins/BitcoinRhodiumTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BitcoinRhodiumTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BitcoinTest.java b/assets/src/test/java/bisq/asset/coins/BitcoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BitcoinTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BitmarkTest.java b/assets/src/test/java/bisq/asset/coins/BitmarkTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BitmarkTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BitzecTest.java b/assets/src/test/java/bisq/asset/coins/BitzecTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BitzecTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BlurTest.java b/assets/src/test/java/bisq/asset/coins/BlurTest.java
@@ -18,7 +18,7 @@
  package bisq.asset.coins;
 
  import bisq.asset.AbstractAssetTest;
- import org.junit.Test;
+ import org.junit.jupiter.api.Test;
 
  public class BlurTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/BurntBlackCoinTest.java b/assets/src/test/java/bisq/asset/coins/BurntBlackCoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 import java.util.Collections;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BurntBlackCoinTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/CRowdCLassicTest.java b/assets/src/test/java/bisq/asset/coins/CRowdCLassicTest.java
@@ -20,7 +20,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CRowdCLassicTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/CTSCoinTest.java b/assets/src/test/java/bisq/asset/coins/CTSCoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CTSCoinTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/Cash2Test.java b/assets/src/test/java/bisq/asset/coins/Cash2Test.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AbstractAssetTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Cash2Test extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/ChauchaTest.java b/assets/src/test/java/bisq/asset/coins/ChauchaTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ChauchaTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/CloakCoinTest.java b/assets/src/test/java/bisq/asset/coins/CloakCoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CloakCoinTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/CreditsTest.java b/assets/src/test/java/bisq/asset/coins/CreditsTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CreditsTest extends AbstractAssetTest {
 
@@ -43,4 +43,4 @@ public void testInvalidAddresses() {
         assertInvalidAddress("CcbqU3MLZuGAED2CuhUkquyJxKaSJqv6V6#");
         assertInvalidAddress("bKaig5pznaUgiLqe6WkoCNGagNMhNLtqhKkggg");
     }
-}
+}
diff --git a/assets/src/test/java/bisq/asset/coins/CroatTest.java b/assets/src/test/java/bisq/asset/coins/CroatTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CroatTest extends AbstractAssetTest {
 
@@ -35,7 +35,7 @@ public void testValidAddresses() {
     }
 
     @Test
-    public void testInvalidAddresses() { 
+    public void testInvalidAddresses() {
         assertInvalidAddress("ZsZ46x2mzB3GhjrC2Lt7oZ4Efmj8USUjVM7Bdz8B8EF6bQwN84NzSti7RwLZcFoZG5NR1iaiZY8GP2KwumVc1jGzHLvBzAv");
         assertInvalidAddress("");
         assertInvalidAddress("CjxZDcoWCsx1wmYkmJcFpSTgqpjoFGRW9dQT8JqgwvkBaU6Q3X4MJ4QjV#NUM7GHp6NjYaTrKeH4bSRTK3mCYsHf2818vzv");

diff --git a/assets/src/test/java/bisq/asset/coins/DSTRATest.java b/assets/src/test/java/bisq/asset/coins/DSTRATest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DSTRATest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/DarkPayTest.java b/assets/src/test/java/bisq/asset/coins/DarkPayTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DarkPayTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/DashTest.java b/assets/src/test/java/bisq/asset/coins/DashTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DashTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/DeepOnionTest.java b/assets/src/test/java/bisq/asset/coins/DeepOnionTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DeepOnionTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/DextroTest.java b/assets/src/test/java/bisq/asset/coins/DextroTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DextroTest extends AbstractAssetTest {
 

diff --git a/assets/src/test/java/bisq/asset/coins/DogecoinTest.java b/assets/src/test/java/bisq/asset/coins/DogecoinTest.java
@@ -19,7 +19,7 @@
 
 import bisq.asset.AbstractAssetTest;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DogecoinTest extends AbstractAssetTest {