[M3][Color] Added DynamicColorsTest.

PiperOrigin-RevId: 450691016

Author: Material Design Team

lib/javatests/com/google/android/material/color/DynamicColorsTest.java

@@ -27,6 +27,7 @@
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import android.util.TypedValue;
 import androidx.appcompat.view.ContextThemeWrapper;
 import com.google.android.material.color.DynamicColors.Precondition;
 import com.google.android.material.resources.MaterialAttributes;
@@ -45,6 +46,7 @@
 /** Tests the logic of {@link com.google.android.material.color.DynamicColors} utility class. */
 @RunWith(ParameterizedRobolectricTestRunner.class)
 public class DynamicColorsTest {
+
   @Parameter(0)
   public String testName;
 
@@ -58,7 +60,7 @@ public class DynamicColorsTest {
   @Parameters(name = "{0}")
   public static ImmutableList<Object[]> getTestData() {
     return ImmutableList.<Object[]>builder()
-        .add(new Object[] {"Test dynamic colors with Light Theme", R.style.Theme_Material3_Light})
+        .add(new Object[] {"Test dynamic colors with Light Theme", R.style.Test_Theme_BaseTheme})
         .build();
   }
 
@@ -75,51 +77,58 @@ public void testApplyOnApplicationWithDefaultTheme() {
     DynamicColors.applyToActivitiesIfAvailable(mockApplication);
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.dynamic_theme_id);
   }
 
   @Test
   public void testApplyOnApplicationWithCustomTheme() {
-    final int mockThemeOverlay = 0xABCDABCD;
-    DynamicColors.applyToActivitiesIfAvailable(mockApplication, mockThemeOverlay);
+    DynamicColors.applyToActivitiesIfAvailable(
+        mockApplication,
+        new DynamicColorsOptions.Builder()
+            .setThemeOverlay(R.style.Test_ThemeOverlay_CustomTheme)
+            .build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.custom_theme_id);
   }
 
   @Test
   public void testApplyOnApplicationWithPreconditionFalse() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
-    DynamicColors.applyToActivitiesIfAvailable(mockApplication, mockPrecondition);
+    DynamicColors.applyToActivitiesIfAvailable(
+        mockApplication,
+        new DynamicColorsOptions.Builder().setPrecondition(mockPrecondition).build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
     assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   @Test
   public void testApplyOnApplicationWithPreconditionTrue() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
     mockPrecondition.shouldApplyDynamicColors = true;
-    DynamicColors.applyToActivitiesIfAvailable(mockApplication, mockPrecondition);
+    DynamicColors.applyToActivitiesIfAvailable(
+        mockApplication,
+        new DynamicColorsOptions.Builder().setPrecondition(mockPrecondition).build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.dynamic_theme_id);
   }
 
   @Test
   public void testApplyOnApplicationWithCustomThemeAndPrecondition() {
-    final int mockThemeOverlay = 0xABCDABCD;
     final MockPrecondition mockPrecondition = new MockPrecondition();
     mockPrecondition.shouldApplyDynamicColors = true;
     DynamicColors.applyToActivitiesIfAvailable(
-        mockApplication, mockThemeOverlay, mockPrecondition);
+        mockApplication,
+        new DynamicColorsOptions.Builder()
+            .setPrecondition(mockPrecondition)
+            .setThemeOverlay(R.style.Test_ThemeOverlay_CustomTheme)
+            .build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.custom_theme_id);
   }
 
   @Test
@@ -129,10 +138,15 @@ public void testApplyOnApplicationWithNoDynamicColorAvailable() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
     mockPrecondition.shouldApplyDynamicColors = true;
     DynamicColors.applyToActivitiesIfAvailable(
-        mockApplication, mockThemeOverlay, mockPrecondition);
+        mockApplication,
+        new DynamicColorsOptions.Builder()
+            .setPrecondition(mockPrecondition)
+            .setThemeOverlay(mockThemeOverlay)
+            .build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
     assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   @Test
