PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove FragmentUtilsTest class

Browse Source 
We directly use FragmentController to start fragment.

Change-Id: Iff78f321165d666f96d84f001ff054257a1aaede
Fixes: 111195449
Test: robotest
This commit is contained in:
tmfang
2018-09-27 18:39:18 +08:00
parent 67793945f0
commit c28c836dcb
9 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
View File

@@ -37,12 +37,12 @@ import android.widget.CheckBox;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -51,6 +51,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
@@ -190,7 +191,8 @@ public class BluetoothPairingDialogTest {
BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
// this should throw an error
FragmentTestUtils.startFragment(frag);
FragmentController.setupFragment(frag, FragmentActivity.class, 0 /* containerViewId */,
null /* bundle */);
fail("Starting the fragment with no controller set should have thrown an exception.");
}
@@ -286,7 +288,7 @@ public class BluetoothPairingDialogTest {
// verify that the checkbox is visible and that the device name is correct
CheckBox sharingCheckbox =
frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.VISIBLE);
}
@@ -304,7 +306,7 @@ public class BluetoothPairingDialogTest {
// verify that the checkbox is gone
CheckBox sharingCheckbox =
frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.GONE);
}
@@ -450,7 +452,8 @@ public class BluetoothPairingDialogTest {
frag.setPairingController(controller);
assertThat(frag.isPairingDialogActivitySet()).isFalse();
frag.setPairingDialogActivity(dialogActivity);
FragmentTestUtils.startFragment(frag);
FragmentController.setupFragment(frag, FragmentActivity.class, 0 /* containerViewId */,
null /* bundle */);
assertThat(frag.getmDialog()).isNotNull();
assertThat(frag.isPairingControllerSet()).isTrue();
assertThat(frag.isPairingDialogActivitySet()).isTrue();