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

android_calculator-4: Extend history functionality

Browse Source
This commit is contained in:
Sergey Solovyev
2011-12-18 02:16:30 +04:00
parent 38152fe80d
commit 9d785e4b1e
9 changed files with 138 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,9 @@ import org.solovyev.common.utils.EqualsTool;
import org.solovyev.common.utils.history.HistoryHelper;
import org.solovyev.common.utils.history.SimpleHistoryHelper;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* User: serso
@@ -136,12 +138,12 @@ public class HistoryUtilsTest {
state.setTime(date);
history.addState(state);
Assert.assertEquals(emptyHistory, HistoryUtils.toXml(history));
Assert.assertEquals(emptyHistory, HistoryUtils.toXml(history.getStates()));
state.setSaved(true);
Assert.assertEquals(toXml1, HistoryUtils.toXml(history));
Assert.assertEquals(toXml1, HistoryUtils.toXml(history.getStates()));
calculatorDisplay = new TestCalculatorDisplay();
calculatorDisplay.setErrorMessage(null);
@@ -188,11 +190,15 @@ public class HistoryUtilsTest {
state.setTime(date);
history.addState(state);
String xml = HistoryUtils.toXml(history);
String xml = HistoryUtils.toXml(history.getStates());
Assert.assertEquals(toXml2, xml);
final List<CalculatorHistoryState> fromXml = new ArrayList<CalculatorHistoryState>();
final HistoryHelper<CalculatorHistoryState> historyFromXml = new SimpleHistoryHelper<CalculatorHistoryState>();
HistoryUtils.fromXml(xml, historyFromXml);
HistoryUtils.fromXml(xml, fromXml);
for (CalculatorHistoryState historyState : fromXml) {
historyFromXml.addState(historyState);
}
Assert.assertEquals(history.getStates().size(), historyFromXml.getStates().size());