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

Merge "[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-21 09:56:05 +00:00
committed by Android (Google) Code Review
parent c5df8f0cb4 8e3c49123d
commit 546a06af3d
24 changed files with 334 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/res/values/overlayable_icons_test.xml
View File

@@ -40,7 +40,7 @@
<item>@drawable/ic_delete</item>
<item>@drawable/ic_delete_accent</item>
<item>@drawable/ic_devices_other</item>
<item>@drawable/ic_devices_other_opaque_black</item>
<item>@drawable/ic_devices_other_32dp</item>
<item>@drawable/ic_do_not_disturb_on_24dp</item>
<item>@drawable/ic_eject_24dp</item>
<item>@drawable/ic_expand_less</item>

21
tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
View File

@@ -27,7 +27,6 @@ import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowWifiManager;
import com.android.settings.wifi.dpp.WifiDppEnrolleeActivity;
import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -38,7 +37,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
@@ -113,23 +111,4 @@ public class WifiDialogActivityTest {
assertThat(dialog.getContext().getThemeResId())
.isEqualTo(R.style.SuwAlertDialogThemeCompat_Light);
}
@Test
public void onScan_whenLaunchFromDeferredSetup_shouldApplyLightTheme() {
ActivityController<WifiDppEnrolleeActivity> controller = Robolectric.buildActivity(
WifiDppEnrolleeActivity.class,
new Intent()
.setAction(WifiDppEnrolleeActivity.ACTION_ENROLLEE_QR_CODE_SCANNER)
.putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true)
.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
);
controller.create();
Intent intent = controller.getIntent();
assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, false)).isTrue();
assertThat(intent.getBooleanExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, false)).isTrue();
assertThat(controller.get().getThemeResId()).
isEqualTo(R.style.LightTheme_SettingsBase_SetupWizard);
}
}

63
tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
View File

@@ -26,10 +26,13 @@ import android.os.RemoteException;
import android.provider.Settings;
import android.support.test.uiautomator.UiDevice;
import androidx.fragment.app.FragmentManager;
import androidx.test.InstrumentationRegistry;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import com.google.android.setupdesign.GlifLayout;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -60,8 +63,13 @@ public class WifiDppConfiguratorActivityTest {
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
mActivityRule.launchActivity(intent);
FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
WifiDppQrCodeScannerFragment fragment =
(WifiDppQrCodeScannerFragment) fragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
assertThat(fragment.getView() instanceof GlifLayout).isTrue();
assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
@@ -73,8 +81,13 @@ public class WifiDppConfiguratorActivityTest {
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
mActivityRule.launchActivity(intent);
FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
WifiDppQrCodeGeneratorFragment fragment =
(WifiDppQrCodeGeneratorFragment) fragmentManager.findFragmentByTag(
WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
assertThat(fragment.getView() instanceof GlifLayout).isTrue();
assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
@@ -84,14 +97,14 @@ public class WifiDppConfiguratorActivityTest {
mActivityRule.launchActivity(intent);
assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(false);
assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
}
@Test
public void testActivity_shouldImplementsWifiNetworkConfigRetriever() {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiNetworkConfig.Retriever).isEqualTo(true);
assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();
}
@Test
@@ -99,7 +112,7 @@ public class WifiDppConfiguratorActivityTest {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppQrCodeGeneratorFragment
.OnQrCodeGeneratorFragmentAddButtonClickedListener).isEqualTo(true);
.OnQrCodeGeneratorFragmentAddButtonClickedListener).isTrue();
}
@Test
@@ -107,7 +120,7 @@ public class WifiDppConfiguratorActivityTest {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppQrCodeScannerFragment
.OnScanWifiDppSuccessListener).isEqualTo(true);
.OnScanWifiDppSuccessListener).isTrue();
}
@Test
@@ -115,7 +128,7 @@ public class WifiDppConfiguratorActivityTest {
WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
assertThat(activity instanceof WifiDppAddDeviceFragment
.OnClickChooseDifferentNetworkListener).isEqualTo(true);
.OnClickChooseDifferentNetworkListener).isTrue();
}
@Test
@@ -175,40 +188,4 @@ public class WifiDppConfiguratorActivityTest {
assertThat(restoredWifiNetworkConfig.getNetworkId()).isEqualTo(0);
assertThat(restoredWifiNetworkConfig.isHotspot()).isTrue();
}
@Test
public void launchScanner_onNavigateUp_shouldFinish() {
Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
mActivityRule.launchActivity(intent);
instrumentation.runOnMainSync(() -> {
mActivityRule.getActivity().onNavigateUp();
assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(true);
});
}
@Test
public void launchGenerator_onNavigateUp_shouldFinish() {
Intent intent = new Intent(
WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
mActivityRule.launchActivity(intent);
instrumentation.runOnMainSync(() -> {
mActivityRule.getActivity().onNavigateUp();
assertThat(mActivityRule.getActivity().isFinishing()).isEqualTo(true);
});
}
}