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

Make it possible to cancel previous calculations

Browse Source
This commit is contained in:
serso
2017-07-24 16:29:37 +02:00
parent e6aa39659f
commit 7aebabb8d5
3 changed files with 163 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/test/java/org/solovyev/android/calculator/BaseCalculatorTest.java
View File

@@ -1,8 +1,16 @@
package org.solovyev.android.calculator;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.solovyev.android.calculator.jscl.JsclOperation.numeric;
import android.content.SharedPreferences;
import android.support.annotation.NonNull;
import com.squareup.otto.Bus;
import org.hamcrest.Description;
import org.junit.Before;
import org.mockito.ArgumentMatcher;
@@ -10,10 +18,6 @@ import org.solovyev.android.calculator.calculations.CalculationFailedEvent;
import org.solovyev.android.calculator.calculations.CalculationFinishedEvent;
import org.solovyev.android.calculator.jscl.JsclOperation;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.*;
import static org.solovyev.android.calculator.jscl.JsclOperation.numeric;
public abstract class BaseCalculatorTest {
protected Calculator calculator;
protected Bus bus;
@@ -22,7 +26,8 @@ public abstract class BaseCalculatorTest {
@Before
public void setUp() throws Exception {
bus = mock(Bus.class);
calculator = new Calculator(mock(SharedPreferences.class), bus, Tests.sameThreadExecutor());
calculator = new Calculator(mock(SharedPreferences.class), bus);
calculator.setSynchronous();
engine = Tests.makeEngine();
engine.variablesRegistry.bus = bus;
calculator.engine = engine;