Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes for scrolling screenshot tests." into sc-dev

Browse Source
This commit is contained in:
Matt Casey
2021-06-04 15:33:58 +00:00
committed by Android (Google) Code Review
parent 9ac4eb345a d749a8b91d
commit 35d25d11c4
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/tests/src/com/android/systemui/screenshot/ImageExporterTest.java
View File

@@ -25,7 +25,6 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat; import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@@ -39,7 +38,6 @@ import android.testing.AndroidTestingRunner;
import androidx.exifinterface.media.ExifInterface; import androidx.exifinterface.media.ExifInterface;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import androidx.test.platform.app.InstrumentationRegistry;
import com.android.systemui.SysuiTestCase; import com.android.systemui.SysuiTestCase;
@@ -92,8 +90,7 @@ public class ImageExporterTest extends SysuiTestCase {
@Test @Test
public void testImageExport() throws ExecutionException, InterruptedException, IOException { public void testImageExport() throws ExecutionException, InterruptedException, IOException {
Context context = InstrumentationRegistry.getInstrumentation().getContext(); ContentResolver contentResolver = mContext.getContentResolver();
ContentResolver contentResolver = context.getContentResolver();
ImageExporter exporter = new ImageExporter(contentResolver); ImageExporter exporter = new ImageExporter(contentResolver);
UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814"); UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");

8
packages/SystemUI/tests/src/com/android/systemui/screenshot/ScrollCaptureClientTest.java
View File

@@ -26,11 +26,8 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static java.util.Objects.requireNonNull;
import android.content.Context; import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.view.Display; import android.view.Display;
@@ -63,17 +60,12 @@ import java.util.concurrent.TimeoutException;
public class ScrollCaptureClientTest extends SysuiTestCase { public class ScrollCaptureClientTest extends SysuiTestCase {
private static final float MAX_PAGES = 3.0f; private static final float MAX_PAGES = 3.0f;
private Context mContext;
private IWindowManager mWm; private IWindowManager mWm;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
Context context = InstrumentationRegistry.getInstrumentation().getContext(); Context context = InstrumentationRegistry.getInstrumentation().getContext();
DisplayManager displayManager = requireNonNull(
context.getSystemService(DisplayManager.class));
mContext = context.createDisplayContext(
displayManager.getDisplay(Display.DEFAULT_DISPLAY));
mWm = mock(IWindowManager.class); mWm = mock(IWindowManager.class);
} }