From cda4805e628e543ac715014a1eeef53a906f26cd Mon Sep 17 00:00:00 2001 From: Sihua Ma Date: Thu, 18 Jul 2024 23:42:54 +0000 Subject: [PATCH] Add unit test for RoundedCornerEnforcement Number of methods covered: 4 Test: atest NexusLauncherRoboTests:RoundedCornerEnforcementTest Test: SysUI studio Flag: TEST_ONLY Bug: 353303621 Change-Id: I488ce4a6617b96d4937a7030cd25831bcefadca1 --- .../widget/BaseLauncherAppWidgetHostView.java | 2 +- .../widget/RoundedCornerEnforcement.java | 2 +- .../widget/RoundedCornerEnforcementTest.kt | 106 ++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt diff --git a/src/com/android/launcher3/widget/BaseLauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/BaseLauncherAppWidgetHostView.java index 104209ef53..856f4b36b6 100644 --- a/src/com/android/launcher3/widget/BaseLauncherAppWidgetHostView.java +++ b/src/com/android/launcher3/widget/BaseLauncherAppWidgetHostView.java @@ -110,7 +110,7 @@ public abstract class BaseLauncherAppWidgetHostView extends NavigableAppWidgetHo } View background = RoundedCornerEnforcement.findBackground(this); if (background == null - || RoundedCornerEnforcement.hasAppWidgetOptedOut(this, background)) { + || RoundedCornerEnforcement.hasAppWidgetOptedOut(background)) { resetRoundedCorners(); return; } diff --git a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java index 1e46ffd30c..2e5e251f01 100644 --- a/src/com/android/launcher3/widget/RoundedCornerEnforcement.java +++ b/src/com/android/launcher3/widget/RoundedCornerEnforcement.java @@ -67,7 +67,7 @@ public class RoundedCornerEnforcement { /** * Check whether the app widget has opted out of the enforcement. */ - public static boolean hasAppWidgetOptedOut(@NonNull View appWidget, @NonNull View background) { + public static boolean hasAppWidgetOptedOut(@NonNull View background) { return background.getId() == android.R.id.background && background.getClipToOutline(); } diff --git a/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt b/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt new file mode 100644 index 0000000000..db7770205e --- /dev/null +++ b/tests/multivalentTests/src/com/android/launcher3/widget/RoundedCornerEnforcementTest.kt @@ -0,0 +1,106 @@ +/* + * 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.widget + +import android.content.Context +import android.content.res.Resources +import android.graphics.Rect +import android.view.View +import android.view.ViewGroup +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.launcher3.R +import org.junit.Assert.assertEquals +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.mock +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +class RoundedCornerEnforcementTest { + + @Test + fun `Widget view has one background`() { + val mockWidgetView = mock(LauncherAppWidgetHostView::class.java) + + doReturn(android.R.id.background).whenever(mockWidgetView).id + + assertSame(RoundedCornerEnforcement.findBackground(mockWidgetView), mockWidgetView) + } + + @Test + fun `Widget opted out of rounded corner enforcement`() { + val mockView = mock(View::class.java) + + doReturn(android.R.id.background).whenever(mockView).id + doReturn(true).whenever(mockView).clipToOutline + + assertTrue(RoundedCornerEnforcement.hasAppWidgetOptedOut(mockView)) + } + + @Test + fun `Compute rect based on widget view with background`() { + val mockBackgroundView = mock(View::class.java) + val mockWidgetView = mock(ViewGroup::class.java) + val testRect = Rect(0, 0, 0, 0) + + doReturn(WIDTH).whenever(mockBackgroundView).width + doReturn(HEIGHT).whenever(mockBackgroundView).height + doReturn(LEFT).whenever(mockBackgroundView).left + doReturn(TOP).whenever(mockBackgroundView).top + doReturn(mockWidgetView).whenever(mockBackgroundView).parent + + RoundedCornerEnforcement.computeRoundedRectangle( + mockWidgetView, + mockBackgroundView, + testRect + ) + + assertEquals(Rect(50, 75, 250, 275), testRect) + } + + @Test + fun `Compute system radius`() { + val mockContext = mock(Context::class.java) + val mockRes = mock(Resources::class.java) + + doReturn(mockRes).whenever(mockContext).resources + doReturn(RADIUS) + .whenever(mockRes) + .getDimension(eq(android.R.dimen.system_app_widget_background_radius)) + doReturn(LAUNCHER_RADIUS) + .whenever(mockRes) + .getDimension(eq(R.dimen.enforced_rounded_corner_max_radius)) + + assertEquals(RADIUS, RoundedCornerEnforcement.computeEnforcedRadius(mockContext)) + } + + companion object { + const val WIDTH = 200 + const val HEIGHT = 200 + const val LEFT = 50 + const val TOP = 75 + + const val RADIUS = 8f + const val LAUNCHER_RADIUS = 16f + } +}