Merge "Move common logic to TestDocumentClipper." into arc-apps (9e743064) · Commits · e / os / android_packages_apps_DocumentsUI

tests/common/com/android/documentsui/testing/TestDocumentClipper.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.documentsui.testing;

		import static junit.framework.Assert.assertNull;
		import static junit.framework.Assert.assertSame;

		import android.content.ClipData;
		import android.net.Uri;

		@@ -30,6 +33,8 @@ import java.util.function.Function;

		public class TestDocumentClipper implements DocumentClipper {

		private ClipData mLastClipData;

		@Override
		public boolean hasItemsToPaste() {
		return false;
		@@ -63,6 +68,7 @@ public class TestDocumentClipper implements DocumentClipper {
		@Override
		public void copyFromClipData(RootInfo root, DocumentInfo destination, ClipData clipData,
		Callback callback) {
		mLastClipData = clipData;
		}

		@Override
		@@ -75,5 +81,11 @@ public class TestDocumentClipper implements DocumentClipper {
		return 0;
		}

		public void assertNoClipData() {
		assertNull(mLastClipData);
		}

		public void assertSameClipData(ClipData expect) {
		assertSame(expect, mLastClipData);
		}
		}

tests/unit/com/android/documentsui/files/ActionHandlerTest.java

+6 −25

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ public class ActionHandlerTest {
		private TestDialogController mDialogs;
		private TestConfirmationCallback mCallback;
		private ActionHandler<TestActivity> mHandler;
		private TestDocumentClipper mClipper;
		private boolean refreshAnswer = false;
		private ClipData mClipDataFromCallback;

		@Before
		public void setUp() {
		@@ -84,14 +84,13 @@ public class ActionHandlerTest {
		mCallback = new TestConfirmationCallback();
		mEnv.roots.configurePm(mActivity.packageMgr);
		mEnv.injector.dialogs = mDialogs;
		mClipper = new TestDocumentClipper();

		mHandler = createHandler();

		mDialogs.confirmNext();

		mEnv.selectDocument(TestEnv.FILE_GIF);

		mClipDataFromCallback = null;
		}

		@Test
		@@ -390,16 +389,7 @@ public class ActionHandlerTest {
		mEnv.searchViewManager,
		mEnv::lookupExecutor,
		mActionModeAddons,
		new TestDocumentClipper() {
		@Override
		public void copyFromClipData(
		RootInfo root,
		DocumentInfo destination,
		ClipData clipData,
		Callback callback) {
		mClipDataFromCallback = clipData;
		}
		},
		mClipper,
		null,
		mEnv.injector
		);
		@@ -415,7 +405,7 @@ public class ActionHandlerTest {

		mEnv.beforeAsserts();

		assertSame(clipData, mClipDataFromCallback);
		mClipper.assertSameClipData(clipData);
		}

		@Test
		@@ -428,16 +418,7 @@ public class ActionHandlerTest {
		mEnv.searchViewManager,
		mEnv::lookupExecutor,
		mActionModeAddons,
		new TestDocumentClipper() {
		@Override
		public void copyFromClipData(
		RootInfo root,
		DocumentInfo destination,
		ClipData clipData,
		Callback callback) {
		mClipDataFromCallback = clipData;
		}
		},
		mClipper,
		null,
		mEnv.injector
		);
		@@ -451,7 +432,7 @@ public class ActionHandlerTest {

		mEnv.beforeAsserts();

		assertNull(mClipDataFromCallback);
		mClipper.assertNoClipData();
		}

		@Test