add input validators

This commit is contained in:
Manfred Karrer 2014-08-27 21:25:49 +02:00
parent 223b32e603
commit 7fee8b665e
15 changed files with 284 additions and 136 deletions

View file

@ -17,8 +17,9 @@
package io.bitsquare;
import io.bitsquare.btc.BtcValidatorTest;
import io.bitsquare.btc.RestrictionsTest;
import io.bitsquare.gui.trade.createoffer.CreateOfferPresenterTest;
import io.bitsquare.gui.util.BSFormatterTest;
import io.bitsquare.gui.util.BitSquareConverterTest;
import io.bitsquare.gui.util.BitSquareNumberValidatorTest;
import io.bitsquare.gui.util.FiatValidatorTest;
@ -29,13 +30,14 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
BtcValidatorTest.class,
RestrictionsTest.class,
BitSquareConverterTest.class,
BitSquareNumberValidatorTest.class,
P2PNodeTest.class,
FiatValidatorTest.class,
BtcValidatorTest.class,
CreateOfferPresenterTest.class
RestrictionsTest.class,
CreateOfferPresenterTest.class,
BSFormatterTest.class
})
public class BitSquareTestSuite {

View file

@ -24,25 +24,25 @@ import org.junit.Test;
import static org.junit.Assert.*;
public class BtcValidatorTest {
public class RestrictionsTest {
@Test
public void testIsMinSpendableAmount() {
Coin amount = null;
assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertFalse("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
amount = Coin.ZERO;
assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertFalse("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
amount = FeePolicy.TX_FEE;
assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertFalse("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
amount = Transaction.MIN_NONDUST_OUTPUT;
assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertFalse("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
amount = FeePolicy.TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT);
assertFalse("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertFalse("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
amount = FeePolicy.TX_FEE.add(Transaction.MIN_NONDUST_OUTPUT).add(Coin.valueOf(1));
assertTrue("tx unfunded, pending", BtcValidator.isMinSpendableAmount(amount));
assertTrue("tx unfunded, pending", Restrictions.isMinSpendableAmount(amount));
}
}

View file

@ -42,17 +42,17 @@ public class CreateOfferPresenterTest {
BSFormatter.setLocale(Locale.US);
BSFormatter.setFiatCurrencyCode("USD");
CreateOfferPresenter presenter = new CreateOfferPresenter(model);
presenter.onViewInitialized();
model.collateralAsLong.set(100);
presenter.price.set("500");
presenter.amount.set("1");
assertEquals("500.00", presenter.volume.get());
assertEquals(Coin.COIN, model.amountAsCoin);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.tradeVolumeAsFiat);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.volumeAsFiat);
assertEquals(Coin.parseCoin("0.1011"), model.totalToPayAsCoin.get());
presenter.price.set("500");
@ -60,28 +60,28 @@ public class CreateOfferPresenterTest {
assertEquals("1.00", presenter.amount.get());
assertEquals(Coin.COIN, model.amountAsCoin);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.tradeVolumeAsFiat);
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.volumeAsFiat);
presenter.price.set("300");
presenter.volume.set("1000");
assertEquals("3.3333", presenter.amount.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.volumeAsFiat);
presenter.price.set("300");
presenter.amount.set("3.3333");
assertEquals("999.99", presenter.volume.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.volumeAsFiat);
presenter.price.set("300");
presenter.amount.set("3.33333333");
assertEquals("999.99", presenter.volume.get());
assertEquals(Coin.parseCoin("3.3333"), model.amountAsCoin);
assertEquals(Fiat.valueOf("USD", 300 * 10000), model.priceAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.tradeVolumeAsFiat);
assertEquals(Fiat.valueOf("USD", 9999900), model.volumeAsFiat);
model.collateralAsLong.set(100);
@ -117,6 +117,10 @@ public class CreateOfferPresenterTest {
model.acceptedCountries.add(new Country(null, "Spain", null));
assertEquals("Italy, Spain", presenter.acceptedCountries.get());
}

View file

@ -0,0 +1,80 @@
/*
* This file is part of Bitsquare.
*
* Bitsquare is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bitsquare is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.util;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.bitsquare.gui.util.BSFormatter.*;
import static org.junit.Assert.*;
public class BSFormatterTest {
private static final Logger log = LoggerFactory.getLogger(BSFormatterTest.class);
@Test
public void testParseToBtcWith4Decimals() {
assertEquals("0", parseToBtcWith4Decimals("0").toPlainString());
assertEquals("0", parseToBtcWith4Decimals(null).toPlainString());
assertEquals("0", parseToBtcWith4Decimals("s").toPlainString());
assertEquals("0.0012", parseToBtcWith4Decimals("0.00123").toPlainString());
assertEquals("0.0013", parseToBtcWith4Decimals("0.00125").toPlainString());
assertEquals("0.0013", parseToBtcWith4Decimals("0,00125").toPlainString());
}
@Test
public void testHasBtcValidDecimals() {
assertTrue(hasBtcValidDecimals(null));
assertTrue(hasBtcValidDecimals("0"));
assertTrue(hasBtcValidDecimals("0,0001"));
assertTrue(hasBtcValidDecimals("0.0001"));
assertTrue(hasBtcValidDecimals("0.0009"));
assertTrue(hasBtcValidDecimals("20000000.0001"));
assertFalse(hasBtcValidDecimals("20000000.000123"));
assertFalse(hasBtcValidDecimals("0.00012"));
assertFalse(hasBtcValidDecimals("0.0001222312312312313"));
}
@Test
public void testParseToFiatWith2Decimals() {
assertEquals("0", parseToFiatWith2Decimals("0").toPlainString());
assertEquals("0", parseToFiatWith2Decimals(null).toPlainString());
assertEquals("0", parseToFiatWith2Decimals("s").toPlainString());
assertEquals("0.12", parseToFiatWith2Decimals("0.123").toPlainString());
assertEquals("0.13", parseToFiatWith2Decimals("0.125").toPlainString());
assertEquals("0.13", parseToFiatWith2Decimals("0,125").toPlainString());
}
@Test
public void testHasFiatValidDecimals() {
assertTrue(hasFiatValidDecimals(null));
assertTrue(hasFiatValidDecimals("0"));
assertTrue(hasFiatValidDecimals("0,01"));
assertTrue(hasFiatValidDecimals("0.01"));
assertTrue(hasFiatValidDecimals("0.09"));
assertTrue(hasFiatValidDecimals("20000000.01"));
assertFalse(hasFiatValidDecimals("20000000.0123"));
assertFalse(hasFiatValidDecimals("0.012"));
assertFalse(hasFiatValidDecimals("0.01222312312312313"));
}
}