Move Fingerprint settings to biometrics/fingerprint
Bug: 110589286 Test: make -j56 RunSettingsRoboTests Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL still works Test: adb shell am start -a android.settings.FINGERPRINT_SETUP still works Change-Id: If33b557137cae7b57e4a0e906ee95032bc589436
This commit is contained in:
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright (C) 2017 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.biometrics.fingerprint;
|
||||
|
||||
import static android.support.test.InstrumentationRegistry.getTargetContext;
|
||||
import static android.support.test.espresso.Espresso.onView;
|
||||
import static android.support.test.espresso.action.ViewActions.click;
|
||||
import static android.support.test.espresso.intent.Intents.intended;
|
||||
import static android.support.test.espresso.intent.Intents.intending;
|
||||
import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
|
||||
import static android.support.test.espresso.matcher.ViewMatchers.withId;
|
||||
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Instrumentation.ActivityResult;
|
||||
import android.content.ComponentName;
|
||||
import android.support.test.espresso.intent.rule.IntentsTestRule;
|
||||
import android.support.test.filters.SmallTest;
|
||||
import android.support.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SmallTest
|
||||
public class FingerprintEnrollFinishTest {
|
||||
|
||||
@Rule
|
||||
public IntentsTestRule<FingerprintEnrollFinish> mActivityRule =
|
||||
new IntentsTestRule<>(FingerprintEnrollFinish.class);
|
||||
|
||||
@Test
|
||||
public void clickAddAnother_shouldLaunchEnrolling() {
|
||||
final ComponentName enrollingComponent = new ComponentName(
|
||||
getTargetContext(),
|
||||
FingerprintEnrollEnrolling.class);
|
||||
|
||||
intending(hasComponent(enrollingComponent))
|
||||
.respondWith(new ActivityResult(Activity.RESULT_CANCELED, null));
|
||||
|
||||
onView(withId(R.id.add_another_button)).perform(click());
|
||||
|
||||
intended(hasComponent(enrollingComponent));
|
||||
assertFalse(mActivityRule.getActivity().isFinishing());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clickAddAnother_shouldPropagateResults() {
|
||||
final ComponentName enrollingComponent = new ComponentName(
|
||||
getTargetContext(),
|
||||
FingerprintEnrollEnrolling.class);
|
||||
|
||||
intending(hasComponent(enrollingComponent))
|
||||
.respondWith(new ActivityResult(Activity.RESULT_OK, null));
|
||||
|
||||
onView(withId(R.id.add_another_button)).perform(click());
|
||||
|
||||
intended(hasComponent(enrollingComponent));
|
||||
assertTrue(mActivityRule.getActivity().isFinishing());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void clickNext_shouldFinish() {
|
||||
onView(withId(R.id.next_button)).perform(click());
|
||||
assertTrue(mActivityRule.getActivity().isFinishing());
|
||||
}
|
||||
}
|
@@ -0,0 +1,109 @@
|
||||
/*
|
||||
* Copyright (C) 2016 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.biometrics.fingerprint;
|
||||
|
||||
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.ContextWrapper;
|
||||
import android.content.Intent;
|
||||
import android.hardware.fingerprint.Fingerprint;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.test.ActivityUnitTestCase;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class FingerprintEnrollIntroductionTest
|
||||
extends ActivityUnitTestCase<FingerprintEnrollIntroduction> {
|
||||
|
||||
private TestContext mContext;
|
||||
|
||||
@Mock
|
||||
private FingerprintManager mFingerprintManager;
|
||||
|
||||
private FingerprintEnrollIntroduction mActivity;
|
||||
|
||||
public FingerprintEnrollIntroductionTest() {
|
||||
super(FingerprintEnrollIntroduction.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = new TestContext(getInstrumentation().getTargetContext());
|
||||
setActivityContext(mContext);
|
||||
|
||||
getInstrumentation().runOnMainSync(() -> {
|
||||
final Intent intent = new Intent();
|
||||
mActivity = startActivity(intent,
|
||||
null /* savedInstanceState */, null /* lastNonConfigurationInstance */);
|
||||
});
|
||||
}
|
||||
|
||||
public void testMaxFingerprint_shouldShowErrorMessage() {
|
||||
final int max = mContext.getResources().getInteger(
|
||||
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
|
||||
doReturn(generateFingerprintList(max)).when(mFingerprintManager)
|
||||
.getEnrolledFingerprints(anyInt());
|
||||
|
||||
getInstrumentation().runOnMainSync(() -> {
|
||||
getInstrumentation().callActivityOnCreate(mActivity, null);
|
||||
getInstrumentation().callActivityOnResume(mActivity);
|
||||
});
|
||||
|
||||
final TextView errorTextView = (TextView) mActivity.findViewById(R.id.error_text);
|
||||
assertNotNull(errorTextView.getText().toString());
|
||||
|
||||
final Button nextButton = (Button) mActivity.findViewById(R.id.fingerprint_next_button);
|
||||
assertEquals(View.GONE, nextButton.getVisibility());
|
||||
}
|
||||
|
||||
private List<Fingerprint> generateFingerprintList(int num) {
|
||||
ArrayList<Fingerprint> list = new ArrayList<>();
|
||||
for (int i = 0; i < num; i++) {
|
||||
list.add(new Fingerprint("Fingerprint " + i, 0, i, 0));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public class TestContext extends ContextWrapper {
|
||||
|
||||
public TestContext(Context base) {
|
||||
super(base);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getSystemService(String name) {
|
||||
if (Context.FINGERPRINT_SERVICE.equals(name)) {
|
||||
return mFingerprintManager;
|
||||
}
|
||||
return super.getSystemService(name);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user