diff --git a/app-tests/build.gradle b/app-tests/build.gradle deleted file mode 100644 index 8d805775..00000000 --- a/app-tests/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2014 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 - */ - -apply plugin: 'java' - -dependencies { - def app = project(':app') - compile app - - testCompile app.android.applicationVariants.toList().first().javaCompile.classpath - testCompile app.android.applicationVariants.toList().first().javaCompile.outputs.files - testCompile files(app.android.bootClasspath) - - testCompile 'junit:junit:4.11' - testCompile 'org.robolectric:robolectric:2.3' - testCompile 'org.mockito:mockito-all:1.9.5' - testCompile 'org.skyscreamer:jsonassert:1.2.3' - testCompile 'com.android.support:support-v4:22.1.1' - testCompile 'com.android.support:appcompat-v7:22.1.1' -} - -tasks.withType(Test) { - scanForTestClasses = false - include "**/*Test.class" - exclude "**/*AndroidCalculatorEditorViewTest*" - exclude "**/*CalculatorWizardActivityTest*" - exclude "**/*OnScreenCalculatorWizardStepTest*" - exclude "**/*CalculatorWizardTest*" - exclude "**/*WizardStepTest*" - exclude "**/*AngleUnitsButtonTest*" - exclude "**/*NumeralBasesButtonTest*" -} - -test { - maxParallelForks = 15 - forkEvery = 1 -} \ No newline at end of file diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java deleted file mode 100644 index a1986dbf..00000000 --- a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java +++ /dev/null @@ -1,80 +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 android.content.Context; - -import org.mockito.Mockito; -import org.solovyev.android.calculator.history.CalculatorHistory; -import org.solovyev.android.calculator.plot.CalculatorPlotter; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import jscl.JsclMathEngine; - -/** - * User: serso - * Date: 10/7/12 - * Time: 8:56 PM - */ -public class CalculatorTestUtils { - - public static void staticSetUp(@Nullable Context context) throws Exception { - Locator.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), Mockito.mock(CalculatorPlotter.class), null); - Locator.getInstance().getEngine().init(); - - if (context != null) { - initViews(context); - } - } - - public static void initViews(@Nonnull Context context) { - final AndroidCalculatorEditorView editor = new AndroidCalculatorEditorView(context); - editor.init(); - Locator.getInstance().getEditor().setView(editor); - - final AndroidCalculatorDisplayView display = new AndroidCalculatorDisplayView(context); - display.init(context); - Locator.getInstance().getDisplay().setView(display); - } - - public static void staticSetUp() throws Exception { - staticSetUp(null); - } - - - @Nonnull - static CalculatorEngineImpl newCalculatorEngine() { - final MathEntityDao mathEntityDao = Mockito.mock(MathEntityDao.class); - - final JsclMathEngine jsclEngine = JsclMathEngine.getInstance(); - - final CalculatorVarsRegistry varsRegistry = new CalculatorVarsRegistry(jsclEngine.getConstantsRegistry(), mathEntityDao); - final CalculatorFunctionsMathRegistry functionsRegistry = new CalculatorFunctionsMathRegistry(jsclEngine.getFunctionsRegistry(), mathEntityDao); - final CalculatorOperatorsMathRegistry operatorsRegistry = new CalculatorOperatorsMathRegistry(jsclEngine.getOperatorsRegistry(), mathEntityDao); - final CalculatorPostfixFunctionsRegistry postfixFunctionsRegistry = new CalculatorPostfixFunctionsRegistry(jsclEngine.getPostfixFunctionsRegistry(), mathEntityDao); - - return new CalculatorEngineImpl(jsclEngine, varsRegistry, functionsRegistry, operatorsRegistry, postfixFunctionsRegistry, null); - } -} diff --git a/app/build.gradle b/app/build.gradle index ccdb566d..7cc859f8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -106,6 +106,22 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' testCompile group: 'net.sf.opencsv', name: 'opencsv', version: '2.0' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0' + testCompile "org.robolectric:robolectric:3.0" + testCompile 'org.mockito:mockito-all:1.9.5' + testCompile 'org.skyscreamer:jsonassert:1.2.3' + testCompile (name: 'org.apache.http.legacy', ext: 'jar') +} + +tasks.withType(Test) { + scanForTestClasses = false + include "**/*Test.class" + exclude "**/*AndroidCalculatorEditorViewTest*" + exclude "**/*CalculatorWizardActivityTest*" + exclude "**/*OnScreenCalculatorWizardStepTest*" + exclude "**/*CalculatorWizardTest*" + exclude "**/*WizardStepTest*" + exclude "**/*AngleUnitsButtonTest*" + exclude "**/*NumeralBasesButtonTest*" } task androidJavadocs(type: Javadoc) { @@ -203,4 +219,8 @@ uploadArchives { } } } +} +dependencies { + testCompile 'junit:junit:4.12' + testCompile 'junit:junit:4.12' } \ No newline at end of file diff --git a/app/misc/libs/org.apache.http.legacy.jar b/app/misc/libs/org.apache.http.legacy.jar new file mode 100644 index 00000000..3705bf1a Binary files /dev/null and b/app/misc/libs/org.apache.http.legacy.jar differ diff --git a/app-tests/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java b/app/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java similarity index 94% rename from app-tests/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java rename to app/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java index a8428705..846a981b 100644 --- a/app-tests/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java +++ b/app/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java @@ -24,6 +24,10 @@ package org.solovyev.android; import org.junit.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.annotation.Config; +import org.solovyev.android.calculator.BuildConfig; import org.solovyev.android.calculator.units.CalculatorNumeralBase; import org.solovyev.common.units.Unit; import org.solovyev.common.units.UnitConverter; @@ -40,6 +44,8 @@ import static org.junit.Assert.assertTrue; * Date: 4/21/12 * Time: 8:24 PM */ +@Config(constants = BuildConfig.class) +@RunWith(RobolectricGradleTestRunner.class) public class AndroidNumeralBaseTest { @Nonnull diff --git a/app-tests/src/test/java/org/solovyev/android/CalculatorTestRunner.java b/app/src/test/java/org/solovyev/android/CalculatorTestRunner.java similarity index 58% rename from app-tests/src/test/java/org/solovyev/android/CalculatorTestRunner.java rename to app/src/test/java/org/solovyev/android/CalculatorTestRunner.java index f948940f..fcf55412 100644 --- a/app-tests/src/test/java/org/solovyev/android/CalculatorTestRunner.java +++ b/app/src/test/java/org/solovyev/android/CalculatorTestRunner.java @@ -1,12 +1,12 @@ package org.solovyev.android; import org.junit.runners.model.InitializationError; -import org.robolectric.AndroidManifest; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; +import org.robolectric.manifest.AndroidManifest; import org.robolectric.res.Fs; -public class CalculatorTestRunner extends RobolectricTestRunner { +public class CalculatorTestRunner extends RobolectricGradleTestRunner { private static final int MAX_SDK_SUPPORTED_BY_ROBOLECTRIC = 18; public CalculatorTestRunner(Class testClass) throws InitializationError { @@ -15,9 +15,10 @@ public class CalculatorTestRunner extends RobolectricTestRunner { @Override protected AndroidManifest getAppManifest(Config config) { - final String manifestFilePath = "android-app/src/main/AndroidManifest.xml"; - final String resourcesFilePath = "android-app/src/main/res"; - return new AndroidManifest(Fs.fileFromPath(manifestFilePath), Fs.fileFromPath(resourcesFilePath)) { + final String manifestFilePath = "app/src/main/AndroidManifest.xml"; + final String resourcesFilePath = "app/src/main/res"; + final String assetsFilePath = "app/src/main/assets"; + return new AndroidManifest(Fs.fileFromPath(manifestFilePath), Fs.fileFromPath(resourcesFilePath), Fs.fileFromPath(assetsFilePath)) { @Override public int getTargetSdkVersion() { return MAX_SDK_SUPPORTED_BY_ROBOLECTRIC; diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java b/app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java similarity index 99% rename from app-tests/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java rename to app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java index cdf270b7..53e635a6 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/AndroidCalculatorEditorViewTest.java @@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * Date: 10/13/12 * Time: 1:11 PM */ + @RunWith(value = CalculatorTestRunner.class) public class AndroidCalculatorEditorViewTest { diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java b/app/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java similarity index 91% rename from app-tests/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java rename to app/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java index 0d1db113..b1aade4a 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/CalculatorBroadcasterTest.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import javax.annotation.Nonnull; @@ -19,7 +19,7 @@ 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.Robolectric.application; +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.display_state_changed; @@ -27,7 +27,7 @@ import static org.solovyev.android.calculator.CalculatorEventType.editor_state_c import static org.solovyev.android.calculator.CalculatorEventType.editor_state_changed_light; @Config(manifest = Config.NONE) -@RunWith(RobolectricTestRunner.class) +@RunWith(RobolectricGradleTestRunner.class) public class CalculatorBroadcasterTest { @Nonnull @@ -35,7 +35,7 @@ public class CalculatorBroadcasterTest { @Before public void setUp() throws Exception { - broadcaster = new CalculatorBroadcaster(application, preferences); + broadcaster = new CalculatorBroadcaster(application, null); } @Test diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java b/app/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java similarity index 91% rename from app-tests/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java rename to app/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java index 2fe6de4d..92cc6d29 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/CalculatorReceiverTest.java @@ -5,20 +5,20 @@ import android.content.Intent; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.annotation.Config; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.robolectric.Robolectric.application; +import static org.robolectric.RuntimeEnvironment.application; import static org.solovyev.android.calculator.CalculatorButton.four; import static org.solovyev.android.calculator.CalculatorReceiver.ACTION_BUTTON_ID_EXTRA; import static org.solovyev.android.calculator.CalculatorReceiver.ACTION_BUTTON_PRESSED; import static org.solovyev.android.calculator.CalculatorReceiver.newButtonClickedIntent; @Config(manifest = Config.NONE) -@RunWith(RobolectricTestRunner.class) +@RunWith(RobolectricGradleTestRunner.class) public class CalculatorReceiverTest { @Test diff --git a/app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java b/app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java index e6f66781..edcaa5b7 100644 --- a/app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java +++ b/app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java @@ -22,6 +22,8 @@ package org.solovyev.android.calculator; +import android.content.Context; + import org.junit.Assert; import org.mockito.Mockito; import org.solovyev.android.calculator.history.CalculatorHistory; @@ -63,6 +65,25 @@ public class CalculatorTestUtils { Locator.getInstance().getEngine().setDecimalGroupSymbols(decimalGroupSymbols); } + public static void staticSetUp(@Nullable Context context) throws Exception { + Locator.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), Mockito.mock(CalculatorPlotter.class), null); + Locator.getInstance().getEngine().init(); + + if (context != null) { + initViews(context); + } + } + + public static void initViews(@Nonnull Context context) { + final AndroidCalculatorEditorView editor = new AndroidCalculatorEditorView(context); + editor.init(); + Locator.getInstance().getEditor().setView(editor); + + final AndroidCalculatorDisplayView display = new AndroidCalculatorDisplayView(context); + display.init(context); + Locator.getInstance().getDisplay().setView(display); + } + @Nonnull static CalculatorEngineImpl newCalculatorEngine() { final MathEntityDao mathEntityDao = Mockito.mock(MathEntityDao.class); diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java b/app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java similarity index 100% rename from app-tests/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java rename to app/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java b/app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java similarity index 100% rename from app-tests/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java rename to app/src/test/java/org/solovyev/android/calculator/history/HistoryUtilsTest.java diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/model/VarTest.java b/app/src/test/java/org/solovyev/android/calculator/model/VarTest.java similarity index 100% rename from app-tests/src/test/java/org/solovyev/android/calculator/model/VarTest.java rename to app/src/test/java/org/solovyev/android/calculator/model/VarTest.java diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/plot/CalculatorGraph2dViewTest.java b/app/src/test/java/org/solovyev/android/calculator/plot/CalculatorGraph2dViewTest.java similarity index 100% rename from app-tests/src/test/java/org/solovyev/android/calculator/plot/CalculatorGraph2dViewTest.java rename to app/src/test/java/org/solovyev/android/calculator/plot/CalculatorGraph2dViewTest.java diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java b/app/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java similarity index 88% rename from app-tests/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java rename to app/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java index bdae3a13..0ba6d628 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/view/AngleUnitsButtonTest.java @@ -7,9 +7,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.Shadows; +import org.robolectric.annotation.Config; import org.robolectric.res.Attribute; import org.robolectric.shadows.ShadowActivity; +import org.solovyev.android.calculator.BuildConfig; import java.util.ArrayList; @@ -25,7 +28,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp; -@RunWith(RobolectricTestRunner.class) +@Config(constants = BuildConfig.class) +@RunWith(RobolectricGradleTestRunner.class) public class AngleUnitsButtonTest { private AngleUnitsButton button; @@ -35,7 +39,7 @@ public class AngleUnitsButtonTest { staticSetUp(); final Activity context = Robolectric.buildActivity(Activity.class).create().get(); - final ShadowActivity activity = Robolectric.shadowOf(context); + final ShadowActivity activity = Shadows.shadowOf(context); button = new AngleUnitsButton(context, activity.createAttributeSet(new ArrayList(), AngleUnitsButton.class)); } diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java b/app/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java similarity index 92% rename from app-tests/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java rename to app/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java index 091cabe6..bfe71271 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/view/NumeralBasesButtonTest.java @@ -7,7 +7,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.Shadows; import org.robolectric.res.Attribute; import org.robolectric.shadows.ShadowActivity; @@ -25,7 +26,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.solovyev.android.calculator.CalculatorTestUtils.staticSetUp; -@RunWith(RobolectricTestRunner.class) +@RunWith(RobolectricGradleTestRunner.class) public class NumeralBasesButtonTest { private NumeralBasesButton button; @@ -35,7 +36,7 @@ public class NumeralBasesButtonTest { staticSetUp(); final Activity context = Robolectric.buildActivity(Activity.class).create().get(); - final ShadowActivity activity = Robolectric.shadowOf(context); + final ShadowActivity activity = Shadows.shadowOf(context); button = new NumeralBasesButton(context, activity.createAttributeSet(new ArrayList(), NumeralBasesButton.class)); } diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java b/app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java similarity index 96% rename from app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java rename to app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java index 7ce7e6cf..6d52113a 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardActivityTest.java @@ -31,6 +31,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.shadows.ShadowActivity; import org.robolectric.util.ActivityController; import org.solovyev.android.CalculatorTestRunner; @@ -61,7 +63,7 @@ public class CalculatorWizardActivityTest { public void setUp() throws Exception { controller = Robolectric.buildActivity(WizardActivity.class); activity = controller.get(); - wizards = new CalculatorWizards(Robolectric.application); + wizards = new CalculatorWizards(RuntimeEnvironment.application); activity.setWizards(wizards); controller.attach(); controller.create(); @@ -155,7 +157,7 @@ public class CalculatorWizardActivityTest { @Test public void testShouldStartWizardActivityAfterStart() throws Exception { - final ShadowActivity shadowActivity = Robolectric.shadowOf(controller.get()); + final ShadowActivity shadowActivity = Shadows.shadowOf(controller.get()); WizardUi.startWizard(activity.getWizards(), CalculatorWizards.DEFAULT_WIZARD_FLOW, shadowActivity.getApplicationContext()); assertNotNull(shadowActivity.getNextStartedActivity()); } diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java b/app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java similarity index 96% rename from app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java rename to app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java index 2a36cc39..896cd897 100644 --- a/app-tests/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java +++ b/app/src/test/java/org/solovyev/android/calculator/wizard/CalculatorWizardTest.java @@ -3,7 +3,7 @@ package org.solovyev.android.calculator.wizard; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.Robolectric; +import org.robolectric.RuntimeEnvironment; import org.solovyev.android.CalculatorTestRunner; import org.solovyev.android.wizard.Wizard; import org.solovyev.android.wizard.WizardFlow; @@ -35,7 +35,7 @@ public class CalculatorWizardTest { @Before public void setUp() throws Exception { - wizards = new CalculatorWizards(Robolectric.application); + wizards = new CalculatorWizards(RuntimeEnvironment.application); wizard = wizards.getWizard(null); defaultWizard = wizards.getWizard(CalculatorWizards.DEFAULT_WIZARD_FLOW); } diff --git a/app-tests/src/test/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStepTest.java b/app/src/test/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStepTest.java similarity index 100% rename from app-tests/src/test/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStepTest.java rename to app/src/test/java/org/solovyev/android/calculator/wizard/OnScreenCalculatorWizardStepTest.java diff --git a/settings.gradle b/settings.gradle index 0abd7483..e7b4def4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ include ':app' -include ':app-tests'