commit ca2fca7f366979bcd825baa92d22d1b7a5c1a76e
author Jean-Michel Trivi <jmtrivi@google.com> Tue Jul 07 10:00:14 2020 -0700
committer Igor Tolkov <itolkov@google.com> Thu Nov 18 02:27:16 2021 +0000
tree 34fbc4fe5cb31653085c0c6ba8771a71983f11d0
parent 3dbe72913f15f4b83dedb9a9ad712a09a9b8e5ec

RESTRICT AUTOMERGE AudioManagerTest: skip testVolume for TV

TV devices are connected to audio devices that are typically fixed
or full volume, therefore causing incremental volume changes to be
disabled, but there are no APIs yet to query this, therefore we
skip the testVolume test altogether for TVs.
Also improve assert messages in testVolume.

Bug: 160531287
Fix: 149722142
Test: atest CtsMediaTestCases:android.media.cts.AudioManagerTest#testVolume
Change-Id: I72afbda0cc2b9e501031001e7e4287692b8ea9b5
Merged-In: I72afbda0cc2b9e501031001e7e4287692b8ea9b5
(cherry picked from commit 5cb6288660c9bafdd15c5d25f896ead4ef55e445)

tests/tests/media/src/android/media/cts/AudioManagerTest.java

diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index 05f4a48..e5e7c19 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -63,6 +63,7 @@
 import android.view.SoundEffectConstants;
 
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.internal.annotations.GuardedBy;
 
 import java.util.HashMap;
@@ -623,6 +624,8 @@
     }
 
     public void testVolume() throws Exception {
+        if (MediaUtils.check(mIsTelevision, "No volume test due to fixed/full volume devices"))
+            return;
         if (!mSupportNotificationPolicyAccess) {
             return;
         }
@@ -691,7 +694,9 @@
             volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
             mAudioManager.adjustSuggestedStreamVolume(ADJUST_LOWER, stream, 0);
             Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
-            assertEquals(maxVolume - volumeDelta, mAudioManager.getStreamVolume(stream));
+            assertEquals("Vol ADJUST_LOWER suggested stream:" + stream + " maxVol:" + maxVolume
+                    + " volDelta:" + volumeDelta,
+                    maxVolume - volumeDelta, mAudioManager.getStreamVolume(stream));
 
             // volume lower
             mAudioManager.setStreamVolume(stream, maxVolume, 0);
@@ -699,7 +704,9 @@
             while (volume > minVolume) {
                 volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
                 mAudioManager.adjustStreamVolume(stream, ADJUST_LOWER, 0);
-                assertEquals(Math.max(0, volume - volumeDelta),
+                assertEquals("Vol ADJUST_LOWER on stream:" + stream + " vol:" + volume
+                                + " minVol:" + minVolume + " volDelta:" + volumeDelta,
+                        Math.max(0, volume - volumeDelta),
                         mAudioManager.getStreamVolume(stream));
                 volume = mAudioManager.getStreamVolume(stream);
             }
@@ -712,7 +719,9 @@
             while (volume < maxVolume) {
                 volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
                 mAudioManager.adjustStreamVolume(stream, ADJUST_RAISE, 0);
-                assertEquals(Math.min(volume + volumeDelta, maxVolume),
+                assertEquals("Vol ADJUST_RAISE on stream:" + stream + " vol:" + volume
+                                + " maxVol:" + maxVolume + " volDelta:" + volumeDelta,
+                        Math.min(volume + volumeDelta, maxVolume),
                         mAudioManager.getStreamVolume(stream));
                 volume = mAudioManager.getStreamVolume(stream);
             }
@@ -721,7 +730,8 @@
             mAudioManager.setStreamVolume(stream, maxVolume, 0);
             for (int k = 0; k < maxVolume; k++) {
                 mAudioManager.adjustStreamVolume(stream, ADJUST_SAME, 0);
-                assertEquals(maxVolume, mAudioManager.getStreamVolume(stream));
+                assertEquals("Vol ADJUST_RAISE on ADJUST_SAME stream:" + stream,
+                        maxVolume, mAudioManager.getStreamVolume(stream));
             }
 
             mAudioManager.setStreamVolume(stream, maxVolume, 0);