Fix tests

Author: Nick Rout

material3Lib/src/androidTest/java/com/google/android/material/composethemeadapter3/Mdc3ThemeTest.kt

@@ -71,6 +71,7 @@ class Mdc3ThemeTest {
             Assert.assertEquals(colorResource(R.color.light_coral), colorScheme.onSurface)
             Assert.assertEquals(colorResource(R.color.salmon), colorScheme.surfaceVariant)
             Assert.assertEquals(colorResource(R.color.dark_salmon), colorScheme.onSurfaceVariant)
+            Assert.assertEquals(colorResource(R.color.indian_red), colorScheme.surfaceTint)
             Assert.assertEquals(colorResource(R.color.light_salmon), colorScheme.inverseSurface)
             Assert.assertEquals(colorResource(R.color.orchid), colorScheme.inverseOnSurface)
 

material3Lib/src/androidTest/res/values/test_colors.xml

@@ -33,6 +33,7 @@
     <color name="medium_spring_green">#00FA9A</color>
     <color name="navy">#000080</color>
     <color name="dark_blue">#00008B</color>
+    <color name="indian_red">#CD5C5C</color>
     <color name="light_coral">#F08080</color>
     <color name="salmon">#FA8072</color>
     <color name="dark_salmon">#E9967A</color>

material3Lib/src/androidTest/res/values/themes.xml

@@ -38,6 +38,7 @@
         <item name="colorOnSurface">@color/light_coral</item>
         <item name="colorSurfaceVariant">@color/salmon</item>
         <item name="colorOnSurfaceVariant">@color/dark_salmon</item>
+        <item name="elevationOverlayColor">@color/indian_red</item>
         <item name="colorSurfaceInverse">@color/light_salmon</item>
         <item name="colorOnSurfaceInverse">@color/orchid</item>
         <item name="colorOutline">@color/violet</item>

materialLib/src/androidTest/java/com/google/android/material/composethemeadapter/MdcThemeTest.kt

@@ -23,7 +23,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -71,15 +70,7 @@ class MdcThemeTest<T : AppCompatActivity>(activityClass: Class<T>) {
 
             assertEquals(colorResource(R.color.dark_golden_rod), color.secondary)
             assertEquals(colorResource(R.color.slate_gray), color.onSecondary)
-
-            // We don't check isSystemInDarkTheme() here since that only checks the system
-            // dark theme setting: https://issuetracker.google.com/163103826
-            if (LocalContext.current.isInDarkTheme()) {
-                // In dark theme secondaryVariant is ignored and always return secondary
-                assertEquals(colorResource(R.color.dark_golden_rod), color.secondaryVariant)
-            } else {
-                assertEquals(colorResource(R.color.blue_violet), color.secondaryVariant)
-            }
+            assertEquals(colorResource(R.color.blue_violet), color.secondaryVariant)
 
             assertEquals(colorResource(R.color.spring_green), color.surface)
             assertEquals(colorResource(R.color.navy), color.onSurface)