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

EditorView refactored

Browse Source
This commit is contained in:
serso
2016-01-07 21:36:01 +01:00
parent 6b89deee80
commit d1c068edff
31 changed files with 295 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java
View File

@@ -62,7 +62,7 @@ public class AndroidCalculatorEditorViewTest {
@Test
public void testCreation() throws Exception {
new AndroidCalculatorEditorView(CalculatorApplication.getInstance());
new EditorView(CalculatorApplication.getInstance());
}
@Test

2
app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
View File

@@ -75,7 +75,7 @@ public class CalculatorTestUtils {
}
public static void initViews(@Nonnull Context context) {
final AndroidCalculatorEditorView editor = new AndroidCalculatorEditorView(context);
final EditorView editor = new EditorView(context);
editor.init();
Locator.getInstance().getEditor().setView(editor);

6
app/src/test/java/org/solovyev/android/calculator/CalculatorEditorViewStateImplTest.java → app/src/test/java/org/solovyev/android/calculator/EditorStateTest.java
View File

@@ -30,13 +30,13 @@ import org.junit.Test;
* Date: 10/20/12
* Time: 12:31 PM
*/
public class CalculatorEditorViewStateImplTest {
public class EditorStateTest {
@Test
public void testSerialization() throws Exception {
CalculatorTestUtils.testSerialization(CalculatorEditorViewStateImpl.newDefaultInstance());
CalculatorTestUtils.testSerialization(EditorState.empty());
CalculatorEditorViewState out = CalculatorTestUtils.testSerialization(CalculatorEditorViewStateImpl.newInstance("treter", 2));
EditorState out = CalculatorTestUtils.testSerialization(EditorState.create("treter", 2));
Assert.assertEquals(2, out.getSelection());
Assert.assertEquals("treter", out.getText());
}

4
app/src/test/java/org/solovyev/android/calculator/history/CalculatorHistoryImplTest.java
View File

@@ -26,7 +26,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.solovyev.android.calculator.CalculatorDisplayViewStateImpl;
import org.solovyev.android.calculator.CalculatorEditorViewStateImpl;
import org.solovyev.android.calculator.EditorState;
import org.solovyev.android.calculator.CalculatorTestUtils;
import org.solovyev.android.calculator.Locator;
@@ -71,6 +71,6 @@ public class CalculatorHistoryImplTest {
}
private void addState(@Nonnull CalculatorHistory calculatorHistory, @Nonnull String text) {
calculatorHistory.addState(CalculatorHistoryState.newInstance(CalculatorEditorViewStateImpl.newInstance(text, 3), CalculatorDisplayViewStateImpl.newDefaultInstance()));
calculatorHistory.addState(CalculatorHistoryState.newInstance(EditorState.create(text, 3), CalculatorDisplayViewStateImpl.newDefaultInstance()));
}
}

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

@@ -26,8 +26,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.solovyev.android.calculator.CalculatorDisplayViewState;
import org.solovyev.android.calculator.CalculatorDisplayViewStateImpl;
import org.solovyev.android.calculator.CalculatorEditorViewState;
import org.solovyev.android.calculator.CalculatorEditorViewStateImpl;
import org.solovyev.android.calculator.EditorState;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.common.Objects;
import org.solovyev.common.equals.CollectionEqualizer;
@@ -142,7 +141,7 @@ public class HistoryUtilsTest {
CalculatorDisplayViewState calculatorDisplay = CalculatorDisplayViewStateImpl.newErrorState(JsclOperation.simplify, "Error");
CalculatorEditorViewState calculatorEditor = CalculatorEditorViewStateImpl.newInstance("1+1", 3);
CalculatorEditorViewState calculatorEditor = EditorState.create("1+1", 3);
CalculatorHistoryState state = CalculatorHistoryState.newInstance(calculatorEditor, calculatorDisplay);
state.setTime(date.getTime());
@@ -157,7 +156,7 @@ public class HistoryUtilsTest {
calculatorDisplay = CalculatorDisplayViewStateImpl.newValidState(JsclOperation.numeric, null, "5/6", 3);
calculatorEditor = CalculatorEditorViewStateImpl.newInstance("5/6", 2);
calculatorEditor = EditorState.create("5/6", 2);
state = CalculatorHistoryState.newInstance(calculatorEditor, calculatorDisplay);
state.setSaved(true);
@@ -166,7 +165,7 @@ public class HistoryUtilsTest {
calculatorDisplay = CalculatorDisplayViewStateImpl.newErrorState(JsclOperation.elementary, "Error");
calculatorEditor = CalculatorEditorViewStateImpl.newInstance("", 1);
calculatorEditor = EditorState.create("", 1);
state = CalculatorHistoryState.newInstance(calculatorEditor, calculatorDisplay);
state.setSaved(true);
@@ -175,7 +174,7 @@ public class HistoryUtilsTest {
calculatorDisplay = CalculatorDisplayViewStateImpl.newValidState(JsclOperation.numeric, null, "4+5/35sin(41)+dfdsfsdfs", 1);
calculatorEditor = CalculatorEditorViewStateImpl.newInstance("4+5/35sin(41)+dfdsfsdfs", 0);
calculatorEditor = EditorState.create("4+5/35sin(41)+dfdsfsdfs", 0);
state = CalculatorHistoryState.newInstance(calculatorEditor, calculatorDisplay);
state.setSaved(true);