Merge "Hide search box if it is called in initial setup wizard"

This commit is contained in:
TreeHugger Robot
2019-10-18 04:00:32 +00:00
committed by Android (Google) Code Review
12 changed files with 62 additions and 68 deletions

View File

@@ -17,29 +17,33 @@
package com.android.settings.search.actionbar;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings.Global;
import android.view.Menu;
import android.view.MenuItem;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.google.android.setupcompat.util.WizardManagerHelper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
@@ -48,40 +52,27 @@ public class SearchMenuControllerTest {
@Mock
private Menu mMenu;
private TestPreferenceFragment mPreferenceHost;
private InstrumentedFragment mHost;
private Context mContext;
private FragmentActivity mActivity;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mHost = new InstrumentedFragment() {
@Override
public Context getContext() {
return mContext;
}
mActivity = Robolectric.buildActivity(FragmentActivity.class).get();
mHost = spy(new InstrumentedFragment() {
@Override
public int getMetricsCategory() {
return SettingsEnums.TESTING;
}
};
mPreferenceHost = new TestPreferenceFragment();
Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
});
Global.putInt(mActivity.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
when(mHost.getActivity()).thenReturn(mActivity);
when(mMenu.add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu))
.thenReturn(mock(MenuItem.class));
}
@Test
public void init_prefFragment_shouldAddMenu() {
SearchMenuController.init(mPreferenceHost);
mPreferenceHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
verify(mMenu).add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu);
}
@Test
public void init_observableFragment_shouldAddMenu() {
SearchMenuController.init(mHost);
@@ -103,26 +94,22 @@ public class SearchMenuControllerTest {
@Test
public void init_deviceNotProvisioned_shouldNotAddMenu() {
Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
Global.putInt(mActivity.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
SearchMenuController.init(mHost);
mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
verifyZeroInteractions(mMenu);
}
private static class TestPreferenceFragment extends InstrumentedPreferenceFragment {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
}
@Test
public void init_startFromSetupWizard_shouldNotAddMenu() {
final Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
mActivity.setIntent(intent);
SearchMenuController.init(mHost);
@Override
public Context getContext() {
return RuntimeEnvironment.application;
}
mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
@Override
public int getMetricsCategory() {
return SettingsEnums.TESTING;
}
verifyZeroInteractions(mMenu);
}
}