History tests

app/src/main/java/org/solovyev/android/calculator/entities/BaseEntitiesRegistry.java

@@ -28,22 +28,25 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Handler;
 import android.support.annotation.NonNull;
+
 import com.squareup.otto.Bus;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.solovyev.android.Check;
-import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.App;
+import org.solovyev.android.calculator.AppModule;
+import org.solovyev.android.calculator.CalculatorApplication;
+import org.solovyev.android.calculator.EntitiesRegistry;
+import org.solovyev.android.calculator.ErrorReporter;
 import org.solovyev.android.calculator.json.Json;
 import org.solovyev.android.calculator.json.Jsonable;
 import org.solovyev.android.io.FileSaver;
+import org.solovyev.android.io.FileSystem;
 import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathEntity;
 import org.solovyev.common.math.MathRegistry;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,6 +55,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
+
 public abstract class BaseEntitiesRegistry<T extends MathEntity> implements EntitiesRegistry<T> {
 
     @Nonnull
@@ -73,6 +81,8 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity> implements Enti
     @Inject
     public ErrorReporter errorReporter;
     @Inject
+    public FileSystem fileSystem;
+    @Inject
     @Named(AppModule.THREAD_BACKGROUND)
     public Executor backgroundThread;
     @Inject
@@ -132,7 +142,7 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity> implements Enti
             return Collections.emptyList();
         }
         try {
-            return Json.load(file, creator);
+            return Json.load(file, fileSystem, creator);
         } catch (IOException | JSONException e) {
             errorReporter.onException(e);
         }

app/src/main/java/org/solovyev/android/calculator/history/History.java

@@ -22,27 +22,32 @@
 
 package org.solovyev.android.calculator.history;
 
+import static android.text.TextUtils.isEmpty;
+
 import android.app.Application;
 import android.content.SharedPreferences;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
+
 import com.google.common.base.Strings;
 import com.squareup.otto.Bus;
 import com.squareup.otto.Subscribe;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.solovyev.android.Check;
-import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.AppModule;
+import org.solovyev.android.calculator.Calculator;
+import org.solovyev.android.calculator.Display;
+import org.solovyev.android.calculator.DisplayState;
+import org.solovyev.android.calculator.Editor;
+import org.solovyev.android.calculator.EditorState;
 import org.solovyev.android.calculator.Engine.Preferences;
+import org.solovyev.android.calculator.ErrorReporter;
 import org.solovyev.android.calculator.json.Json;
-import org.solovyev.android.io.FileSaver;
+import org.solovyev.android.io.FileSystem;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -51,12 +56,15 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.Executor;
 
