Update some robolectric tests to no longer run on K.

Robolectric is preparing to drop support for 19.

PiperOrigin-RevId: 625724159

8 files changed, 4 insertions, 40 deletions

diff --git a/annotations/src/test/java/org/robolectric/versioning/AndroidVersionsTest.java b/annotations/src/test/java/org/robolectric/versioning/AndroidVersionsTest.java
index 670e695a3..764a7fa2d 100644
--- a/annotations/src/test/java/org/robolectric/versioning/AndroidVersionsTest.java
+++ b/annotations/src/test/java/org/robolectric/versioning/AndroidVersionsTest.java
@@ -155,15 +155,4 @@ public final class AndroidVersionsTest {
     assertThat(new AndroidVersions.L().getVersion()).isEqualTo("5.0");
     assertThat(new AndroidVersions.L().isReleased()).isEqualTo(true);
   }
-
-  @Test
-  public void testStandardInitializationK() {
-    assertThat(AndroidVersions.K.SDK_INT).isEqualTo(19);
-    assertThat(AndroidVersions.K.SHORT_CODE).isEqualTo("K");
-    assertThat(AndroidVersions.K.VERSION).isEqualTo("4.4");
-    assertThat(new AndroidVersions.K().getSdkInt()).isEqualTo(19);
-    assertThat(new AndroidVersions.K().getShortCode()).isEqualTo("K");
-    assertThat(new AndroidVersions.K().getVersion()).isEqualTo("4.4");
-    assertThat(new AndroidVersions.K().isReleased()).isEqualTo(true);
-  }
 }
diff --git a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java
index f1e71b978..a60af551b 100644
--- a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java
+++ b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java
@@ -79,11 +79,10 @@ public class RobolectricTestRunnerSelfTest {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = Build.VERSION_CODES.LOLLIPOP)
   public void testVersionConfiguration() {
-    assertThat(Build.VERSION.SDK_INT)
-        .isEqualTo(Build.VERSION_CODES.KITKAT);
-    assertThat(Build.VERSION.RELEASE).isEqualTo("4.4");
+    assertThat(Build.VERSION.SDK_INT).isEqualTo(Build.VERSION_CODES.LOLLIPOP);
+    assertThat(Build.VERSION.RELEASE).isEqualTo("5.0.2");
   }
 
   @Test public void hamcrestMatchersDontBlowUpDuringLinking() throws Exception {
diff --git a/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java b/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
index 3e9eb6a93..6dd5256b9 100644
--- a/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/BootstrapTest.java
@@ -32,7 +32,6 @@ import static android.content.res.Configuration.UI_MODE_NIGHT_YES;
 import static android.content.res.Configuration.UI_MODE_TYPE_APPLIANCE;
 import static android.content.res.Configuration.UI_MODE_TYPE_MASK;
 import static android.content.res.Configuration.UI_MODE_TYPE_NORMAL;
-import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.N;
 import static android.os.Build.VERSION_CODES.O;
 import static android.view.Surface.ROTATION_0;
@@ -311,7 +310,6 @@ public class BootstrapTest {
   }
 
   @Test
-  @Config(sdk = KITKAT)
   public void applyQualifiers_rtlPseudoLocale_shouldSetLayoutDirection() {
     Bootstrap.applyQualifiers(
         "ar-rXB", RuntimeEnvironment.getApiLevel(), configuration, displayMetrics);
diff --git a/robolectric/src/test/java/org/robolectric/android/controller/ActivityControllerTest.java b/robolectric/src/test/java/org/robolectric/android/controller/ActivityControllerTest.java
index 09aec11c9..6fe75980f 100644
--- a/robolectric/src/test/java/org/robolectric/android/controller/ActivityControllerTest.java
+++ b/robolectric/src/test/java/org/robolectric/android/controller/ActivityControllerTest.java
@@ -15,7 +15,6 @@ import android.app.WindowConfiguration;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
@@ -253,8 +252,7 @@ public class ActivityControllerTest {
   }
 
   @Test
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
-  public void attach_shouldWorkWithAPI19() {
+  public void attach_shouldWork() {
     MyActivity activity = Robolectric.buildActivity(MyActivity.class).create().get();
     assertThat(activity).isNotNull();
   }
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowBitmapTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowBitmapTest.java
index face8d842..ceeb7ef06 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowBitmapTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowBitmapTest.java
@@ -13,7 +13,6 @@ import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.os.Build;
 import android.os.Parcel;
 import android.util.DisplayMetrics;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -624,7 +623,6 @@ public class ShadowBitmapTest {
     bitmapOriginal.copyPixelsFromBuffer(buffer);
   }
 
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
   @Test
   public void reconfigure_withArgb8888Bitmap_validDimensionsAndConfig_doesNotThrow() {
     Bitmap original = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowNetworkTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowNetworkTest.java
index 53d3cbe7b..d7748729e 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowNetworkTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowNetworkTest.java
@@ -1,11 +1,9 @@
 package org.robolectric.shadows;
 
-import static android.os.Build.VERSION_CODES.KITKAT;
 import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1;
 import static android.os.Build.VERSION_CODES.M;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import android.net.Network;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -30,12 +28,6 @@ public class ShadowNetworkTest {
   }
 
   @Test
-  @Config(sdk = KITKAT)
-  public void shadowNetwork_newInstance_fails_preL() {
-    assertThrows(IllegalStateException.class, () -> ShadowNetwork.newInstance(111));
-  }
-
-  @Test
   @Config(minSdk = LOLLIPOP_MR1)
   public void bindSocketDatagramSocket_shouldNotCrash() throws Exception {
     Network network = ShadowNetwork.newInstance(0);
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowSystemPropertiesTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowSystemPropertiesTest.java
index b4562ce7a..602cafa01 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowSystemPropertiesTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowSystemPropertiesTest.java
@@ -53,12 +53,6 @@ public class ShadowSystemPropertiesTest {
   // android-all jar instead of loading build.prop from classpath aka LATEST_SDK.
 
   @Test
-  @Config(sdk = 19)
-  public void readPropFromJarNotClassPath19() {
-    assertThat(SystemProperties.getInt("ro.build.version.sdk", 0)).isEqualTo(19);
-  }
-
-  @Test
   @Config(sdk = 21)
   public void readPropFromJarNotClassPath21() {
     assertThat(SystemProperties.getInt("ro.build.version.sdk", 0)).isEqualTo(21);
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowUiAutomationTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowUiAutomationTest.java
index 4a3d5d527..eb9e124f7 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowUiAutomationTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowUiAutomationTest.java
@@ -1,6 +1,5 @@
 package org.robolectric.shadows;
 
-import static android.os.Build.VERSION_CODES.KITKAT;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.UiAutomation;
@@ -14,13 +13,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
 import org.robolectric.annotation.LooperMode;
 
 /** Test for {@link ShadowUiAutomation}. */
 @RunWith(AndroidJUnit4.class)
 public class ShadowUiAutomationTest {
-  @Config(sdk = KITKAT)
   @Test
   public void setAnimationScale_zero() throws Exception {
     ShadowUiAutomation.setAnimationScaleCompat(0);
@@ -32,7 +29,6 @@ public class ShadowUiAutomationTest {
     assertThat(Settings.Global.getFloat(cr, Settings.Global.WINDOW_ANIMATION_SCALE)).isEqualTo(0);
   }
 
-  @Config(sdk = KITKAT)
   @Test
   public void setAnimationScale_one() throws Exception {
     ShadowUiAutomation.setAnimationScaleCompat(1);