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

Otto bus is added to the project

Browse Source
This commit is contained in:
serso
2016-01-09 22:48:36 +01:00
parent 21b56bbe59
commit 5e1c47963c
19 changed files with 375 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/test/java/org/solovyev/android/calculator/AndroidEditorViewTest.java
View File

@@ -30,6 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.solovyev.common.text.Strings;
@@ -62,7 +63,7 @@ public class AndroidEditorViewTest {
@Test
public void testCreation() throws Exception {
new EditorView(CalculatorApplication.getInstance());
new EditorView(RuntimeEnvironment.application);
}
@Test

70
app/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java
View File

@@ -1,70 +0,0 @@
package org.solovyev.android.calculator;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPreferenceManager;
import javax.annotation.Nonnull;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.robolectric.RuntimeEnvironment.application;
import static org.solovyev.android.calculator.CalculatorBroadcaster.ACTION_DISPLAY_STATE_CHANGED;
import static org.solovyev.android.calculator.CalculatorBroadcaster.ACTION_EDITOR_STATE_CHANGED;
import static org.solovyev.android.calculator.CalculatorEventType.*;
@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP)
@RunWith(RobolectricGradleTestRunner.class)
public class CalculatorBroadcasterTest {
@Nonnull
private CalculatorBroadcaster broadcaster;
@Before
public void setUp() throws Exception {
broadcaster = new CalculatorBroadcaster(application, ShadowPreferenceManager.getDefaultSharedPreferences(application));
}
@Test
public void testShouldSendEditorStateChangedIntent() throws Exception {
assertIntentSent(editor_state_changed, ACTION_EDITOR_STATE_CHANGED);
}
@Test
public void testShouldSendEditorStateChangedLiteIntent() throws Exception {
assertIntentSent(editor_state_changed_light, ACTION_EDITOR_STATE_CHANGED);
}
@Test
public void testShouldSendDisplayStateChangedIntent() throws Exception {
assertIntentSent(display_state_changed, ACTION_DISPLAY_STATE_CHANGED);
}
private void assertIntentSent(@Nonnull CalculatorEventType eventType, final String expectedAction) {
final BroadcastReceiver receiver = Mockito.mock(BroadcastReceiver.class);
application.registerReceiver(receiver, new IntentFilter(expectedAction));
broadcaster.onCalculatorEvent(CalculatorEventDataImpl.newInstance(1L, 1L), eventType, null);
verify(receiver, times(1)).onReceive(Mockito.<Context>any(), argThat(new BaseMatcher<Intent>() {
@Override
public boolean matches(Object o) {
return ((Intent) o).getAction().equals(expectedAction);
}
@Override
public void describeTo(Description description) {
}
}));
}
}

43
app/src/test/java/org/solovyev/android/calculator/EditorStateTest.java
View File

@@ -1,43 +0,0 @@
/*
* Copyright 2013 serso aka se.solovyev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Contact details
*
* Email: se.solovyev@gmail.com
* Site: http://se.solovyev.org
*/
package org.solovyev.android.calculator;
import org.junit.Assert;
import org.junit.Test;
/**
* User: serso
* Date: 10/20/12
* Time: 12:31 PM
*/
public class EditorStateTest {
@Test
public void testSerialization() throws Exception {
CalculatorTestUtils.testSerialization(EditorState.empty());
EditorState out = CalculatorTestUtils.testSerialization(EditorState.create("treter", 2));
Assert.assertEquals(2, out.getSelection());
Assert.assertEquals("treter", out.getText());
}
}

128
app/src/test/java/org/solovyev/android/calculator/EditorTest.java
View File