-import static android.text.TextUtils.isEmpty;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
 
 @Singleton
 public class History {
 
-    public static final String TAG = App.subTag("History");
     public static final String OLD_HISTORY_PREFS_KEY = "org.solovyev.android.calculator.CalculatorModel_history";
     private static final ClearedEvent CLEARED_EVENT_RECENT = new ClearedEvent(true);
     private static final ClearedEvent CLEARED_EVENT_SAVED = new ClearedEvent(false);
@@ -84,6 +92,8 @@ public class History {
     @Inject
     ErrorReporter errorReporter;
     @Inject
+    FileSystem fileSystem;
+    @Inject
     @Named(AppModule.THREAD_BACKGROUND)
     Executor backgroundThread;
     @Inject
@@ -91,7 +101,7 @@ public class History {
     File filesDir;
 
     @Nullable
-    static List<HistoryState> convertOldHistory(@NonNull String xml) {
+    static List<HistoryState> convertOldHistory(@NonNull String xml) throws Exception {
         final OldHistory history = OldHistory.fromXml(xml);
         if (history == null) {
             // strange, history seems to be broken. Avoid clearing the preference
@@ -172,12 +182,12 @@ public class History {
     }
 
     @NonNull
-    private File getSavedHistoryFile() {
+    File getSavedHistoryFile() {
         return new File(filesDir, "history-saved.json");
     }
 
     @NonNull
-    private File getRecentHistoryFile() {
+    File getRecentHistoryFile() {
         return new File(filesDir, "history-recent.json");
     }
 
@@ -192,9 +202,9 @@ public class History {
                 return;
             }
             final JSONArray json = Json.toJson(states);
-            FileSaver.save(getSavedHistoryFile(), json.toString());
+            fileSystem.write(getSavedHistoryFile(), json.toString());
             preferences.edit().remove(OLD_HISTORY_PREFS_KEY).apply();
-        } catch (IOException e) {
+        } catch (Exception e) {
             errorReporter.onException(e);
         }
     }
@@ -218,7 +228,7 @@ public class History {
     @Nonnull
     private List<HistoryState> tryLoadStates(@NonNull File file) {
         try {
-            return Json.load(file, HistoryState.JSON_CREATOR);
+            return Json.load(file, fileSystem, HistoryState.JSON_CREATOR);
         } catch (IOException | JSONException e) {
             errorReporter.onException(e);
         }
@@ -333,12 +343,6 @@ public class History {
         onSavedChanged(new RemovedEvent(state, false));
     }
 
-    public void removeRecent(@Nonnull HistoryState state) {
-        Check.isMainThread();
-        recent.remove(state);
-        onSavedChanged(new RemovedEvent(state, true));
-    }
-
     @Subscribe
     public void onDisplayChanged(@Nonnull Display.ChangedEvent e) {
         final EditorState editorState = editor.getState();
@@ -403,11 +407,7 @@ public class History {
                 public void run() {
                     final File file = recent ? getRecentHistoryFile() : getSavedHistoryFile();
                     final JSONArray array = Json.toJson(states);
-                    try {
-                        FileSaver.save(file, array.toString());
-                    } catch (IOException e) {
-                        errorReporter.onException(e);
-                    }
+                    fileSystem.writeSilently(file, array.toString());
                 }
             });
         }

app/src/main/java/org/solovyev/android/calculator/history/OldHistory.java

@@ -44,16 +44,12 @@ class OldHistory {
     }
 
     @Nullable
-    public static OldHistory fromXml(@Nullable String xml) {
+    public static OldHistory fromXml(@Nullable String xml) throws Exception {
         if (xml == null) {
             return null;
         }
         final Serializer serializer = new Persister();
-        try {
-            return serializer.read(OldHistory.class, xml);
-        } catch (Exception e) {
-            return null;
-        }
+        return serializer.read(OldHistory.class, xml);
     }
 
     @Nonnull

app/src/main/java/org/solovyev/android/calculator/json/Json.java

@@ -1,20 +1,22 @@
 package org.solovyev.android.calculator.json;
 
+import static android.text.TextUtils.isEmpty;
+
 import android.support.annotation.NonNull;
 import android.util.Log;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.solovyev.android.io.FileLoader;
+import org.solovyev.android.io.FileSystem;
 
-import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static android.text.TextUtils.isEmpty;
+import javax.annotation.Nonnull;
 
 public final class Json {
 
@@ -56,11 +58,12 @@ public final class Json {
     }
 
     @Nonnull
-    public static <T> List<T> load(@Nonnull File file, @NonNull Creator<T> creator) throws IOException, JSONException {
+    public static <T> List<T> load(@Nonnull File file, @NonNull FileSystem fileSystem,
+        @NonNull Creator<T> creator) throws IOException, JSONException {
         if (!file.exists()) {
             return Collections.emptyList();
         }
-        final CharSequence json = FileLoader.load(file);
+        final CharSequence json = fileSystem.read(file);
         if (isEmpty(json)) {
             return Collections.emptyList();
         }

app/src/main/java/org/solovyev/android/io/FileSystem.java

@@ -0,0 +1,42 @@
+package org.solovyev.android.io;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import org.solovyev.android.calculator.ErrorReporter;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class FileSystem {
+
+    @Inject
+    ErrorReporter errorReporter;
+
+    @Inject
+    public FileSystem() {
+    }
+
+    public boolean writeSilently(@NonNull File file, @NonNull String data) {
+        try {
+            write(file, data);
+            return true;
+        } catch (IOException e) {
+            errorReporter.onException(e);
+        }
+        return false;
+    }
+
+    public void write(@NonNull File file, @NonNull String data) throws IOException {
+        FileSaver.save(file, data);
+    }
+
+    @Nullable
+    public CharSequence read(File file) throws IOException {
+        return FileLoader.load(file);
+    }
+}