Merge pull request #2 from rMozg/develop

tests + some fixes

Author: rMozg

app/src/main/java/ru/mozgovoy/oleg/exchangerate/model/MyApplication.java

@@ -4,6 +4,8 @@
 
 import ru.mozgovoy.oleg.exchangerate.model.exchange.ConverterEngine;
 import ru.mozgovoy.oleg.exchangerate.model.exchange.IConverterEngine;
+import ru.mozgovoy.oleg.exchangerate.model.math.IMathEngine;
+import ru.mozgovoy.oleg.exchangerate.model.math.MathEngine;
 import ru.mozgovoy.oleg.exchangerate.model.network.INetworkHelper;
 import ru.mozgovoy.oleg.exchangerate.model.network.NetworkHelper;
 import ru.mozgovoy.oleg.exchangerate.model.storage.IStorage;
@@ -15,6 +17,7 @@ public class MyApplication extends Application {
     private IStorage storage;
     private IConverterEngine converterEngine;
     private INetworkHelper networkHelper;
+    private IMathEngine mathEngine;
 
     public static MyApplication getInstance() {
         return myApplication;
@@ -27,6 +30,7 @@ public void onCreate() {
         storage = new SharedPreferenceEngine(getApplicationContext());
         converterEngine = new ConverterEngine();
         networkHelper = new NetworkHelper();
+        mathEngine = new MathEngine();
     }
 
     public IStorage getStorage() {
@@ -40,4 +44,8 @@ public IConverterEngine getConverterEngine() {
     public INetworkHelper getNetworkHelper() {
         return networkHelper;
     }
+
+    public IMathEngine getMathEngine() {
+        return mathEngine;
+    }
 }

app/src/main/java/ru/mozgovoy/oleg/exchangerate/model/math/IMathEngine.java

@@ -0,0 +1,13 @@
+package ru.mozgovoy.oleg.exchangerate.model.math;
+
+import android.support.annotation.NonNull;
+
+import java.math.BigDecimal;
+
+import ru.mozgovoy.oleg.exchangerate.model.core.CurrencyRate;
+
+
+public interface IMathEngine {
+    @NonNull
+    BigDecimal convertCurrency(@NonNull BigDecimal value, @NonNull CurrencyRate currencyRateFrom, @NonNull CurrencyRate currencyRateTo);
+}

app/src/main/java/ru/mozgovoy/oleg/exchangerate/model/math/MathEngine.java

@@ -0,0 +1,24 @@
+package ru.mozgovoy.oleg.exchangerate.model.math;
+
+import android.support.annotation.NonNull;
+
+import java.math.BigDecimal;
+
+import ru.mozgovoy.oleg.exchangerate.model.core.CurrencyRate;
+
+public class MathEngine implements IMathEngine {
+
+    private static final int MATH_SCALE = 10;
+
+    @Override
+    @NonNull
+    public BigDecimal convertCurrency(@NonNull BigDecimal value, @NonNull CurrencyRate currencyRateFrom, @NonNull CurrencyRate currencyRateTo) {
+        return value
+                .multiply(currencyRateFrom.getValue())
+                .multiply(new BigDecimal(currencyRateTo.getNominal()))
+                .divide(new BigDecimal(currencyRateFrom.getNominal())
+                                .multiply(currencyRateTo.getValue()),
+                        MATH_SCALE,
+                        BigDecimal.ROUND_HALF_UP);
+    }
+}

app/src/main/java/ru/mozgovoy/oleg/exchangerate/model/network/INetworkHelper.java

@@ -4,5 +4,5 @@
 
 public interface INetworkHelper {
     @Nullable
-    String downloadFileToString(String address);
+    String downloadFileToString(String address, boolean utf);
 }

app/src/main/java/ru/mozgovoy/oleg/exchangerate/model/network/NetworkHelper.java

@@ -11,7 +11,7 @@ public class NetworkHelper implements INetworkHelper {
 
     @Override
     @Nullable
-    public String downloadFileToString(String address) {
+    public String downloadFileToString(String address, boolean utf) {
         String xmlString = null;
         HttpURLConnection urlConnection = null;
         try {
@@ -20,7 +20,7 @@ public String downloadFileToString(String address) {
             urlConnection.setRequestMethod("GET");
             if (urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
                 StringBuilder xmlResponse = new StringBuilder();
-                BufferedReader input = new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), "CP1251"), 8192);
+                BufferedReader input = new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), utf ? "UTF8" : "CP1251"), 8192);
                 String strLine = null;
                 while ((strLine = input.readLine()) != null) {
                     xmlResponse.append(strLine);

app/src/main/java/ru/mozgovoy/oleg/exchangerate/service/DownloadService.java

@@ -46,7 +46,7 @@ protected void onHandleIntent(Intent intent) {
     }
 
     private void startDownloadInService(INetworkHelper networkHelper, ResultReceiver resultReceiver) {
-        String curXml = networkHelper.downloadFileToString(CURRENCY_RATE_ADDRESS);
+        String curXml = networkHelper.downloadFileToString(CURRENCY_RATE_ADDRESS, false);
         Bundle result = new Bundle();
         result.putString(RatePresenter.DownloadResultReceiver.RESULT_OK_PARAM_XML_TEXT, curXml);
         resultReceiver.send(RatePresenter.DownloadResultReceiver.RESULT_OK, result);

app/src/main/java/ru/mozgovoy/oleg/exchangerate/ui/presenter/RatePresenter.java

@@ -17,26 +17,27 @@
 import ru.mozgovoy.oleg.exchangerate.model.core.Currency;
 import ru.mozgovoy.oleg.exchangerate.model.core.CurrencyRate;
 import ru.mozgovoy.oleg.exchangerate.model.exchange.IConverterEngine;
+import ru.mozgovoy.oleg.exchangerate.model.math.IMathEngine;
 import ru.mozgovoy.oleg.exchangerate.model.storage.IStorage;
 import ru.mozgovoy.oleg.exchangerate.service.DownloadService;
 import ru.mozgovoy.oleg.exchangerate.ui.view.IRateView;
 
 public class RatePresenter implements IRatePresenter {
 
-    private static final int MATH_SCALE = 6;
-
     private final CurrencyRate alwaysInListCurrencyRate;
     private final IRateView rateView;
     private final IStorage storage;
     private final IConverterEngine converterEngine;
+    private final IMathEngine mathEngine;
     private final Map<Currency, CurrencyRate> currencyRates = new ConcurrentHashMap<>();
 
 
     public RatePresenter(
             @NonNull Resources resources,
             @NonNull IRateView rateView,
             @NonNull IStorage storage,
-            @NonNull IConverterEngine converterEngine
+            @NonNull IConverterEngine converterEngine,
+            @NonNull IMathEngine mathEngine
     ) {
         alwaysInListCurrencyRate = new CurrencyRate(
                 new Currency(
@@ -47,6 +48,7 @@ public RatePresenter(
         this.rateView = rateView;
         this.storage = storage;
         this.converterEngine = converterEngine;
+        this.mathEngine = mathEngine;
         refreshCurrencyRatesMap(storage.getCurrencyRates());
         rateView.setCurrency(new ArrayList<Currency>(currencyRates.keySet()));
     }
@@ -85,13 +87,8 @@ public void startRecalculate(@NonNull BigDecimal value, @NonNull Currency curren
             rateView.showError(IRateView.ErrorType.CALCULATE);
             return;
         }
-        BigDecimal res = value
-                .multiply(currencyRateFrom.getValue())
-                .multiply(new BigDecimal(currencyRateTo.getNominal()))
-                .divide(new BigDecimal(currencyRateFrom.getNominal())
-                                .multiply(currencyRateTo.getValue()),
-                        MATH_SCALE,
-                        BigDecimal.ROUND_HALF_UP);
+
+        BigDecimal res = mathEngine.convertCurrency(value, currencyRateFrom, currencyRateTo);
         rateView.showRecalculatedValue(res);
     }
 

app/src/main/java/ru/mozgovoy/oleg/exchangerate/ui/view/RateActivity.java

@@ -65,7 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 getResources(),
                 this,
                 MyApplication.getInstance().getStorage(),
-                MyApplication.getInstance().getConverterEngine()
+                MyApplication.getInstance().getConverterEngine(),
+                MyApplication.getInstance().getMathEngine()
         );
         ratePresenter.startDownloadNewRates(getApplicationContext());
 
@@ -167,7 +168,7 @@ public void setCurrency(List<Currency> currencies) {
 
     @Override
     public void showRecalculatedValue(BigDecimal value) {
-        textTo.setText(value.setScale(MAX_SCALE, BigDecimal.ROUND_HALF_UP).toPlainString());
+        textTo.setText(value.setScale(MAX_SCALE, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString());
     }
 
     @Override