Update DeleteFingerprintDialogTest to sdk 26 (80e1b060) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java

+12 −9

Original line number	Diff line number	Diff line
		@@ -17,6 +17,10 @@
		package com.android.settings.fingerprint;


		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;

		import android.app.Dialog;
		import android.hardware.fingerprint.Fingerprint;

		@@ -26,6 +30,7 @@ import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsF
		.DeleteFingerprintDialog;
		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settings.testutils.shadow.ShadowEventLogWriter;
		import com.android.settings.testutils.shadow.ShadowFragment;

		import org.junit.Before;
		import org.junit.Test;
		@@ -35,27 +40,25 @@ import org.mockito.MockitoAnnotations;
		import org.robolectric.annotation.Config;
		import org.robolectric.util.FragmentTestUtil;

		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.verify;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
		shadows = {
		ShadowEventLogWriter.class
		ShadowEventLogWriter.class,
		ShadowFragment.class
		})
		public class DeleteFingerprintDialogTest {

		@Mock
		private FingerprintSettingsFragment mTarget;
		@Mock
		private Fingerprint mFingerprint;
		private DeleteFingerprintDialog mFragment;
		@Mock
		private FingerprintSettingsFragment mTarget;

		private DeleteFingerprintDialog mFragment;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mFragment = DeleteFingerprintDialog.newInstance(mFingerprint, mTarget);
		mFragment = spy(DeleteFingerprintDialog.newInstance(mFingerprint, mTarget));
		}

		@Test

tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		/*
		* 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.testutils.shadow;

		import android.app.Fragment;
		import android.app.FragmentManager;

		import org.robolectric.annotation.Implementation;
		import org.robolectric.annotation.Implements;

		/**
		* Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception
		* in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as
		* the current {@link Fragment}. This is infeasible with our current framework.
		*/
		@Implements(
		value = Fragment.class,
		minSdk = 26
		)
		public class ShadowFragment {

		private Fragment mTargetFragment;

		@Implementation
		public void setTargetFragment(Fragment fragment, int requestCode) {
		mTargetFragment = fragment;
		}

		@Implementation
		final public Fragment getTargetFragment() {
		return mTargetFragment;
		}
		}