Merge "Clear parameterlessEngine in tests" into androidx-main

Author: Treehugger Robot

wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/WatchFaceServiceAndroidTest.kt

@@ -21,16 +21,23 @@ import android.graphics.drawable.Icon
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
+import androidx.wear.watchface.control.InteractiveInstanceManager
 import androidx.wear.watchface.style.UserStyleSchema
 import androidx.wear.watchface.style.UserStyleSetting
 import androidx.wear.watchface.style.WatchFaceLayer
 import androidx.wear.watchface.test.SimpleWatchFaceTestService
+import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest
 class WatchFaceServiceAndroidTest {
+    @After
+    public fun tearDown() {
+        InteractiveInstanceManager.setParameterlessEngine(null)
+    }
+
     @Test
     fun measuresWatchFaceIconsFromCustomContext() {
         val context: Context = ApplicationProvider.getApplicationContext()

wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceControlServiceTest.kt

@@ -50,6 +50,7 @@ import androidx.wear.watchface.complications.data.ShortTextComplicationData
 import androidx.wear.watchface.complications.data.WeightedElementsComplicationData
 import androidx.wear.watchface.control.IHeadlessWatchFace
 import androidx.wear.watchface.control.IWatchFaceControlService
+import androidx.wear.watchface.control.InteractiveInstanceManager
 import androidx.wear.watchface.control.WatchFaceControlService
 import androidx.wear.watchface.control.data.ComplicationRenderParams
 import androidx.wear.watchface.control.data.HeadlessWatchFaceInstanceParams
@@ -142,6 +143,7 @@ public class WatchFaceControlServiceTest {
         if (this::instance.isInitialized) {
             instance.release()
         }
+        InteractiveInstanceManager.setParameterlessEngine(null)
     }
 
     private fun createInstance(width: Int, height: Int) {

wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/WatchFaceServiceImageTest.kt

@@ -86,7 +86,6 @@ import org.junit.After
 import org.junit.Assert.fail
 import org.junit.Assume
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -215,6 +214,7 @@ public class WatchFaceServiceImageTest {
         }
         assertThat(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue()
         pretendBinderThread.quitSafely()
+        InteractiveInstanceManager.setParameterlessEngine(null)
     }
 
     private fun initCanvasWatchFace(onInvalidateCountDownLatch: CountDownLatch? = null) {
@@ -546,7 +546,6 @@ public class WatchFaceServiceImageTest {
         bitmap!!.assertAgainstGolden(screenshotRule, "placeholderComplications")
     }
 
-    @Ignore("b/274813981")
     @SuppressLint("NewApi")
     @Test
     public fun testSmallImageComplications() {
@@ -694,7 +693,6 @@ public class WatchFaceServiceImageTest {
         bitmap!!.assertAgainstGolden(screenshotRule, "left_complication_pressed")
     }
 
-    @Ignore("b/274981990")
     @SuppressLint("NewApi")
     @Test
     public fun testHighlightRightComplicationInScreenshot() {

wear/watchface/watchface/src/androidTest/java/androidx/wear/watchface/test/XmlDefinedUserStyleSchemaAndComplicationSlotsTest.kt

@@ -67,7 +67,6 @@ import org.junit.After
 import org.junit.Assert
 import org.junit.Assume
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
@@ -176,6 +175,7 @@ public class XmlDefinedUserStyleSchemaAndComplicationSlotsTest {
 
     @After
     public fun tearDown() {
+        InteractiveInstanceManager.setParameterlessEngine(null)
         if (this::interactiveWatchFaceInstance.isInitialized) {
             interactiveWatchFaceInstance.release()
         }
@@ -216,7 +216,6 @@ public class XmlDefinedUserStyleSchemaAndComplicationSlotsTest {
         assertThat(existingInstance).isNull()
     }
 
-    @Ignore // b/275354644
     @Test
     @Suppress("Deprecation", "NewApi") // userStyleSettings
     public fun staticSchemaAndComplicationsRead() {