junit4->5

vergecurrency · Jul 27, 2024 · 95671d0 · 95671d0
1 parent 5f6d075
commit 95671d0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -17,6 +17,7 @@ dependencies {
     api 'com.google.code.findbugs:jsr305:3.0.2'
     api 'com.madgag.spongycastle:core:1.58.0.0'
     api 'com.lambdaworks:scrypt:1.4.0'
+    api 'org.junit.jupiter:junit-jupiter-api:5.8.2'
     api 'com.google.protobuf:protobuf-java:3.25.3'
     api 'org.slf4j:slf4j-jdk14:2.0.13'
     api 'org.json:json:20240303'

diff --git a/core/src/test/java/com/vergepay/core/coins/nxt/NxtFamilyTest.java b/core/src/test/java/com/vergepay/core/coins/nxt/NxtFamilyTest.java
@@ -15,7 +15,7 @@
 import org.bitcoinj.crypto.MnemonicException;
 import org.bitcoinj.store.UnreadableWalletException;
 import org.bitcoinj.wallet.DeterministicSeed;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.spongycastle.util.encoders.Hex;
 
 import java.io.UnsupportedEncodingException;

diff --git a/core/src/test/java/com/vergepay/core/wallet/families/bitcoin/BitAddressTest.java b/core/src/test/java/com/vergepay/core/wallet/families/bitcoin/BitAddressTest.java
@@ -11,7 +11,7 @@
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.script.Script;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/core/src/test/java/com/vergepay/core/wallet/families/nxt/NxtFamilyWalletTest.java b/core/src/test/java/com/vergepay/core/wallet/families/nxt/NxtFamilyWalletTest.java
@@ -11,7 +11,6 @@
 import com.vergepay.core.coins.nxt.Transaction;
 import com.vergepay.core.coins.nxt.TransactionImpl;
 import com.vergepay.core.protos.Protos;
-import com.vergepay.core.wallet.SendRequest;
 import com.vergepay.core.wallet.Wallet;
 import com.vergepay.core.wallet.WalletAccount;
 
@@ -23,8 +22,8 @@
 import org.bitcoinj.crypto.MnemonicException;
 import org.bitcoinj.store.UnreadableWalletException;
 import org.bitcoinj.wallet.DeterministicSeed;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
 import org.spongycastle.crypto.params.KeyParameter;
 import org.spongycastle.util.encoders.Hex;
 
@@ -53,7 +52,7 @@ public class NxtFamilyWalletTest {
     NxtFamilyWallet nxtAccount;
     NxtFamilyWallet otherAccount;
 
-    @Before
+    @BeforeEach
     public void setup() throws MnemonicException, UnreadableWalletException {
         DeterministicSeed seed = new DeterministicSeed(recoveryPhrase, null, "", 0);
         DeterministicKey masterKey = HDKeyDerivation.createMasterPrivateKey(seed.getSeedBytes());
@@ -75,7 +74,7 @@ public void serializeUnencryptedNormal() throws Exception {
     }
 
 
-    @Test
+    @org.junit.jupiter.api.Test
     public void testAccountLegacyNXT() throws UnsupportedEncodingException {
         byte[] pub = nxtAccount.getPublicKey();
         long id = Account.getId(pub);
@@ -85,7 +84,7 @@ public void testAccountLegacyNXT() throws UnsupportedEncodingException {
         assertEquals(nxtAccountId, id);
     }
 
-    @Test
+    @org.junit.jupiter.api.Test
     public void testHDAccountNxt() throws MnemonicException {
         byte[] privateKey = nxtAccount.rootKey.getPrivateKey();
         byte[] publicKey = nxtAccount.getPublicKey();

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -71,6 +71,9 @@ android {
         }
         resources {
             excludes += ['lib/x86_64/darwin/libscrypt.dylib']
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+            merges += "META-INF/LICENSE.md"
+            merges += "META-INF/LICENSE-notice.md"
         }
     }