commit ae34cf24474e1de9a82ea7bcbaa7cc5618a09e7f
author Ricardo Garcia <rago@google.com> Tue Dec 16 17:23:41 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 16 17:23:42 2014 +0000
tree 173e5756e902889181787fd9443a4300ed115042
parent ee70e69744a7c525bbd959881187fe7c19386c15
parent 954d047463f289dfdd09ad7d0c894d2f23995530

Merge "Fix for Visualizer CTS test: Wait for media to start playing" into lmp-mr1-dev

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

diff --git a/tests/tests/media/src/android/media/cts/VisualizerTest.java b/tests/tests/media/src/android/media/cts/VisualizerTest.java
index 4582c3f..73e48f2 100644
--- a/tests/tests/media/src/android/media/cts/VisualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VisualizerTest.java
@@ -302,10 +302,19 @@
             assertTrue("visualizer not enabled", mVisualizer.getEnabled());
             Thread.sleep(100);
             int status = mVisualizer.setMeasurementMode(Visualizer.MEASUREMENT_MODE_PEAK_RMS);
-            // make sure we're playing long enough so the measurement is valid
-            Thread.sleep(500);
             assertEquals("setMeasurementMode() for PEAK_RMS doesn't report success",
                     Visualizer.SUCCESS, status);
+            // make sure we're playing long enough so the measurement is valid
+            int currentPosition = mp.getCurrentPosition();
+            final int maxTry = 100;
+            int tryCount = 0;
+            while (currentPosition < 400 && tryCount < maxTry) {
+                Thread.sleep(50);
+                currentPosition = mp.getCurrentPosition();
+                tryCount++;
+            }
+            assertTrue("MediaPlayer not ready", tryCount < maxTry);
+
             MeasurementPeakRms measurement = new MeasurementPeakRms();
             status = mVisualizer.getMeasurementPeakRms(measurement);
             mp.stop();
@@ -350,10 +359,19 @@
             assertTrue("visualizer not enabled", mVisualizer.getEnabled());
             Thread.sleep(100);
             int status = mVisualizer.setMeasurementMode(Visualizer.MEASUREMENT_MODE_PEAK_RMS);
-            // make sure we're playing long enough so the measurement is valid
-            Thread.sleep(500);
             assertEquals("setMeasurementMode() for PEAK_RMS doesn't report success",
                     Visualizer.SUCCESS, status);
+            // make sure we're playing long enough so the measurement is valid
+            int currentPosition = mp.getCurrentPosition();
+            final int maxTry = 100;
+            int tryCount = 0;
+            while (currentPosition < 400 && tryCount < maxTry) {
+                Thread.sleep(50);
+                currentPosition = mp.getCurrentPosition();
+                tryCount++;
+            }
+            assertTrue("MediaPlayer not ready", tryCount < maxTry);
+
             MeasurementPeakRms measurement = new MeasurementPeakRms();
             status = mVisualizer.getMeasurementPeakRms(measurement);
             mp.stop();