From 8b735d17b7ae03d54aedb13775213e5af86db64b Mon Sep 17 00:00:00 2001 From: woodser Date: Wed, 24 May 2023 10:02:40 -0400 Subject: [PATCH] fix npe formatting offer volume with negative market rate --- .../main/offer/MutableOfferViewModel.java | 3 ++ .../preferences/PreferencesViewModelTest.java | 32 +++++++++---------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java index 794de065..59708184 100644 --- a/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java +++ b/desktop/src/main/java/haveno/desktop/main/offer/MutableOfferViewModel.java @@ -1221,6 +1221,9 @@ public abstract class MutableOfferViewModel ext } void updateButtonDisableState() { + dataModel.calculateVolume(); + dataModel.calculateTotalToPay(); + boolean inputDataValid = isXmrInputValid(amount.get()).isValid && isXmrInputValid(minAmount.get()).isValid && isPriceInputValid(price.get()).isValid && diff --git a/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java b/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java index 9424d4ec..1224905d 100644 --- a/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java +++ b/desktop/src/test/java/haveno/desktop/main/settings/preferences/PreferencesViewModelTest.java @@ -17,10 +17,10 @@ package haveno.desktop.main.settings.preferences; +import haveno.core.support.dispute.arbitration.arbitrator.Arbitrator; +import haveno.core.support.dispute.arbitration.arbitrator.ArbitratorManager; import haveno.core.support.dispute.mediation.mediator.Mediator; import haveno.core.support.dispute.mediation.mediator.MediatorManager; -import haveno.core.support.dispute.refund.refundagent.RefundAgent; -import haveno.core.support.dispute.refund.refundagent.RefundAgentManager; import haveno.core.user.Preferences; import haveno.desktop.maker.PreferenceMakers; import haveno.network.p2p.NodeAddress; @@ -40,9 +40,9 @@ public class PreferencesViewModelTest { @Test public void getArbitrationLanguages() { - RefundAgentManager refundAgentManager = mock(RefundAgentManager.class); + ArbitratorManager arbitratorAgentManager = mock(ArbitratorManager.class); - final ObservableMap refundAgents = FXCollections.observableHashMap(); + final ObservableMap arbitrators = FXCollections.observableHashMap(); ArrayList languagesOne = new ArrayList<>() {{ add("en"); @@ -54,20 +54,20 @@ public class PreferencesViewModelTest { add("es"); }}; - RefundAgent one = new RefundAgent(new NodeAddress("refundAgent:1"), null, languagesOne, 0L, + Arbitrator one = new Arbitrator(new NodeAddress("refundAgent:1"), null, languagesOne, 0L, null, null, null, null, null); - RefundAgent two = new RefundAgent(new NodeAddress("refundAgent:2"), null, languagesTwo, 0L, + Arbitrator two = new Arbitrator(new NodeAddress("refundAgent:2"), null, languagesTwo, 0L, null, null, null, null, null); - refundAgents.put(one.getNodeAddress(), one); - refundAgents.put(two.getNodeAddress(), two); + arbitrators.put(one.getNodeAddress(), one); + arbitrators.put(two.getNodeAddress(), two); Preferences preferences = PreferenceMakers.empty; - when(refundAgentManager.getObservableMap()).thenReturn(refundAgents); + when(arbitratorAgentManager.getObservableMap()).thenReturn(arbitrators); - PreferencesViewModel model = new PreferencesViewModel(preferences, refundAgentManager, null); + PreferencesViewModel model = new PreferencesViewModel(preferences, arbitratorAgentManager, null); assertEquals("English, Deutsch, español", model.getArbitrationLanguages()); } @@ -111,13 +111,13 @@ public class PreferencesViewModelTest { public void needsSupportLanguageWarning_forNotSupportedLanguageInArbitration() { MediatorManager mediationManager = mock(MediatorManager.class); - RefundAgentManager refundAgentManager = mock(RefundAgentManager.class); + ArbitratorManager arbitratorManager = mock(ArbitratorManager.class); Preferences preferences = PreferenceMakers.empty; - when(refundAgentManager.isAgentAvailableForLanguage(preferences.getUserLanguage())).thenReturn(false); + when(arbitratorManager.isAgentAvailableForLanguage(preferences.getUserLanguage())).thenReturn(false); - PreferencesViewModel model = new PreferencesViewModel(preferences, refundAgentManager, mediationManager); + PreferencesViewModel model = new PreferencesViewModel(preferences, arbitratorManager, mediationManager); assertTrue(model.needsSupportLanguageWarning()); } @@ -126,14 +126,14 @@ public class PreferencesViewModelTest { public void needsSupportLanguageWarning_forNotSupportedLanguageInMediation() { MediatorManager mediationManager = mock(MediatorManager.class); - RefundAgentManager refundAgentManager = mock(RefundAgentManager.class); + ArbitratorManager arbitratorManager = mock(ArbitratorManager.class); Preferences preferences = PreferenceMakers.empty; - when(refundAgentManager.isAgentAvailableForLanguage(preferences.getUserLanguage())).thenReturn(true); + when(arbitratorManager.isAgentAvailableForLanguage(preferences.getUserLanguage())).thenReturn(true); when(mediationManager.isAgentAvailableForLanguage(preferences.getUserLanguage())).thenReturn(false); - PreferencesViewModel model = new PreferencesViewModel(preferences, refundAgentManager, mediationManager); + PreferencesViewModel model = new PreferencesViewModel(preferences, arbitratorManager, mediationManager); assertTrue(model.needsSupportLanguageWarning()); }