Fix broken tests on Accessibility package
The VectorDrawableState would be new memory location to cause the VectorDrawableState are different. Bug: 187240532 Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonPreviewPreferenceControllerTest Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=FloatingMenuLayerDrawableTest Change-Id: I33bc9076ee288beb044af29e9974f5f6328f29b8
This commit is contained in:
@@ -33,6 +33,7 @@ import android.widget.ImageView;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.ImageTestUtils;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
@@ -73,8 +74,8 @@ public class AccessibilityButtonPreviewPreferenceControllerTest {
|
||||
|
||||
final Drawable navigationBarDrawable = mContext.getDrawable(
|
||||
R.drawable.accessibility_button_navigation);
|
||||
assertThat(mController.mPreview.getDrawable().getConstantState()).isEqualTo(
|
||||
navigationBarDrawable.getConstantState());
|
||||
assertThat(ImageTestUtils.drawableToBitmap(mController.mPreview.getDrawable()).sameAs(
|
||||
ImageTestUtils.drawableToBitmap(navigationBarDrawable))).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.ImageTestUtils;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
@@ -51,11 +52,10 @@ public class FloatingMenuLayerDrawableTest {
|
||||
|
||||
final Drawable actual1stDrawable = actualDrawable.getDrawable(0);
|
||||
final Drawable actual2ndDrawable = actualDrawable.getDrawable(1);
|
||||
// These are VectorDrawables, so it can use getConstantState() to compare.
|
||||
assertThat(actual1stDrawable.getConstantState()).isEqualTo(
|
||||
expected1stDrawable.getConstantState());
|
||||
assertThat(actual2ndDrawable.getConstantState()).isEqualTo(
|
||||
expected2ndDrawable.getConstantState());
|
||||
assertThat(ImageTestUtils.drawableToBitmap(actual1stDrawable).sameAs(
|
||||
ImageTestUtils.drawableToBitmap(expected1stDrawable))).isTrue();
|
||||
assertThat(ImageTestUtils.drawableToBitmap(actual2ndDrawable).sameAs(
|
||||
ImageTestUtils.drawableToBitmap(expected2ndDrawable))).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright (C) 2021 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.settings.testutils;
|
||||
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
/**
|
||||
* Utilities for testing images within unit tests.
|
||||
*/
|
||||
public class ImageTestUtils {
|
||||
|
||||
/** Converts the drawable object to bitmap. */
|
||||
@Nullable
|
||||
public static Bitmap drawableToBitmap(@Nullable Drawable drawable) {
|
||||
if (drawable == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final Bitmap bitmap =
|
||||
Bitmap.createBitmap(
|
||||
drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(),
|
||||
Bitmap.Config.ARGB_8888);
|
||||
final Canvas canvas = new Canvas(bitmap);
|
||||
drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
|
||||
drawable.draw(canvas);
|
||||
|
||||
return bitmap;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user