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

Fixes

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-18 19:38:15 +04:00
parent 3d0eacd601
commit 4637547691
11 changed files with 142 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocator.java
View File

@@ -16,7 +16,8 @@ public interface CalculatorLocator {
@NotNull CalculatorNotifier notifier,
@NotNull CalculatorHistory history,
@NotNull CalculatorLogger logger,
@NotNull CalculatorPreferenceService preferenceService);
@NotNull CalculatorPreferenceService preferenceService,
@NotNull CalculatorKeyboard keyboard);
@NotNull
Calculator getCalculator();

5
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLocatorImpl.java
View File

@@ -53,7 +53,8 @@ public class CalculatorLocatorImpl implements CalculatorLocator {
@NotNull CalculatorNotifier notifier,
@NotNull CalculatorHistory history,
@NotNull CalculatorLogger logger,
@NotNull CalculatorPreferenceService preferenceService) {
@NotNull CalculatorPreferenceService preferenceService,
@NotNull CalculatorKeyboard keyboard) {
this.calculator = calculator;
this.calculatorEngine = engine;
@@ -65,7 +66,7 @@ public class CalculatorLocatorImpl implements CalculatorLocator {
calculatorEditor = new CalculatorEditorImpl(this.calculator);
calculatorDisplay = new CalculatorDisplayImpl(this.calculator);
calculatorKeyboard = new CalculatorKeyboardImpl(this.calculator);
calculatorKeyboard = keyboard;
}
@NotNull

2
calculatorpp-core/src/test/java/org/solovyev/android/calculator/AbstractCalculatorTest.java
View File

@@ -11,7 +11,7 @@ import org.solovyev.android.calculator.history.CalculatorHistory;
public class AbstractCalculatorTest {
protected void setUp() throws Exception {
CalculatorLocatorImpl.getInstance().init(new CalculatorImpl(), CalculatorTestUtils.newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class));
CalculatorLocatorImpl.getInstance().init(new CalculatorImpl(), CalculatorTestUtils.newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class));
CalculatorLocatorImpl.getInstance().getEngine().init();
}

2
calculatorpp-core/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java
View File

@@ -23,7 +23,7 @@ public class CalculatorTestUtils {
public static final int TIMEOUT = 3;
public static void staticSetUp() throws Exception {
CalculatorLocatorImpl.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class));
CalculatorLocatorImpl.getInstance().init(new CalculatorImpl(), newCalculatorEngine(), Mockito.mock(CalculatorClipboard.class), Mockito.mock(CalculatorNotifier.class), Mockito.mock(CalculatorHistory.class), new SystemOutCalculatorLogger(), Mockito.mock(CalculatorPreferenceService.class), Mockito.mock(CalculatorKeyboard.class));
CalculatorLocatorImpl.getInstance().getEngine().init();
}