mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only display range if a amount or volume range is set

Browse Source
This commit is contained in:
Christoph Atteneder 2018-02-15 15:24:52 +01:00
parent 3d51f9dda5
commit ad7bb42012
No known key found for this signature in database
GPG Key ID: CD5DC1C529CDFD3B
2 changed files with 88 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gui/src/main/java/io/bisq/gui/util/BSFormatter.java
View File

@ -303,7 +303,16 @@ public class BSFormatter {
}
public String formatMinVolumeAndVolume(Offer offer) {
return formatVolume(offer.getMinVolume()) + " - " + formatVolume(offer.getVolume());
String volume = "";
if (offer.getMinVolume() != null) {
if (offer.getMinVolume().equals(offer.getVolume())) {
volume = formatVolume(offer.getVolume());
} else {
volume = formatVolume(offer.getMinVolume()) + " - " + formatVolume(offer.getVolume());
}
}
return volume;
}
@ -316,7 +325,16 @@ public class BSFormatter {
}
public String formatAmountWithMinAmount(Offer offer) {
return formatCoin(offer.getMinAmount()) + " - " + formatCoin(offer.getAmount());
String amount = "";
if (offer.getMinAmount() != null) {
if (offer.getMinAmount().equals(offer.getAmount())) {
amount = formatCoin(offer.getAmount());
} else {
amount = formatCoin(offer.getMinAmount()) + " - " + formatCoin(offer.getAmount());
}
}
return amount;
}

69
gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java
View File

@ -18,21 +18,31 @@
package io.bisq.gui.util;
import io.bisq.common.locale.Res;
import io.bisq.common.monetary.Volume;
import io.bisq.core.offer.Offer;
import org.bitcoinj.core.Coin;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
@PrepareForTest(Offer.class)
public class BSFormatterTest {
private BSFormatter formatter;
@Before
public void setup() {
public void setUp() {
Locale.setDefault(new Locale("en", "US"));
formatter = new BSFormatter();
Res.setBaseCurrencyCode("BTC");
@ -67,4 +77,61 @@ public class BSFormatterTest {
assertEquals("", formatter.formatDurationAsWords(0));
assertTrue(formatter.formatDurationAsWords(0).isEmpty());
}
@Test
public void testFormatSameVolume() {
Offer offer = mock(Offer.class);
Volume btc = Volume.parse("0.10", "BTC");
when(offer.getMinVolume()).thenReturn(btc);
when(offer.getVolume()).thenReturn(btc);
assertEquals("0.10000000", formatter.formatMinVolumeAndVolume(offer));
}
@Test
public void testFormatDifferentVolume() {
Offer offer = mock(Offer.class);
Volume btcMin = Volume.parse("0.10", "BTC");
Volume btcMax = Volume.parse("0.25", "BTC");
when(offer.getMinVolume()).thenReturn(btcMin);
when(offer.getVolume()).thenReturn(btcMax);
assertEquals("0.10000000 - 0.25000000", formatter.formatMinVolumeAndVolume(offer));
}
@Test
public void testFormatNullVolume() {
Offer offer = mock(Offer.class);
when(offer.getMinVolume()).thenReturn(null);
when(offer.getVolume()).thenReturn(null);
assertEquals("", formatter.formatMinVolumeAndVolume(offer));
}
@Test
public void testFormatSameAmount() {
Offer offer = mock(Offer.class);
when(offer.getMinAmount()).thenReturn(Coin.valueOf(10000000));
when(offer.getAmount()).thenReturn(Coin.valueOf(10000000));
assertEquals("0.10", formatter.formatAmountWithMinAmount(offer));
}
@Test
public void testFormatDifferentAmount() {
Offer offer = mock(Offer.class);
when(offer.getMinAmount()).thenReturn(Coin.valueOf(10000000));
when(offer.getAmount()).thenReturn(Coin.valueOf(20000000));
assertEquals("0.10 - 0.20", formatter.formatAmountWithMinAmount(offer));
}
@Test
public void testFormatNullAmount() {
Offer offer = mock(Offer.class);
when(offer.getMinAmount()).thenReturn(null);
when(offer.getAmount()).thenReturn(null);
assertEquals("", formatter.formatAmountWithMinAmount(offer));
}
}