@@ -142,54 +156,64 @@ public void testApplyOnApplicationWithLowSdkVersion() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
     mockPrecondition.shouldApplyDynamicColors = true;
     DynamicColors.applyToActivitiesIfAvailable(
-        mockApplication, mockThemeOverlay, mockPrecondition);
+        mockApplication,
+        new DynamicColorsOptions.Builder()
+            .setPrecondition(mockPrecondition)
+            .setThemeOverlay(mockThemeOverlay)
+            .build());
     mockApplication.capturedCallbacks.onActivityPreCreated(mockActivity, new Bundle());
 
     assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   @Test
   public void testApplyOnActivityWithDefaultTheme() {
-    DynamicColors.applyIfAvailable(mockActivity);
+    DynamicColors.applyToActivityIfAvailable(mockActivity);
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.dynamic_theme_id);
   }
 
   @Test
   public void testApplyOnActivityWithCustomTheme() {
-    final int mockThemeOverlay = 0xABCDABCD;
-    DynamicColors.applyIfAvailable(mockActivity, mockThemeOverlay);
+    DynamicColors.applyToActivityIfAvailable(
+        mockActivity,
+        new DynamicColorsOptions.Builder()
+            .setThemeOverlay(R.style.Test_ThemeOverlay_CustomTheme)
+            .build());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.custom_theme_id);
   }
 
   @Test
   public void testApplyOnActivityWithPreconditionFalse() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
-    DynamicColors.applyIfAvailable(mockActivity, mockPrecondition);
+    DynamicColors.applyToActivityIfAvailable(
+        mockActivity, new DynamicColorsOptions.Builder().setPrecondition(mockPrecondition).build());
 
     assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   @Test
   public void testApplyOnActivityWithPreconditionTrue() {
     final MockPrecondition mockPrecondition = new MockPrecondition();
     mockPrecondition.shouldApplyDynamicColors = true;
-    DynamicColors.applyIfAvailable(mockActivity, mockPrecondition);
+    DynamicColors.applyToActivityIfAvailable(
+        mockActivity, new DynamicColorsOptions.Builder().setPrecondition(mockPrecondition).build());
 
-    // TODO(b/230848477): Update tests to make sure dynamic colors theme overlay is indeed applied.
-    assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.dynamic_theme_id);
   }
 
   @Test
   public void testApplyOnActivityWithNoDynamicColorAvailable() {
     setDynamicColorAvailability(false);
     final int mockThemeOverlay = 0xABCDABCD;
-    DynamicColors.applyIfAvailable(mockActivity, mockThemeOverlay);
+    DynamicColors.applyToActivityIfAvailable(
+        mockActivity, new DynamicColorsOptions.Builder().setThemeOverlay(mockThemeOverlay).build());
 
     assertThat(getThemeResId(mockActivity)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   @Test
@@ -234,6 +258,7 @@ public void testWrapContextWithNoDynamicColorAvailable() {
     Context context = DynamicColors.wrapContextIfAvailable(mockActivity, mockThemeOverlay);
 
     assertThat(getThemeResId(context)).isEqualTo(baseTheme);
+    assertThat(getThemeId()).isEqualTo(R.id.default_theme_id);
   }
 
   private void setDynamicColorAvailability(boolean available) {
@@ -242,8 +267,7 @@ private void setDynamicColorAvailability(boolean available) {
   }
 
   private void setSdkVersion(int sdkVersion) {
-    ReflectionHelpers.setStaticField(
-        Build.VERSION.class, "SDK_INT", sdkVersion);
+    ReflectionHelpers.setStaticField(Build.VERSION.class, "SDK_INT", sdkVersion);
   }
 
   @SuppressWarnings("RestrictTo")
@@ -276,4 +300,10 @@ public boolean shouldApplyDynamicColors(Activity activity, int theme) {
       return shouldApplyDynamicColors;
     }
   }
+
+  private int getThemeId() {
+    TypedValue typedValue = new TypedValue();
+    mockActivity.getTheme().resolveAttribute(R.attr.themeId, typedValue, true);
+    return typedValue.resourceId;
+  }
 }

lib/javatests/com/google/android/material/color/res/values/attrs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<resources>
+
+  <attr name="themeId" format="integer"/>
+</resources>

lib/javatests/com/google/android/material/color/res/values/ids.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<resources>
+
+  <item name="default_theme_id" type="id" />
+  <item name="custom_theme_id" type="id" />
+  <item name="dynamic_theme_id" type="id" />
+</resources>

lib/javatests/com/google/android/material/color/res/values/theme_overlays.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+  <style name="Test.ThemeOverlay.CustomTheme" parent="@style/ThemeOverlay.Material3.DynamicColors.DayNight">
+    <item name="themeId">@id/custom_theme_id</item>
+  </style>
+
+  <style name="Test.ThemeOverlay.DynamicColors" parent="">
+    <item name="themeId">@id/dynamic_theme_id</item>
+  </style>
+
+</resources>

lib/javatests/com/google/android/material/color/res/values/themes.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+  <style name="Test.Theme.BaseTheme" parent="@style/Theme.Material3.Light">
+    <item name="themeId">@id/default_theme_id</item>
+    <item name="dynamicColorThemeOverlay">@style/Test.ThemeOverlay.DynamicColors</item>
+  </style>
+
+</resources>