TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

History refactor

Browse Source
This commit is contained in:
serso
2016-01-10 23:27:14 +01:00
parent 0badc913c0
commit b21d8084f0
25 changed files with 328 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java → app/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryTest.java
View File

@@ -25,21 +25,19 @@ package org.solovyev.android.calculator.history;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.solovyev.android.calculator.CalculatorTestUtils;
import org.solovyev.android.calculator.DisplayState;
import org.solovyev.android.calculator.EditorState;
import org.solovyev.android.calculator.CalculatorTestUtils;
import org.solovyev.android.calculator.Locator;
import java.util.List;
import javax.annotation.Nonnull;
import java.util.List;
/**
* User: Solovyev_S
* Date: 10.10.12
* Time: 15:07
*/
public class CalculatorHistoryImplTest {
public class CalculatorHistoryTest {
@BeforeClass
public static void setUp() throws Exception {
@@ -48,7 +46,7 @@ public class CalculatorHistoryImplTest {
@Test
public void testGetStates() throws Exception {
CalculatorHistory calculatorHistory = new CalculatorHistoryImpl(Locator.getInstance().getCalculator());
CalculatorHistory calculatorHistory = new CalculatorHistory();
addState(calculatorHistory, "1");
addState(calculatorHistory, "12");
@@ -64,13 +62,13 @@ public class CalculatorHistoryImplTest {
addState(calculatorHistory, "2354");
addState(calculatorHistory, "23547");
final List<HistoryState> states = calculatorHistory.getStates(false);
final List<OldHistoryState> states = calculatorHistory.getStates(false);
Assert.assertEquals(2, states.size());
Assert.assertEquals("23547", states.get(1).getEditorState().getText());
Assert.assertEquals("123+3", states.get(0).getEditorState().getText());
}
private void addState(@Nonnull CalculatorHistory calculatorHistory, @Nonnull String text) {
calculatorHistory.addState(HistoryState.create(EditorState.create(text, 3), DisplayState.empty()));
calculatorHistory.addState(OldHistoryState.create(EditorState.create(text, 3), DisplayState.empty()));
}
}

26
app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java
View File

@@ -135,13 +135,13 @@ public class HistoryUtilsTest {
public void testToXml() throws Exception {
final Date date = new Date(100000000);
HistoryHelper<HistoryState> history = SimpleHistoryHelper.newInstance();
HistoryHelper<OldHistoryState> history = SimpleHistoryHelper.newInstance();
DisplayState calculatorDisplay = DisplayState.createError(JsclOperation.simplify, "Error", EditorState.NO_SEQUENCE);
EditorState calculatorEditor = EditorState.create("1+1", 3);
HistoryState state = HistoryState.create(calculatorEditor, calculatorDisplay);
OldHistoryState state = OldHistoryState.create(calculatorEditor, calculatorDisplay);
state.setTime(date.getTime());
history.addState(state);
@@ -156,7 +156,7 @@ public class HistoryUtilsTest {
calculatorEditor = EditorState.create("5/6", 2);
state = HistoryState.create(calculatorEditor, calculatorDisplay);
state = OldHistoryState.create(calculatorEditor, calculatorDisplay);
state.setSaved(true);
state.setTime(date.getTime());
history.addState(state);
@@ -165,7 +165,7 @@ public class HistoryUtilsTest {
calculatorEditor = EditorState.create("", 1);
state = HistoryState.create(calculatorEditor, calculatorDisplay);
state = OldHistoryState.create(calculatorEditor, calculatorDisplay);
state.setSaved(true);
state.setTime(date.getTime());
history.addState(state);
@@ -174,7 +174,7 @@ public class HistoryUtilsTest {
calculatorEditor = EditorState.create("4+5/35sin(41)+dfdsfsdfs", 0);
state = HistoryState.create(calculatorEditor, calculatorDisplay);
state = OldHistoryState.create(calculatorEditor, calculatorDisplay);
state.setSaved(true);
state.setTime(date.getTime());
history.addState(state);
@@ -182,28 +182,28 @@ public class HistoryUtilsTest {
String xml = createHistory(history).toXml();
assertEquals(toXml2, xml);
final HistoryHelper<HistoryState> historyFromXml = SimpleHistoryHelper.newInstance();
final History actual = History.fromXml(xml);
for (HistoryState historyState : actual.getItems()) {
final HistoryHelper<OldHistoryState> historyFromXml = SimpleHistoryHelper.newInstance();
final OldHistory actual = OldHistory.fromXml(xml);
for (OldHistoryState historyState : actual.getItems()) {
historyFromXml.addState(historyState);
}
assertEquals(history.getStates().size(), historyFromXml.getStates().size());
for (HistoryState historyState : history.getStates()) {
for (OldHistoryState historyState : history.getStates()) {
historyState.setId(0);
historyState.setSaved(true);
}
for (HistoryState historyState : historyFromXml.getStates()) {
for (OldHistoryState historyState : historyFromXml.getStates()) {
historyState.setId(0);
historyState.setSaved(true);
}
Assert.assertTrue(Objects.areEqual(history.getStates(), historyFromXml.getStates(), new CollectionEqualizer<HistoryState>(null)));
Assert.assertTrue(Objects.areEqual(history.getStates(), historyFromXml.getStates(), new CollectionEqualizer<OldHistoryState>(null)));
}
@Nonnull
private History createHistory(HistoryHelper<HistoryState> history) {
final History result = new History();
private OldHistory createHistory(HistoryHelper<OldHistoryState> history) {
final OldHistory result = new OldHistory();
result.addAll(history.getStates());
return result;
}