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

Commit bdbf0faa authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[33/n] Remove redundant spyOn()" into main

parents cc7e1e5e b9d3ffd1

services/tests/wmtests/src/com/android/server/wm/AppCompatCameraOverridesTest.java

+0 −1
Original line number Diff line number Diff line
@@ -374,7 +374,6 @@ public class AppCompatCameraOverridesTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<CameraOverridesRobotTest> consumer) {

        spyOn(mWm.mAppCompatConfiguration);

        final CameraOverridesRobotTest robot = new CameraOverridesRobotTest(mWm, mAtm, mSupervisor);

        consumer.accept(robot);

    }

services/tests/wmtests/src/com/android/server/wm/AppCompatFocusOverridesTest.java

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm; 
import static android.content.pm.ActivityInfo.OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS;

import static android.view.WindowManager.PROPERTY_COMPAT_ENABLE_FAKE_FOCUS;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;



import android.compat.testing.PlatformCompatChangeRule;

import android.platform.test.annotations.Presubmit;
@@ -177,7 +175,6 @@ public class AppCompatFocusOverridesTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<FocusOverridesRobotTest> consumer) {

        spyOn(mWm.mAppCompatConfiguration);

        final FocusOverridesRobotTest robot = new FocusOverridesRobotTest(mWm, mAtm, mSupervisor);

        consumer.accept(robot);

    }

services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java

+0 −1
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { 
     */

    void runTestScenario(boolean withActivity,

                         @NonNull Consumer<OrientationPolicyRobotTest> consumer) {

        spyOn(mWm.mAppCompatConfiguration);

        final OrientationPolicyRobotTest robot =

                new OrientationPolicyRobotTest(mWm, mAtm, mSupervisor, withActivity);

        consumer.accept(robot);

services/tests/wmtests/src/com/android/server/wm/AppCompatReachabilityOverridesTest.java

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ public class AppCompatReachabilityOverridesTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<ReachabilityOverridesRobotTest> consumer) {

        spyOn(mWm.mAppCompatConfiguration);

        final ReachabilityOverridesRobotTest robot =

                new ReachabilityOverridesRobotTest(mWm, mAtm, mSupervisor);

        consumer.accept(robot);

services/tests/wmtests/src/com/android/server/wm/AppCompatReachabilityPolicyTest.java

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ public class AppCompatReachabilityPolicyTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<ReachabilityPolicyRobotTest> consumer) {

        spyOn(mWm.mAppCompatConfiguration);

        final ReachabilityPolicyRobotTest robot =

                new ReachabilityPolicyRobotTest(mWm, mAtm, mSupervisor);

        consumer.accept(robot);