@@ -48,52 +48,52 @@ public class EditorTest extends AbstractCalculatorTest {
public void testInsert() throws Exception {
EditorState viewState = this.editor.getState();
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.insert("");
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.insert("test");
Assert.assertEquals("test", viewState.getText());
Assert.assertEquals(4, viewState.getSelection());
Assert.assertEquals("test", viewState.getTextString());
Assert.assertEquals(4, viewState.selection);
viewState = this.editor.insert("test");
Assert.assertEquals("testtest", viewState.getText());
Assert.assertEquals(8, viewState.getSelection());
Assert.assertEquals("testtest", viewState.getTextString());
Assert.assertEquals(8, viewState.selection);
viewState = this.editor.insert("");
Assert.assertEquals("testtest", viewState.getText());
Assert.assertEquals(8, viewState.getSelection());
Assert.assertEquals("testtest", viewState.getTextString());
Assert.assertEquals(8, viewState.selection);
viewState = this.editor.insert("1234567890");
Assert.assertEquals("testtest1234567890", viewState.getText());
Assert.assertEquals(18, viewState.getSelection());
Assert.assertEquals("testtest1234567890", viewState.getTextString());
Assert.assertEquals(18, viewState.selection);
viewState = this.editor.moveCursorLeft();
viewState = this.editor.insert("9");
Assert.assertEquals("testtest12345678990", viewState.getText());
Assert.assertEquals(18, viewState.getSelection());
Assert.assertEquals("testtest12345678990", viewState.getTextString());
Assert.assertEquals(18, viewState.selection);
viewState = this.editor.setCursorOnStart();
viewState = this.editor.insert("9");
Assert.assertEquals("9testtest12345678990", viewState.getText());
Assert.assertEquals(1, viewState.getSelection());
Assert.assertEquals("9testtest12345678990", viewState.getTextString());
Assert.assertEquals(1, viewState.selection);
viewState = this.editor.erase();
viewState = this.editor.insert("9");
Assert.assertEquals("9testtest12345678990", viewState.getText());
Assert.assertEquals(1, viewState.getSelection());
Assert.assertEquals("9testtest12345678990", viewState.getTextString());
Assert.assertEquals(1, viewState.selection);
viewState = this.editor.insert("öäü");
Assert.assertEquals("9öäütesttest12345678990", viewState.getText());
Assert.assertEquals("9öäütesttest12345678990", viewState.getTextString());
this.editor.setCursorOnEnd();
viewState = this.editor.insert("öäü");
Assert.assertEquals("9öäütesttest12345678990öäü", viewState.getText());
Assert.assertEquals("9öäütesttest12345678990öäü", viewState.getTextString());
}
@Test
@@ -101,39 +101,39 @@ public class EditorTest extends AbstractCalculatorTest {
this.editor.setText("");
this.editor.erase();
Assert.assertEquals("", this.editor.getState().getText());
Assert.assertEquals("", this.editor.getState().getTextString());
this.editor.setText("test");
this.editor.erase();
Assert.assertEquals("tes", this.editor.getState().getText());
Assert.assertEquals("tes", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("te", this.editor.getState().getText());
Assert.assertEquals("te", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("t", this.editor.getState().getText());
Assert.assertEquals("t", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("", this.editor.getState().getText());
Assert.assertEquals("", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("", this.editor.getState().getText());
Assert.assertEquals("", this.editor.getState().getTextString());
this.editor.setText("1234");
this.editor.moveCursorLeft();
this.editor.erase();
Assert.assertEquals("124", this.editor.getState().getText());
Assert.assertEquals("124", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("14", this.editor.getState().getText());
Assert.assertEquals("14", this.editor.getState().getTextString());
this.editor.erase();
Assert.assertEquals("4", this.editor.getState().getText());
Assert.assertEquals("4", this.editor.getState().getTextString());
this.editor.setText("1");
this.editor.moveCursorLeft();
this.editor.erase();
Assert.assertEquals("1", this.editor.getState().getText());
Assert.assertEquals("1", this.editor.getState().getTextString());
}
@Test
@@ -141,91 +141,91 @@ public class EditorTest extends AbstractCalculatorTest {
this.editor.setText("");
EditorState viewState = this.editor.moveSelection(0);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(2);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(100);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(-3);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(-100);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("0123456789");
viewState = this.editor.moveSelection(0);
Assert.assertEquals(10, viewState.getSelection());
Assert.assertEquals(10, viewState.selection);
viewState = this.editor.moveSelection(1);
Assert.assertEquals(10, viewState.getSelection());
Assert.assertEquals(10, viewState.selection);
viewState = this.editor.moveSelection(-2);
Assert.assertEquals(8, viewState.getSelection());
Assert.assertEquals(8, viewState.selection);
viewState = this.editor.moveSelection(1);
Assert.assertEquals(9, viewState.getSelection());
Assert.assertEquals(9, viewState.selection);
viewState = this.editor.moveSelection(-9);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(-10);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.moveSelection(2);
Assert.assertEquals(2, viewState.getSelection());
Assert.assertEquals(2, viewState.selection);
viewState = this.editor.moveSelection(2);
Assert.assertEquals(4, viewState.getSelection());
Assert.assertEquals(4, viewState.selection);
viewState = this.editor.moveSelection(-6);
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals(0, viewState.selection);
}
@Test
public void testSetText() throws Exception {
EditorState viewState = this.editor.setText("test");
Assert.assertEquals("test", viewState.getText());
Assert.assertEquals(4, viewState.getSelection());
Assert.assertEquals("test", viewState.getTextString());
Assert.assertEquals(4, viewState.selection);
viewState = this.editor.setText("testtest");
Assert.assertEquals("testtest", viewState.getText());
Assert.assertEquals(8, viewState.getSelection());
Assert.assertEquals("testtest", viewState.getTextString());
Assert.assertEquals(8, viewState.selection);
viewState = this.editor.setText("");
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("testtest", 0);
Assert.assertEquals("testtest", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("testtest", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("testtest", 2);
Assert.assertEquals("testtest", viewState.getText());
Assert.assertEquals(2, viewState.getSelection());
Assert.assertEquals("testtest", viewState.getTextString());
Assert.assertEquals(2, viewState.selection);
viewState = this.editor.setText("", 0);
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("", 3);
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("", -3);
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
viewState = this.editor.setText("test");
Assert.assertEquals("test", viewState.getText());
Assert.assertEquals(4, viewState.getSelection());
Assert.assertEquals("test", viewState.getTextString());
Assert.assertEquals(4, viewState.selection);
viewState = this.editor.setText("", 2);
Assert.assertEquals("", viewState.getText());
Assert.assertEquals(0, viewState.getSelection());
Assert.assertEquals("", viewState.getTextString());
Assert.assertEquals(0, viewState.selection);
}
}

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

@@ -32,9 +32,8 @@ import org.solovyev.common.equals.CollectionEqualizer;
import org.solovyev.common.history.HistoryHelper;
import org.solovyev.common.history.SimpleHistoryHelper;
import java.util.ArrayList;
import javax.annotation.Nonnull;
import java.util.Date;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -146,12 +145,12 @@ public class HistoryUtilsTest {
state.setTime(date.getTime());
history.addState(state);
assertEquals(emptyHistory, History.toXml(history.getStates()));
assertEquals(emptyHistory, createHistory(history).toXml());
state.setSaved(true);
assertEquals(toXml1, History.toXml(history.getStates()));
assertEquals(toXml1, createHistory(history).toXml());
calculatorDisplay = DisplayState.createValid(JsclOperation.numeric, null, "5/6", 3);
@@ -180,13 +179,12 @@ public class HistoryUtilsTest {
state.setTime(date.getTime());
history.addState(state);
String xml = History.toXml(history.getStates());
String xml = createHistory(history).toXml();
assertEquals(toXml2, xml);
final List<HistoryState> fromXml = new ArrayList<HistoryState>();
final HistoryHelper<HistoryState> historyFromXml = SimpleHistoryHelper.newInstance();
History.fromXml(xml, fromXml);
for (HistoryState historyState : fromXml) {
final History actual = History.fromXml(xml);
for (HistoryState historyState : actual.getItems()) {
historyFromXml.addState(historyState);
}
@@ -202,4 +200,11 @@ public class HistoryUtilsTest {
}
Assert.assertTrue(Objects.areEqual(history.getStates(), historyFromXml.getStates(), new CollectionEqualizer<HistoryState>(null)));
}
@Nonnull
private History createHistory(HistoryHelper<HistoryState> history) {
final History result = new History();
result.addAll(history.getStates());
return result;
}
}