fix build on jdk11 and jdk12. remove powermock and jmockit

build.gradle

@@ -1,7 +1,7 @@
-if(JavaVersion.current() != JavaVersion.VERSION_1_10){
+/*if(JavaVersion.current() != JavaVersion.VERSION_1_10){
 // feel free to delete this if you know what you are doing
     throw new GradleException("This build must be run with java 10. see docs/build.md")
-}
+}*/
 buildscript {
     repositories {
         jcenter()
@@ -40,7 +40,7 @@ configure(subprojects) {
         bitcoinjVersion = 'a88d36d'
         logbackVersion = '1.1.10'
         lombokVersion = '1.18.2'
-        mockitoVersion = '2.21.0'
+        mockitoVersion = '3.0.0'
         powermockVersion = '2.0.0-beta.5'
         protobufVersion = '3.5.1'
         slf4jVersion = '1.7.22'
@@ -251,10 +251,7 @@ configure(project(':core')) {
 
         testCompile "org.jmockit:jmockit:$jmockitVersion"
         testCompile("org.mockito:mockito-core:$mockitoVersion") {
-            exclude(module: 'objenesis')
         }
-        testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
-        testCompile "org.powermock:powermock-api-mockito2:$powermockVersion"
         testCompile "org.springframework:spring-test:$springVersion"
         testCompile "com.natpryce:make-it-easy:$easyVersion"
         testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
@@ -309,7 +306,6 @@ configure(project(':desktop')) {
 
         testCompile "org.jmockit:jmockit:$jmockitVersion"
         testCompile("org.mockito:mockito-core:$mockitoVersion") {
-            exclude(module: 'objenesis')
         }
         testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
         testCompile "org.powermock:powermock-api-mockito2:$powermockVersion"

core/src/main/java/bisq/core/dao/governance/period/PeriodService.java

@@ -32,7 +32,7 @@
 import javax.annotation.Nullable;
 
 @Slf4j
-public final class PeriodService {
+public class PeriodService {
     private final DaoStateService daoStateService;
 
 

core/src/main/java/bisq/core/offer/OfferPayload.java

@@ -51,7 +51,7 @@
 @EqualsAndHashCode
 @Getter
 @Slf4j
-public final class OfferPayload implements ProtectedStoragePayload, ExpirablePayload, RequiresOwnerIsOnlinePayload {
+public class OfferPayload implements ProtectedStoragePayload, ExpirablePayload, RequiresOwnerIsOnlinePayload {
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Enum

core/src/main/java/bisq/core/user/Preferences.java

@@ -76,7 +76,7 @@
 
 @Slf4j
 @Singleton
-public final class Preferences implements PersistedDataHost, BridgeAddressProvider {
+public class Preferences implements PersistedDataHost, BridgeAddressProvider {
 
     private static final ArrayList<BlockChainExplorer> BTC_MAIN_NET_EXPLORERS = new ArrayList<>(Arrays.asList(
             new BlockChainExplorer("Blockstream.info", "https://blockstream.info/tx/", "https://blockstream.info/address/"),

core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java

@@ -21,19 +21,9 @@
 
 import bisq.network.p2p.NodeAddress;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.security.Security;
-
 import java.util.ArrayList;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
@@ -42,9 +32,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({User.class, ArbitratorService.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class ArbitratorManagerTest {
 
 

core/src/test/java/bisq/core/btc/TxFeeEstimationServiceTest.java

@@ -24,9 +24,6 @@
 
 import java.util.List;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -36,8 +33,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@PrepareForTest(BtcWalletService.class)
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class TxFeeEstimationServiceTest {
 
     @Test

core/src/test/java/bisq/core/btc/nodes/BtcNodesSetupPreferencesTest.java

@@ -22,12 +22,7 @@
 
 import java.util.List;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.CUSTOM;
 import static bisq.core.btc.nodes.BtcNodes.BitcoinNodesOption.PUBLIC;
@@ -36,9 +31,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(Preferences.class)
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class BtcNodesSetupPreferencesTest {
     @Test
     public void testSelectPreferredNodesWhenPublicOption() {

core/src/test/java/bisq/core/dao/governance/ballot/BallotListServiceTest.java

@@ -11,20 +11,14 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({PeriodService.class, ProposalPayload.class, ProposalValidatorProvider.class})
 public class BallotListServiceTest {
     @Test
     @SuppressWarnings("unchecked")

core/src/test/java/bisq/core/dao/state/DaoStateSnapshotServiceTest.java

@@ -20,22 +20,14 @@
 import bisq.core.dao.governance.period.CycleService;
 import bisq.core.dao.monitoring.DaoStateMonitoringService;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({DaoStateService.class, GenesisTxInfo.class, CycleService.class, DaoStateStorageService.class, DaoStateMonitoringService.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class DaoStateSnapshotServiceTest {
 
     private DaoStateSnapshotService daoStateSnapshotService;

core/src/test/java/bisq/core/offer/OfferTest.java

@@ -17,21 +17,13 @@
 
 package bisq.core.offer;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(OfferPayload.class)
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class OfferTest {
 
     @Test

core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java

@@ -9,22 +9,14 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static bisq.core.offer.OfferMaker.btcUsdOffer;
 import static com.natpryce.makeiteasy.MakeItEasy.make;
 import static junit.framework.TestCase.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({P2PService.class, PeerManager.class, OfferBookService.class, Storage.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class OpenOfferManagerTest {
 
     @Test

core/src/test/java/bisq/core/payment/PaymentAccountsTest.java

@@ -28,12 +28,7 @@
 import java.util.Set;
 import java.util.function.BiFunction;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -42,9 +37,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({PaymentAccount.class, AccountAgeWitness.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class PaymentAccountsTest {
     @Test
     public void testGetOldestPaymentAccountForOfferWhenNoValidAccounts() {

core/src/test/java/bisq/core/payment/ReceiptPredicatesTest.java

@@ -23,21 +23,13 @@
 
 import com.google.common.collect.Lists;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({NationalBankAccount.class, SepaAccount.class, SepaInstantAccount.class, PaymentMethod.class, SameBankAccount.class, SpecificBanksAccount.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class ReceiptPredicatesTest {
     private final ReceiptPredicates predicates = new ReceiptPredicates();
 

core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java

@@ -20,24 +20,15 @@
 import bisq.core.offer.Offer;
 import bisq.core.payment.payload.PaymentMethod;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({SpecificBanksAccount.class, SameBankAccount.class, NationalBankAccount.class,
-        MoneyGramAccount.class, WesternUnionAccount.class, CashDepositAccount.class, PaymentMethod.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class ReceiptValidatorTest {
     private ReceiptValidator validator;
     private PaymentAccount account;

core/src/test/java/bisq/core/payment/TradeLimitsTest.java

@@ -20,17 +20,11 @@
 import bisq.core.dao.governance.period.PeriodService;
 import bisq.core.dao.state.DaoStateService;
 
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({DaoStateService.class, PeriodService.class})
 public class TradeLimitsTest {
     @Test
     public void testGetFirstMonthRiskBasedTradeLimit() {

core/src/test/java/bisq/core/trade/TradableListTest.java

@@ -23,20 +23,19 @@
 
 import bisq.common.storage.Storage;
 
-import mockit.Mocked;
-
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
 import static protobuf.PersistableEnvelope.MessageCase.TRADABLE_LIST;
 
-//TODO cannot be run in IntelliJ IDE as parameter is not supported. OfferPayload is final so it is not so trivial to
-// replace that.
 public class TradableListTest {
 
     @Test
-    public void protoTesting(@Mocked OfferPayload offerPayload) {
+    public void protoTesting() {
+        OfferPayload offerPayload = mock(OfferPayload.class, RETURNS_DEEP_STUBS);
         Storage<TradableList<OpenOffer>> storage = new Storage<>(null, null);
         TradableList<OpenOffer> openOfferTradableList = new TradableList<>(storage, "filename");
         protobuf.PersistableEnvelope message = (protobuf.PersistableEnvelope) openOfferTradableList.toProtoMessage();

core/src/test/java/bisq/core/user/PreferencesTest.java

@@ -34,13 +34,8 @@
 import java.util.List;
 import java.util.Locale;
 
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -49,9 +44,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({Storage.class, PreferencesPayload.class, BisqEnvironment.class})
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class PreferencesTest {
 
     private Preferences preferences;

core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline

desktop/src/main/java/bisq/desktop/main/offer/MakerFeeMaker.java

@@ -0,0 +1,13 @@
+package bisq.desktop.main.offer;
+
+import bisq.core.btc.wallet.BsqWalletService;
+import bisq.core.offer.OfferUtil;
+import bisq.core.user.Preferences;
+
+import org.bitcoinj.core.Coin;
+
+public class MakerFeeMaker {
+    public Coin getMakerFee(BsqWalletService bsqWalletService, Preferences preferences, Coin amount) {
+        return OfferUtil.getMakerFee(bsqWalletService, preferences, amount);
+    }
+}