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

Commit 7c32ae9a authored by Anushree Ganjam's avatar Anushree Ganjam
Browse files

Move more tests to deviceless 

Bug: 353339741
Test: Manual
Flag: TEST_ONLY
Change-Id: Ib43d5a17feb812b08d9749b1bf6dcacabf205d47
parent bad6ce48

quickstep/tests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt→quickstep/tests/multivalentTests/src/com/android/launcher3/model/QuickstepModelDelegateTest.kt

+24 −9
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.launcher3.model



import android.app.prediction.AppPredictor
@@ -19,7 +34,7 @@ import org.junit.runner.RunWith 
import org.mockito.Mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyZeroInteractions

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.MockitoAnnotations



/** Unit tests for [QuickstepModelDelegate]. */
@@ -57,25 +72,25 @@ class QuickstepModelDelegateTest { 
        underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_PREDICTION)



        verify(allAppsPredictor).notifyAppTargetEvent(mockedAppTargetEvent)

        verifyZeroInteractions(hotseatPredictor)

        verifyZeroInteractions(widgetRecommendationPredictor)

        verifyNoMoreInteractions(hotseatPredictor)

        verifyNoMoreInteractions(widgetRecommendationPredictor)

    }



    @Test

    fun onWidgetPrediction_notifyWidgetRecommendationPredictor() {

        underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WIDGETS_PREDICTION)



        verifyZeroInteractions(allAppsPredictor)

        verifyNoMoreInteractions(allAppsPredictor)

        verify(widgetRecommendationPredictor).notifyAppTargetEvent(mockedAppTargetEvent)

        verifyZeroInteractions(hotseatPredictor)

        verifyNoMoreInteractions(hotseatPredictor)

    }



    @Test

    fun onHotseatPrediction_notifyHotseatPredictor() {

        underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_HOTSEAT_PREDICTION)



        verifyZeroInteractions(allAppsPredictor)

        verifyZeroInteractions(widgetRecommendationPredictor)

        verifyNoMoreInteractions(allAppsPredictor)

        verifyNoMoreInteractions(widgetRecommendationPredictor)

        verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent)

    }
@@ -83,8 +98,8 @@ class QuickstepModelDelegateTest { 
    fun onOtherClient_notifyHotseatPredictor() {

        underTest.onAppTargetEvent(mockedAppTargetEvent, CONTAINER_WALLPAPERS)



        verifyZeroInteractions(allAppsPredictor)

        verifyZeroInteractions(widgetRecommendationPredictor)

        verifyNoMoreInteractions(allAppsPredictor)

        verifyNoMoreInteractions(widgetRecommendationPredictor)

        verify(hotseatPredictor).notifyAppTargetEvent(mockedAppTargetEvent)

    }

tests/src/com/android/launcher3/touch/SingleAxisSwipeDetectorTest.java→tests/multivalentTests/src/com/android/launcher3/touch/SingleAxisSwipeDetectorTest.java

+8 −5
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ import static com.android.launcher3.touch.SingleAxisSwipeDetector.HORIZONTAL; 
import static com.android.launcher3.touch.SingleAxisSwipeDetector.VERTICAL;



import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyBoolean;

import static org.mockito.Matchers.anyFloat;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;
@@ -41,6 +41,8 @@ import androidx.test.runner.AndroidJUnit4; 


import com.android.launcher3.testcomponent.TouchEventGenerator;



import com.google.errorprone.annotations.FormatMethod;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -52,7 +54,8 @@ import org.mockito.MockitoAnnotations; 
public class SingleAxisSwipeDetectorTest {



    private static final String TAG = SingleAxisSwipeDetectorTest.class.getSimpleName();

    public static void L(String s, Object... parts) {

    @FormatMethod

    public static void logD(String s, Object... parts) {

        Log.d(TAG, (parts.length == 0) ? s : String.format(s, parts));

    }
@@ -82,7 +85,7 @@ public class SingleAxisSwipeDetectorTest { 
        mTouchSlop = orgConfig.getScaledTouchSlop();

        doReturn(mTouchSlop).when(mMockConfig).getScaledTouchSlop();



        L("mTouchSlop=", mTouchSlop);

        logD("mTouchSlop= %s", mTouchSlop);

    }



    @Test