Test cleanups

spacecowboy · Jun 26, 2016 · be72b08 · be72b08
1 parent f9e0f01
commit be72b08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 55 deletions.
diff --git a/sample/src/androidTest/java/com/nononsenseapps/filepicker/sample/Helpers.java b/sample/src/androidTest/java/com/nononsenseapps/filepicker/sample/Helpers.java
diff --git a/sample/src/androidTest/java/com/nononsenseapps/filepicker/sample/SelectNewFile.java b/sample/src/androidTest/java/com/nononsenseapps/filepicker/sample/SelectNewFile.java
@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 
-import static com.nononsenseapps.filepicker.sample.Helpers.createTestDirsAndFiles;
 import static com.nononsenseapps.filepicker.sample.PermissionGranter.allowPermissionsIfNeeded;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
@@ -32,7 +31,13 @@
 public class SelectNewFile {
 
     @Rule
-    public ActivityTestRule<NoNonsenseFilePicker> mActivityTestRule = new ActivityTestRule<>(NoNonsenseFilePicker.class);
+    public ActivityTestRule<NoNonsenseFilePickerTest> mActivityTestRule =
+            new ActivityTestRule<>(NoNonsenseFilePickerTest.class);
+
+    @Before
+    public void allowPermissions() {
+        allowPermissionsIfNeeded(mActivityTestRule.getActivity());
+    }
 
     @Test
     public void selectNewFile() throws IOException {
@@ -50,9 +55,6 @@ public void selectNewFile() throws IOException {
                 allOf(withId(R.id.button_sd), withText("Pick SD-card"), isDisplayed()));
         button.perform(click());
 
-        allowPermissionsIfNeeded(mActivityTestRule.getActivity());
-        createTestDirsAndFiles();
-
         ViewInteraction recyclerView = onView(
                 allOf(withId(android.R.id.list), isDisplayed()));
 
@@ -101,9 +103,6 @@ public void withSingleClick() throws IOException {
                 allOf(withId(R.id.button_sd), isDisplayed()));
         button.perform(click());
 
-        allowPermissionsIfNeeded(mActivityTestRule.getActivity());
-        createTestDirsAndFiles();
-
         ViewInteraction recyclerView = onView(
                 allOf(withId(android.R.id.list), isDisplayed()));
 
@@ -120,7 +119,6 @@ public void withSingleClick() throws IOException {
         // Should have returned
         ViewInteraction textView = onView(withId(R.id.text));
         textView.check(matches(withText("file:///storage/emulated/0/000000_nonsense-tests/B-dir/file-3.txt")));
-
     }
 
     @Test
@@ -135,10 +133,6 @@ public void clickTwiceShouldNotClearFilename() throws IOException {
                 allOf(withId(R.id.button_sd), withText("Pick SD-card"), isDisplayed()));
         button.perform(click());
 
-
-        allowPermissionsIfNeeded(mActivityTestRule.getActivity());
-        createTestDirsAndFiles();
-
         ViewInteraction recyclerView = onView(
                 allOf(withId(android.R.id.list), isDisplayed()));
 

diff --git a/...c/androidTest/java/com/nononsenseapps/filepicker/sample/SelectNewFileStartPathisFile.java b/...c/androidTest/java/com/nononsenseapps/filepicker/sample/SelectNewFileStartPathisFile.java
@@ -21,14 +21,11 @@
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.replaceText;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withParent;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static com.nononsenseapps.filepicker.sample.Helpers.createTestDirsAndFiles;
 import static com.nononsenseapps.filepicker.sample.PermissionGranter.allowPermissionsIfNeeded;
 import static org.hamcrest.Matchers.allOf;