Merge "Add Private space Delete settings page inside PS settings page" into main
This commit is contained in:
Joseph Vincent
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
47abd1ba60
@@ -1,108 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2023 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.privatespace;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_INTERNAL;
|
||||
import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_NONE;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class DeletePrivateSpaceControllerTest {
|
||||
@Mock private PrivateSpaceMaintainer mPrivateSpaceMaintainer;
|
||||
@Mock private Context mContext;
|
||||
|
||||
private Preference mPreference;
|
||||
private DeletePrivateSpaceController mDeletePrivateSpaceController;
|
||||
|
||||
/** Required setup before a test. */
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
final String preferenceKey = "private_space_delete";
|
||||
|
||||
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
||||
mPreference.setKey(preferenceKey);
|
||||
|
||||
mDeletePrivateSpaceController =
|
||||
new DeletePrivateSpaceController(
|
||||
mContext,
|
||||
preferenceKey,
|
||||
new DeletePrivateSpaceController.Injector() {
|
||||
@Override
|
||||
PrivateSpaceMaintainer injectPrivateSpaceMaintainer(Context context) {
|
||||
return mPrivateSpaceMaintainer;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** Tests that the controller is always available. */
|
||||
@Test
|
||||
public void getAvailabilityStatus_returnsAvailable() {
|
||||
assertThat(mDeletePrivateSpaceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
|
||||
/** Tests that on click it attempts to delete the PS. */
|
||||
@Test
|
||||
public void handlePreferenceTreeClick_attemptsToDeletePrivateSpace() {
|
||||
doReturn(DELETE_PS_ERROR_NONE).when(mPrivateSpaceMaintainer).deletePrivateSpace();
|
||||
DeletePrivateSpaceController spy = Mockito.spy(mDeletePrivateSpaceController);
|
||||
doNothing().when(spy).showSuccessfulDeletionToast();
|
||||
spy.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
verify(mPrivateSpaceMaintainer).deletePrivateSpace();
|
||||
}
|
||||
|
||||
/** Tests that on deletion of PS relevant toast is shown. */
|
||||
@Test
|
||||
public void handlePreferenceTreeClick_onDeletion_showsDeletedToast() {
|
||||
doReturn(DELETE_PS_ERROR_NONE).when(mPrivateSpaceMaintainer).deletePrivateSpace();
|
||||
DeletePrivateSpaceController spy = Mockito.spy(mDeletePrivateSpaceController);
|
||||
doNothing().when(spy).showSuccessfulDeletionToast();
|
||||
spy.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
verify(spy).showSuccessfulDeletionToast();
|
||||
}
|
||||
|
||||
/** Tests that on failing to delete the PS relevant toast is shown. */
|
||||
@Test
|
||||
public void handlePreferenceTreeClick_onDeletionError_showsDeletionFailedToast() {
|
||||
doReturn(DELETE_PS_ERROR_INTERNAL).when(mPrivateSpaceMaintainer).deletePrivateSpace();
|
||||
DeletePrivateSpaceController spy = Mockito.spy(mDeletePrivateSpaceController);
|
||||
doNothing().when(spy).showDeletionInternalErrorToast();
|
||||
spy.handlePreferenceTreeClick(mPreference);
|
||||
|
||||
verify(spy).showDeletionInternalErrorToast();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.privatespace.delete;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class DeletePrivateSpaceControllerTest {
|
||||
@Mock private Context mContext;
|
||||
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
private Preference mPreference;
|
||||
private DeletePrivateSpaceController mDeletePrivateSpaceController;
|
||||
|
||||
/** Required setup before a test. */
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
final String preferenceKey = "private_space_delete";
|
||||
|
||||
mPreference = new Preference(ApplicationProvider.getApplicationContext());
|
||||
mPreference.setKey(preferenceKey);
|
||||
|
||||
mDeletePrivateSpaceController = new DeletePrivateSpaceController(mContext, preferenceKey);
|
||||
}
|
||||
|
||||
/** Tests that the controller is available when private space flag is enabled. */
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenPrivateFlagEnabled_returnsAvailable() {
|
||||
mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
|
||||
assertThat(mDeletePrivateSpaceController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
|
||||
/** Tests that the controller is not available when private space flag is disabled. */
|
||||
@Test
|
||||
public void getAvailabilityStatus_whenPrivateFlagDisabled_returnsUnsupportedOnDevice() {
|
||||
mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
|
||||
assertThat(mDeletePrivateSpaceController.getAvailabilityStatus())
|
||||
.isEqualTo(UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.privatespace.delete;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.os.Flags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
|
||||
import androidx.test.annotation.UiThreadTest;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class PrivateSpaceDeleteFragmentTest {
|
||||
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
private PrivateSpaceDeleteFragment mFragment;
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void verifyMetricsConstant() {
|
||||
mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
mFragment = spy(new PrivateSpaceDeleteFragment());
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.PRIVATE_SPACE_SETTINGS);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.privatespace.delete;
|
||||
|
||||
import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDeletingPrivateSpace.DELETE_PS_ERROR_INTERNAL;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
import android.os.Flags;
|
||||
import android.platform.test.flag.junit.SetFlagsRule;
|
||||
|
||||
import androidx.test.annotation.UiThreadTest;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.privatespace.PrivateSpaceMaintainer;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class PrivateSpaceDeletionProgressFragmentTest {
|
||||
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
private Context mContext;
|
||||
private PrivateSpaceDeletionProgressFragment mFragment;
|
||||
private PrivateSpaceMaintainer mPrivateSpaceMaintainer;
|
||||
@Mock private PrivateSpaceMaintainer mPrivateSpaceMaintainerMock;
|
||||
|
||||
@UiThreadTest
|
||||
@Before
|
||||
public void setup() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ApplicationProvider.getApplicationContext();
|
||||
mFragment = new PrivateSpaceDeletionProgressFragment();
|
||||
PrivateSpaceDeletionProgressFragment.Injector injector =
|
||||
new PrivateSpaceDeletionProgressFragment.Injector() {
|
||||
@Override
|
||||
public PrivateSpaceMaintainer injectPrivateSpaceMaintainer(Context context) {
|
||||
return mPrivateSpaceMaintainer;
|
||||
}
|
||||
};
|
||||
mPrivateSpaceMaintainer = PrivateSpaceMaintainer.getInstance(mContext);
|
||||
mFragment.setPrivateSpaceMaintainer(injector);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
mPrivateSpaceMaintainer.deletePrivateSpace();
|
||||
}
|
||||
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void verifyMetricsConstant() {
|
||||
mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.PRIVATE_SPACE_SETTINGS);
|
||||
}
|
||||
|
||||
/** Tests that deletePrivateSpace() deletes the private space. */
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void deletePrivateSpace_deletesPS() {
|
||||
PrivateSpaceDeletionProgressFragment spyFragment = spy(mFragment);
|
||||
doNothing().when(spyFragment).showSuccessfulDeletionToast();
|
||||
mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
|
||||
mPrivateSpaceMaintainer.createPrivateSpace();
|
||||
spyFragment.deletePrivateSpace();
|
||||
assertThat(mPrivateSpaceMaintainer.doesPrivateSpaceExist()).isFalse();
|
||||
}
|
||||
|
||||
/** Tests that on deletion of the private space relevant toast is shown. */
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void deletePrivateSpace_onDeletion_showsDeletedToast() {
|
||||
PrivateSpaceDeletionProgressFragment spyFragment = spy(mFragment);
|
||||
doNothing().when(spyFragment).showSuccessfulDeletionToast();
|
||||
mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
|
||||
mPrivateSpaceMaintainer.createPrivateSpace();
|
||||
spyFragment.deletePrivateSpace();
|
||||
verify(spyFragment).showSuccessfulDeletionToast();
|
||||
}
|
||||
|
||||
/** Tests that on failing to delete the private space relevant toast is shown. */
|
||||
@Test
|
||||
@UiThreadTest
|
||||
public void deletePrivateSpace_onDeletionError_showsDeletionFailedToast() {
|
||||
PrivateSpaceDeletionProgressFragment spyFragment =
|
||||
spy(new PrivateSpaceDeletionProgressFragment());
|
||||
PrivateSpaceDeletionProgressFragment.Injector injector =
|
||||
new PrivateSpaceDeletionProgressFragment.Injector() {
|
||||
@Override
|
||||
PrivateSpaceMaintainer injectPrivateSpaceMaintainer(Context context) {
|
||||
return mPrivateSpaceMaintainerMock;
|
||||
}
|
||||
};
|
||||
spyFragment.setPrivateSpaceMaintainer(injector);
|
||||
doReturn(DELETE_PS_ERROR_INTERNAL).when(mPrivateSpaceMaintainerMock).deletePrivateSpace();
|
||||
doNothing().when(spyFragment).showDeletionInternalErrorToast();
|
||||
mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);
|
||||
|
||||
spyFragment.deletePrivateSpace();
|
||||
|
||||
verify(spyFragment).showDeletionInternalErrorToast();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user