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

Commit d47bfc43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Correct assertNotifyMotionWasNotCalled check"

parents e62737e2 96501612

services/inputflinger/tests/InputReader_test.cpp

+6 −3
Original line number Diff line number Diff line
@@ -7729,7 +7729,8 @@ protected: 
    }

};



TEST_F(MultiTouchInputMapperTest_SurfaceRange, Viewports_SurfaceRange) {

// TODO(b/175351838): Fix and enable this test

TEST_F(MultiTouchInputMapperTest_SurfaceRange, DISABLED_Viewports_SurfaceRange) {

    addConfigurationProperty("touch.deviceType", "touchScreen");

    prepareDisplay(DISPLAY_ORIENTATION_0);

    prepareAxes(POSITION);
@@ -7755,7 +7756,8 @@ TEST_F(MultiTouchInputMapperTest_SurfaceRange, Viewports_SurfaceRange) { 
    processPositionAndVerify(mapper, x - 1, y, x + 1, y, xExpected, yExpected);

}



TEST_F(MultiTouchInputMapperTest_SurfaceRange, Viewports_SurfaceRange_90) {

// TODO(b/175351838): Fix and enable this test

TEST_F(MultiTouchInputMapperTest_SurfaceRange, DISABLED_Viewports_SurfaceRange_90) {

    addConfigurationProperty("touch.deviceType", "touchScreen");

    prepareDisplay(DISPLAY_ORIENTATION_0);

    prepareAxes(POSITION);
@@ -7773,7 +7775,8 @@ TEST_F(MultiTouchInputMapperTest_SurfaceRange, Viewports_SurfaceRange_90) { 
    processPositionAndVerify(mapper, x - 1, y, x + 1, y, xExpected, yExpected);

}



TEST_F(MultiTouchInputMapperTest_SurfaceRange, Viewports_SurfaceRange_270) {

// TODO(b/175351838): Fix and enable this test

TEST_F(MultiTouchInputMapperTest_SurfaceRange, DISABLED_Viewports_SurfaceRange_270) {

    addConfigurationProperty("touch.deviceType", "touchScreen");

    prepareDisplay(DISPLAY_ORIENTATION_0);

    prepareAxes(POSITION);

services/inputflinger/tests/TestInputListener.cpp

+4 −6
Original line number Diff line number Diff line
@@ -14,11 +14,10 @@ 
 * limitations under the License.

 */



#include "TestInputListener.h"



#include <gtest/gtest.h>



#include "TestInputListener.h"



namespace android {



// --- TestInputListener ---
@@ -43,8 +42,7 @@ void TestInputListener::assertNotifyConfigurationChangedWasNotCalled() { 
            "notifyConfigurationChanged() should not be called."));

}



void TestInputListener::assertNotifyDeviceResetWasCalled(

        NotifyDeviceResetArgs* outEventArgs) {

void TestInputListener::assertNotifyDeviceResetWasCalled(NotifyDeviceResetArgs* outEventArgs) {

    ASSERT_NO_FATAL_FAILURE(

            assertCalled<

                    NotifyDeviceResetArgs>(outEventArgs,
@@ -73,7 +71,7 @@ void TestInputListener::assertNotifyMotionWasCalled(NotifyMotionArgs* outEventAr 


void TestInputListener::assertNotifyMotionWasNotCalled() {

    ASSERT_NO_FATAL_FAILURE(

            assertNotCalled<NotifySwitchArgs>("notifySwitch() should not be called."));

            assertNotCalled<NotifyMotionArgs>("notifyMotion() should not be called."));

}



void TestInputListener::assertNotifySwitchWasCalled(NotifySwitchArgs* outEventArgs) {