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

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

Merge "Replace deprecated AndroidJUnit4." into main

parents 58c0e6fb e451d2ac

core/tests/coretests/src/android/graphics/FontListParserTest.java

+5 −5
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package android.graphics;



import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_NONE;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_SINGLE_FONT_WGHT_ITAL;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_SINGLE_FONT_WGHT_ONLY;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_TWO_FONTS_WGHT;

import static android.graphics.fonts.FontStyle.FONT_SLANT_ITALIC;

import static android.graphics.fonts.FontStyle.FONT_SLANT_UPRIGHT;

import static android.graphics.fonts.FontStyle.FONT_WEIGHT_NORMAL;

import static android.text.FontConfig.FontFamily.VARIANT_COMPACT;

import static android.text.FontConfig.FontFamily.VARIANT_DEFAULT;

import static android.text.FontConfig.FontFamily.VARIANT_ELEGANT;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_NONE;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_SINGLE_FONT_WGHT_ONLY;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_SINGLE_FONT_WGHT_ITAL;

import static android.graphics.fonts.FontFamily.Builder.VARIABLE_FONT_FAMILY_TYPE_TWO_FONTS_WGHT;



import static com.google.common.truth.Truth.assertThat;
@@ -38,8 +38,8 @@ import android.os.LocaleList; 
import android.text.FontConfig;

import android.util.Xml;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/graphics/RectTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNull; 


import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/graphics/TypefaceEqualsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.content.res.AssetManager; 
import android.graphics.fonts.Font;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/graphics/TypefaceSystemFallbackTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import android.text.FontConfig; 
import android.util.ArrayMap;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

core/tests/coretests/src/android/graphics/TypefaceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import android.text.FontConfig; 
import android.util.ArrayMap;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.LargeTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.frameworks.coretests.R;