From 8ad59e2117204ea63837bef91f309470a200adc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Mon, 18 Nov 2024 22:40:32 +0100 Subject: [PATCH] Remove TODOs in Roborazzi tests The first TODO, about `robolectric.screenshot.hwrdr.native`, has been here for a couple of versions now. The second one refers to an issue which has been fixed. --- .../integration/roborazzi/RoborazziCaptureTest.kt | 14 +------------- .../shadows/HardwareRenderingScreenshot.java | 3 +-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/integration_tests/roborazzi/src/test/java/org/robolectric/integration/roborazzi/RoborazziCaptureTest.kt b/integration_tests/roborazzi/src/test/java/org/robolectric/integration/roborazzi/RoborazziCaptureTest.kt index 5995d7f923a..21b2cffa54e 100644 --- a/integration_tests/roborazzi/src/test/java/org/robolectric/integration/roborazzi/RoborazziCaptureTest.kt +++ b/integration_tests/roborazzi/src/test/java/org/robolectric/integration/roborazzi/RoborazziCaptureTest.kt @@ -100,9 +100,6 @@ class RoborazziCaptureTest { } companion object { - // TODO(hoisie): `robolectric.screenshot.hwrdr.native` is obsolete, remove it after the next - // Robolectric point release. - const val USE_HARDWARE_RENDERER_NATIVE_ENV = "robolectric.screenshot.hwrdr.native" const val PIXEL_COPY_RENDER_MODE = "robolectric.pixelCopyRenderMode" } } @@ -114,24 +111,15 @@ private fun registerActivityToPackageManager(activity: String) { .addActivityIfNotPresent(ComponentName(appContext.packageName, activity)) } -@Suppress("ForbiddenComment") private fun hardwareRendererEnvironment(block: () -> Unit) { - val originalHwrdrOption = - System.getProperty(RoborazziCaptureTest.USE_HARDWARE_RENDERER_NATIVE_ENV, null) val originalPixelCopyOption = System.getProperty(RoborazziCaptureTest.PIXEL_COPY_RENDER_MODE, null) - // This cause ClassNotFoundException: java.nio.NioUtils - // TODO: Remove comment out after fix this issue - // https://github.com/robolectric/robolectric/issues/8081#issuecomment-1858726896 - // System.setProperty(USE_HARDWARE_RENDERER_NATIVE_ENV, "true") try { block() } finally { - if (originalHwrdrOption == null) { - System.clearProperty(RoborazziCaptureTest.USE_HARDWARE_RENDERER_NATIVE_ENV) + if (originalPixelCopyOption == null) { System.clearProperty(RoborazziCaptureTest.PIXEL_COPY_RENDER_MODE) } else { - System.setProperty(RoborazziCaptureTest.USE_HARDWARE_RENDERER_NATIVE_ENV, originalHwrdrOption) System.setProperty(RoborazziCaptureTest.PIXEL_COPY_RENDER_MODE, originalPixelCopyOption) } } diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/HardwareRenderingScreenshot.java b/shadows/framework/src/main/java/org/robolectric/shadows/HardwareRenderingScreenshot.java index 0fe29a9b0e2..e01930a4ed7 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/HardwareRenderingScreenshot.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/HardwareRenderingScreenshot.java @@ -42,8 +42,7 @@ private HardwareRenderingScreenshot() {} /** * Indicates whether {@link #takeScreenshot(View, Bitmap)} can run, by validating the API level, - * the presence of the {@link #USE_HARDWARE_RENDERER_NATIVE_ENV} property, and the {@link - * GraphicsMode}. + * the value of the {@link #PIXEL_COPY_RENDER_MODE} property, and the {@link GraphicsMode}. */ static boolean canTakeScreenshot(View view) { return RuntimeEnvironment.getApiLevel() >= P