Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35d25d11 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

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

parents 9ac4eb34 d749a8b9
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static java.nio.charset.StandardCharsets.US_ASCII;

import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
@@ -39,7 +38,6 @@ import android.testing.AndroidTestingRunner;

import androidx.exifinterface.media.ExifInterface;
import androidx.test.filters.MediumTest;
import androidx.test.platform.app.InstrumentationRegistry;

import com.android.systemui.SysuiTestCase;

@@ -92,8 +90,7 @@ public class ImageExporterTest extends SysuiTestCase {

    @Test
    public void testImageExport() throws ExecutionException, InterruptedException, IOException {
        Context context = InstrumentationRegistry.getInstrumentation().getContext();
        ContentResolver contentResolver = context.getContentResolver();
        ContentResolver contentResolver = mContext.getContentResolver();
        ImageExporter exporter = new ImageExporter(contentResolver);

        UUID requestId = UUID.fromString("3c11da99-9284-4863-b1d5-6f3684976814");
+0 −8
Original line number Diff line number Diff line
@@ -26,11 +26,8 @@ import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;

import static java.util.Objects.requireNonNull;

import android.content.Context;
import android.graphics.Rect;
import android.hardware.display.DisplayManager;
import android.os.RemoteException;
import android.testing.AndroidTestingRunner;
import android.view.Display;
@@ -63,17 +60,12 @@ import java.util.concurrent.TimeoutException;
public class ScrollCaptureClientTest extends SysuiTestCase {
    private static final float MAX_PAGES = 3.0f;

    private Context mContext;
    private IWindowManager mWm;

    @Before
    public void setUp() {
        MockitoAnnotations.initMocks(this);
        Context context = InstrumentationRegistry.getInstrumentation().getContext();
        DisplayManager displayManager = requireNonNull(
                context.getSystemService(DisplayManager.class));
        mContext = context.createDisplayContext(
                displayManager.getDisplay(Display.DEFAULT_DISPLAY));
        mWm = mock(IWindowManager.class);
    }