Rework DeleteRepeatDialogFragment tests

Author: seadowg

collect_app/src/test/java/org/odk/collect/android/formentry/repeats/DeleteRepeatDialogFragmentTest.java

@@ -3,7 +3,7 @@
 import static junit.framework.TestCase.assertTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
@@ -12,12 +12,14 @@
 import static org.robolectric.Shadows.shadowOf;
 
 import android.content.DialogInterface;
+import android.os.Bundle;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentResultListener;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.viewmodel.CreationExtras;
@@ -61,12 +63,6 @@ public <T extends ViewModel> T create(@NonNull Class<T> modelClass, @NonNull Cre
         });
     }
 
-    @Test
-    public void fragmentActivityShouldImplementDeleteRepeatDialogCallback() {
-        launchDialog();
-        assertThat(dialogFragment.getActivity(), instanceOf(DeleteRepeatDialogFragment.DeleteRepeatDialogCallback.class));
-    }
-
     @Test
     public void dialogIsNotCancellable() {
         launchDialog();
@@ -106,14 +102,23 @@ public void clickingRemoveGroup_shouldDismissTheDialog() {
     }
 
     @Test
-    public void clickingRemoveGroup_callsDeleteGroup() {
+    public void clickingRemoveGroup_setsResult() {
         AlertDialog dialog = launchDialog();
-        assertThat(activity.deleteGroupCalled, equalTo(false));
+
+        FragmentResultCapturer fragmentResultCapturer = new FragmentResultCapturer();
+        activity.getSupportFragmentManager().setFragmentResultListener(DeleteRepeatDialogFragment.REQUEST_DELETE_REPEAT, activity, fragmentResultCapturer);
 
         dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
+        RobolectricHelpers.runLooper();
+        assertThat(fragmentResultCapturer.result, notNullValue());
+    }
 
+    @Test
+    public void clickingRemoveGroup_callsDeleteRepeat() {
+        AlertDialog dialog = launchDialog();
+
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick();
         RobolectricHelpers.runLooper();
-        assertThat(activity.deleteGroupCalled, equalTo(true));
         verify(formController).deleteRepeat();
     }
 
@@ -123,16 +128,17 @@ private AlertDialog launchDialog() {
         return (AlertDialog) ShadowDialog.getLatestDialog();
     }
 
-    public static class TestActivity extends FragmentActivity implements DeleteRepeatDialogFragment.DeleteRepeatDialogCallback {
+    public static class TestActivity extends FragmentActivity {
 
-        private boolean deleteGroupCalled;
+    }
 
-        TestActivity() {
-        }
+    private static class FragmentResultCapturer implements FragmentResultListener {
+
+        public Bundle result;
 
         @Override
-        public void deleteGroup() {
-            deleteGroupCalled = true;
+        public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) {
+            this.result = result;
         }
     }
 }