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

Remove Locator methods

Browse Source
This commit is contained in:
serso
2016-02-28 13:24:02 +01:00
parent 6b4d1118e0
commit d761ef553e
7 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
View File

@@ -22,9 +22,6 @@
package org.solovyev.android.calculator;
import android.content.SharedPreferences;
import com.squareup.otto.Bus;
import java.util.concurrent.Executor;
import static org.mockito.Mockito.mock;
@@ -37,7 +34,7 @@ import static org.mockito.Mockito.mock;
public class AbstractCalculatorTest {
protected void setUp() throws Exception {
Locator.getInstance().init(new Calculator(mock(SharedPreferences.class), mock(Bus.class), mock(Executor.class), mock(Executor.class)), CalculatorTestUtils.newCalculatorEngine(), mock(Keyboard.class));
Locator.getInstance().init(CalculatorTestUtils.newCalculatorEngine());
Locator.getInstance().getEngine().init(new Executor() {
@Override
public void execute(Runnable command) {

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

@@ -25,9 +25,6 @@ package org.solovyev.android.calculator;
import static org.mockito.Mockito.mock;
import android.content.Context;
import android.content.SharedPreferences;
import com.squareup.otto.Bus;
import org.junit.Assert;
import org.robolectric.fakes.RoboSharedPreferences;
@@ -67,7 +64,7 @@ public class CalculatorTestUtils {
public static void staticSetUp() throws Exception {
App.init(new CalculatorApplication(), new Languages(new RoboSharedPreferences(new HashMap<String, Map<String, Object>>(), "test", 0)));
Locator.getInstance().init(new Calculator(mock(SharedPreferences.class), mock(Bus.class), mock(Executor.class), mock(Executor.class)), newCalculatorEngine(), mock(Keyboard.class));
Locator.getInstance().init(newCalculatorEngine());
Locator.getInstance().getEngine().init(new Executor() {
@Override
public void execute(Runnable command) {
@@ -82,7 +79,7 @@ public class CalculatorTestUtils {
}
public static void staticSetUp(@Nullable Context context) throws Exception {
Locator.getInstance().init(new Calculator(mock(SharedPreferences.class), mock(Bus.class), mock(Executor.class), mock(Executor.class)), newCalculatorEngine(), mock(Keyboard.class));
Locator.getInstance().init(newCalculatorEngine());
Locator.getInstance().getEngine().init(new Executor() {
@Override
public void execute(Runnable command) {