Fixed rest of tests

joabgeotec · May 9, 2019 · 3eddbd8 · 3eddbd8
1 parent c368733
commit 3eddbd8
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 45 deletions.
diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/DaylightSavingTest.java b/collect_app/src/test/java/org/odk/collect/android/utilities/DaylightSavingTest.java
@@ -27,11 +27,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.odk.collect.android.activities.FormEntryActivity;
 import org.odk.collect.android.widgets.DateTimeWidget;
 import org.odk.collect.android.widgets.DateWidget;
 import org.odk.collect.android.widgets.TimeWidget;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 import java.util.TimeZone;
 
@@ -106,7 +107,7 @@ private DateWidget prepareDateWidget(int year, int month, int day) {
         when(datePickerDialog.getDatePicker().getMonth()).thenReturn(month);
         when(datePickerDialog.getDatePicker().getDayOfMonth()).thenReturn(day);
 
-        DateWidget dateWidget = new DateWidget(RuntimeEnvironment.application, formEntryPromptStub);
+        DateWidget dateWidget = new DateWidget(Robolectric.buildActivity(FormEntryActivity.class).create().get(), formEntryPromptStub);
         dateWidget.setDatePickerDialog(datePickerDialog);
         return dateWidget;
     }
@@ -128,7 +129,7 @@ private DateTimeWidget prepareDateTimeWidget(int year, int month, int day, int h
         when(timeWidget.getHour()).thenReturn(hour);
         when(timeWidget.getMinute()).thenReturn(minute);
 
-        DateTimeWidget dateTimeWidget = new DateTimeWidget(RuntimeEnvironment.application, formEntryPromptStub);
+        DateTimeWidget dateTimeWidget = new DateTimeWidget(Robolectric.buildActivity(FormEntryActivity.class).create().get(), formEntryPromptStub);
         dateTimeWidget.setDateWidget(dateWidget);
         dateTimeWidget.setTimeWidget(timeWidget);
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/BooleanWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/BooleanWidgetTest.java
@@ -4,8 +4,9 @@
 
 import org.javarosa.core.model.data.BooleanData;
 import org.junit.Test;
+import org.odk.collect.android.activities.FormEntryActivity;
 import org.odk.collect.android.widgets.base.WidgetTest;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -18,7 +19,7 @@ public class BooleanWidgetTest extends WidgetTest {
 
     @NonNull
     private BooleanWidget getWidget() {
-        return new BooleanWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new BooleanWidget(Robolectric.buildActivity(FormEntryActivity.class).create().get(), formEntryPrompt);
     }
 
     // BooleanWidgets always return a non-null answer, so we need to handle these tests manually:

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/DateTimeWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/DateTimeWidgetTest.java
@@ -9,7 +9,6 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.widgets.base.GeneralDateTimeWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -31,7 +30,7 @@ public void setUp() throws Exception {
     @NonNull
     @Override
     public DateTimeWidget createWidget() {
-        return new DateTimeWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new DateTimeWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/DateWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/DateWidgetTest.java
@@ -8,7 +8,6 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.widgets.base.GeneralDateTimeWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,7 +29,7 @@ public void setUp() throws Exception {
     @NonNull
     @Override
     public DateWidget createWidget() {
-        return new DateWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new DateWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java
@@ -4,7 +4,6 @@
 
 import org.javarosa.core.model.data.DecimalData;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.text.NumberFormat;
 import java.util.Locale;
@@ -20,7 +19,7 @@ public class ExDecimalWidgetTest extends GeneralExStringWidgetTest<ExDecimalWidg
     @NonNull
     @Override
     public ExDecimalWidget createWidget() {
-        return new ExDecimalWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new ExDecimalWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java
@@ -6,7 +6,6 @@
 
 import org.javarosa.core.model.data.StringData;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import static org.mockito.Mockito.when;
 
@@ -19,7 +18,7 @@ public class ExStringWidgetTest extends GeneralExStringWidgetTest<ExStringWidget
     @NonNull
     @Override
     public ExStringWidget createWidget() {
-        return new ExStringWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new ExStringWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/GridMultiWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/GridMultiWidgetTest.java
@@ -7,7 +7,6 @@
 import org.javarosa.core.model.data.helper.Selection;
 import org.junit.Test;
 import org.odk.collect.android.widgets.base.GeneralSelectMultiWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +23,7 @@ public class GridMultiWidgetTest extends GeneralSelectMultiWidgetTest<GridMultiW
     @NonNull
     @Override
     public GridMultiWidget createWidget() {
-        return new GridMultiWidget(RuntimeEnvironment.application, formEntryPrompt, 1);
+        return new GridMultiWidget(activity, formEntryPrompt, 1);
     }
 
     @Test

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/GridWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/GridWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectOneWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -13,6 +12,6 @@ public class GridWidgetTest extends GeneralSelectOneWidgetTest<GridWidget> {
     @NonNull
     @Override
     public GridWidget createWidget() {
-        return new GridWidget(RuntimeEnvironment.application, formEntryPrompt, 1, false);
+        return new GridWidget(activity, formEntryPrompt, 1, false);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java
@@ -4,7 +4,6 @@
 
 import org.javarosa.core.model.data.IntegerData;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.util.Random;
 
@@ -18,7 +17,7 @@ public class IntegerWidgetTest extends GeneralStringWidgetTest<IntegerWidget, In
     public IntegerWidget createWidget() {
         Random random = new Random();
         boolean useThousandSeparator = random.nextBoolean();
-        return new IntegerWidget(RuntimeEnvironment.application, formEntryPrompt, false, useThousandSeparator);
+        return new IntegerWidget(activity, formEntryPrompt, false, useThousandSeparator);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ItemsetWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ItemsetWidgetTest.java
@@ -23,7 +23,6 @@
 import org.odk.collect.android.utilities.FileUtil;
 import org.odk.collect.android.utilities.XPathParseTool;
 import org.odk.collect.android.widgets.base.QuestionWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.io.File;
 import java.util.HashMap;
@@ -91,7 +90,7 @@ public class ItemsetWidgetTest extends QuestionWidgetTest<ItemsetWidget, StringD
     @NonNull
     @Override
     public ItemsetWidget createWidget() {
-        return new ItemsetWidget(RuntimeEnvironment.application, formEntryPrompt,
+        return new ItemsetWidget(activity, formEntryPrompt,
                 false, parseTool, adapter, fileUtil);
     }
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ListWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ListWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectOneWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -13,6 +12,6 @@ public class ListWidgetTest extends GeneralSelectOneWidgetTest<ListWidget> {
     @NonNull
     @Override
     public ListWidget createWidget() {
-        return new ListWidget(RuntimeEnvironment.application, formEntryPrompt, false, false);
+        return new ListWidget(activity, formEntryPrompt, false, false);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/RangeDecimalWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/RangeDecimalWidgetTest.java
@@ -4,7 +4,6 @@
 
 import org.javarosa.core.model.data.DecimalData;
 import org.odk.collect.android.widgets.base.RangeWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -15,7 +14,7 @@ public class RangeDecimalWidgetTest extends RangeWidgetTest<RangeDecimalWidget,
     @NonNull
     @Override
     public RangeDecimalWidget createWidget() {
-        return new RangeDecimalWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new RangeDecimalWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/RangeIntegerWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/RangeIntegerWidgetTest.java
@@ -4,7 +4,6 @@
 
 import org.javarosa.core.model.data.IntegerData;
 import org.odk.collect.android.widgets.base.RangeWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -15,7 +14,7 @@ public class RangeIntegerWidgetTest extends RangeWidgetTest<RangeIntegerWidget,
     @NonNull
     @Override
     public RangeIntegerWidget createWidget() {
-        return new RangeIntegerWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new RangeIntegerWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SelectMultiWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SelectMultiWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectMultiWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -13,6 +12,6 @@ public class SelectMultiWidgetTest extends GeneralSelectMultiWidgetTest<SelectMu
     @NonNull
     @Override
     public SelectMultiWidget createWidget() {
-        return new SelectMultiWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new SelectMultiWidget(activity, formEntryPrompt);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SelectOneSearchWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SelectOneSearchWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectOneWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -13,6 +12,6 @@ public class SelectOneSearchWidgetTest extends GeneralSelectOneWidgetTest<Select
     @NonNull
     @Override
     public SelectOneSearchWidget createWidget() {
-        return new SelectOneSearchWidget(RuntimeEnvironment.application, formEntryPrompt, false);
+        return new SelectOneSearchWidget(activity, formEntryPrompt, false);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SelectOneWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SelectOneWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectOneWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -14,6 +13,6 @@ public class SelectOneWidgetTest extends GeneralSelectOneWidgetTest<AbstractSele
     @NonNull
     @Override
     public SelectOneWidget createWidget() {
-        return new SelectOneWidget(RuntimeEnvironment.application, formEntryPrompt, false);
+        return new SelectOneWidget(activity, formEntryPrompt, false);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SpinnerMultiWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SpinnerMultiWidgetTest.java
@@ -4,7 +4,6 @@
 
 import org.javarosa.core.model.SelectChoice;
 import org.odk.collect.android.widgets.base.GeneralSelectMultiWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.util.List;
 
@@ -18,7 +17,7 @@ public class SpinnerMultiWidgetTest extends GeneralSelectMultiWidgetTest<Spinner
     @NonNull
     @Override
     public SpinnerMultiWidget createWidget() {
-        return new SpinnerMultiWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new SpinnerMultiWidget(activity, formEntryPrompt);
     }
 
     @Override

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/SpinnerWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/SpinnerWidgetTest.java
@@ -3,7 +3,6 @@
 import androidx.annotation.NonNull;
 
 import org.odk.collect.android.widgets.base.GeneralSelectOneWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -13,6 +12,6 @@ public class SpinnerWidgetTest extends GeneralSelectOneWidgetTest<SpinnerWidget>
     @NonNull
     @Override
     public SpinnerWidget createWidget() {
-        return new SpinnerWidget(RuntimeEnvironment.application, formEntryPrompt, false);
+        return new SpinnerWidget(activity, formEntryPrompt, false);
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java
@@ -6,7 +6,6 @@
 
 import org.javarosa.core.model.data.StringData;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import java.util.Random;
 
@@ -21,7 +20,7 @@ public class StringNumberWidgetTest
     public StringNumberWidget createWidget() {
         Random random = new Random();
         boolean useThousandSeparator = random.nextBoolean();
-        return new StringNumberWidget(RuntimeEnvironment.application, formEntryPrompt, false, useThousandSeparator);
+        return new StringNumberWidget(activity, formEntryPrompt, false, useThousandSeparator);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java
@@ -6,7 +6,6 @@
 
 import org.javarosa.core.model.data.StringData;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -16,7 +15,7 @@ public class StringWidgetTest extends GeneralStringWidgetTest<StringWidget, Stri
     @NonNull
     @Override
     public StringWidget createWidget() {
-        return new StringWidget(RuntimeEnvironment.application, formEntryPrompt, false);
+        return new StringWidget(activity, formEntryPrompt, false);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/TimeWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/TimeWidgetTest.java
@@ -9,7 +9,6 @@
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.widgets.base.GeneralDateTimeWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 import static org.junit.Assert.assertEquals;
 
@@ -24,7 +23,7 @@ public class TimeWidgetTest extends GeneralDateTimeWidgetTest<TimeWidget, TimeDa
     @NonNull
     @Override
     public TimeWidget createWidget() {
-        return new TimeWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new TimeWidget(activity, formEntryPrompt);
     }
 
     @NonNull

diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/UrlWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/UrlWidgetTest.java
@@ -6,7 +6,6 @@
 
 import org.javarosa.core.model.data.StringData;
 import org.odk.collect.android.widgets.base.QuestionWidgetTest;
-import org.robolectric.RuntimeEnvironment;
 
 /**
  * @author James Knight
@@ -16,7 +15,7 @@ public class UrlWidgetTest extends QuestionWidgetTest<UrlWidget, StringData> {
     @NonNull
     @Override
     public UrlWidget createWidget() {
-        return new UrlWidget(RuntimeEnvironment.application, formEntryPrompt);
+        return new UrlWidget(activity, formEntryPrompt);
     }
 
     @NonNull