Use DI for validators, add @Deprecated/TODOs,

This commit is contained in:
Manfred Karrer 2014-09-11 11:17:11 +02:00
parent 964c4ada9e
commit bd5f8d0020
34 changed files with 120 additions and 91 deletions

View file

@ -22,8 +22,8 @@ import io.bitsquare.gui.main.trade.createoffer.CreateOfferPMTest;
import io.bitsquare.gui.util.BSFormatterTest;
import io.bitsquare.gui.util.BitSquareConverterTest;
import io.bitsquare.gui.util.BitSquareNumberValidatorTest;
import io.bitsquare.gui.util.BtcValidatorTest;
import io.bitsquare.gui.util.FiatValidatorTest;
import io.bitsquare.gui.util.validation.BtcValidatorTest;
import io.bitsquare.gui.util.validation.FiatValidatorTest;
import io.bitsquare.msg.P2PNodeTest;
import org.junit.runner.RunWith;

View file

@ -19,6 +19,8 @@ package io.bitsquare.gui.main.trade.createoffer;
import io.bitsquare.bank.BankAccountType;
import io.bitsquare.gui.util.BSFormatter;
import io.bitsquare.gui.util.validation.BtcValidator;
import io.bitsquare.gui.util.validation.FiatValidator;
import io.bitsquare.locale.Country;
import com.google.bitcoin.core.Coin;
@ -47,7 +49,7 @@ public class CreateOfferPMTest {
BSFormatter.setLocale(Locale.US);
BSFormatter.setFiatCurrencyCode("USD");
presenter = new CreateOfferPM(model);
presenter = new CreateOfferPM(model, new FiatValidator(null), new BtcValidator());
presenter.initialized();
}

View file

@ -15,9 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.util;
import io.bitsquare.gui.util.validation.BtcValidator;
package io.bitsquare.gui.util.validation;
import com.google.bitcoin.core.Coin;
import com.google.bitcoin.core.NetworkParameters;

View file

@ -15,10 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.util;
import io.bitsquare.gui.util.validation.FiatValidator;
import io.bitsquare.gui.util.validation.NumberValidator;
package io.bitsquare.gui.util.validation;
import org.junit.Test;
@ -27,7 +24,7 @@ import static org.junit.Assert.*;
public class FiatValidatorTest {
@Test
public void testValidate() {
FiatValidator validator = new FiatValidator();
FiatValidator validator = new FiatValidator(null);
NumberValidator.ValidationResult validationResult;