Skip to content

GitLab

T
tangled
Commit a262e4f8 authored by johnme's avatar johnme Committed by Commit Bot
Browse files
Options

[Media Controls] Fix and re-enable failing metrics tests on Android 

BUG=709483

Review-Url: https://codereview.chromium.org/2919503004
Cr-Commit-Position: refs/heads/master@{#476266}
parent 945f4bf5
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 57 deletions
third_party/WebKit/Source/modules/media_controls/MediaControlsImplTest.cpp
View file @ a262e4f8
...@@ -39,6 +39,14 @@ ...@@ -39,6 +39,14 @@
#include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h" #include "public/platform/modules/remoteplayback/WebRemotePlaybackClient.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
// The MediaTimelineWidths histogram suffix expected to be encountered in these
// tests. Depends on the OS, since Android sizes its timeline differently.
#if OS(ANDROID)
#define TIMELINE_W "80_127"
#else
#define TIMELINE_W "128_255"
#endif
namespace blink { namespace blink {
namespace { namespace {
...@@ -618,13 +626,7 @@ TEST_F(MediaControlsImplTest, TimelineMetricsWidth) { ...@@ -618,13 +626,7 @@ TEST_F(MediaControlsImplTest, TimelineMetricsWidth) {
"Media.Timeline.Width.FullscreenPortrait", 0); "Media.Timeline.Width.FullscreenPortrait", 0);
} }
// TODO(johnme): Fix and re-enable this on Android. TEST_F(MediaControlsImplTest, TimelineMetricsClick) {
#if OS(ANDROID)
#define MAYBE_TimelineMetricsClick DISABLED_TimelineMetricsClick
#else
#define MAYBE_TimelineMetricsClick TimelineMetricsClick
#endif
TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsClick) {
double duration = 540; // 9 minutes double duration = 540; // 9 minutes
LoadMediaWithDuration(duration); LoadMediaWithDuration(duration);
EnsureSizing(); EnsureSizing();
...@@ -645,27 +647,19 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsClick) { ...@@ -645,27 +647,19 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsClick) {
EXPECT_LE(0.49 * duration, MediaControls().MediaElement().currentTime()); EXPECT_LE(0.49 * duration, MediaControls().MediaElement().currentTime());
EXPECT_GE(0.51 * duration, MediaControls().MediaElement().currentTime()); EXPECT_GE(0.51 * duration, MediaControls().MediaElement().currentTime());
GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType.128_255", GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType." TIMELINE_W,
0 /* SeekType::kClick */, 1); 0 /* SeekType::kClick */, 1);
GetHistogramTester().ExpectTotalCount( GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragGestureDuration.128_255", 0); "Media.Timeline.DragGestureDuration." TIMELINE_W, 0);
GetHistogramTester().ExpectTotalCount("Media.Timeline.DragPercent.128_255",
0);
GetHistogramTester().ExpectTotalCount( GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragSumAbsTimeDelta.128_255", 0); "Media.Timeline.DragPercent." TIMELINE_W, 0);
GetHistogramTester().ExpectTotalCount("Media.Timeline.DragTimeDelta.128_255", GetHistogramTester().ExpectTotalCount(
0); "Media.Timeline.DragSumAbsTimeDelta." TIMELINE_W, 0);
GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragTimeDelta." TIMELINE_W, 0);
} }
// TODO(johnme): Fix and re-enable this on Android. TEST_F(MediaControlsImplTest, TimelineMetricsDragFromCurrentPosition) {
#if OS(ANDROID)
#define MAYBE_TimelineMetricsDragFromCurrentPosition \
DISABLED_TimelineMetricsDragFromCurrentPosition
#else
#define MAYBE_TimelineMetricsDragFromCurrentPosition \
TimelineMetricsDragFromCurrentPosition
#endif
TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromCurrentPosition) {
double duration = 540; // 9 minutes double duration = 540; // 9 minutes
LoadMediaWithDuration(duration); LoadMediaWithDuration(duration);
EnsureSizing(); EnsureSizing();
...@@ -689,26 +683,19 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromCurrentPosition) { ...@@ -689,26 +683,19 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromCurrentPosition) {
EXPECT_GE(0.68 * duration, MediaControls().MediaElement().currentTime()); EXPECT_GE(0.68 * duration, MediaControls().MediaElement().currentTime());
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.SeekType.128_255", "Media.Timeline.SeekType." TIMELINE_W,
1 /* SeekType::kDragFromCurrentPosition */, 1); 1 /* SeekType::kDragFromCurrentPosition */, 1);
GetHistogramTester().ExpectTotalCount( GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragGestureDuration.128_255", 1); "Media.Timeline.DragGestureDuration." TIMELINE_W, 1);
GetHistogramTester().ExpectUniqueSample("Media.Timeline.DragPercent.128_255", GetHistogramTester().ExpectUniqueSample(
47 /* [60.0%, 70.0%) */, 1); "Media.Timeline.DragPercent." TIMELINE_W, 47 /* [60.0%, 70.0%) */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragSumAbsTimeDelta.128_255", 16 /* [4m, 8m) */, 1); "Media.Timeline.DragSumAbsTimeDelta." TIMELINE_W, 16 /* [4m, 8m) */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragTimeDelta.128_255", 40 /* [4m, 8m) */, 1); "Media.Timeline.DragTimeDelta." TIMELINE_W, 40 /* [4m, 8m) */, 1);
} }
// TODO(johnme): Fix and re-enable this on Android. TEST_F(MediaControlsImplTest, TimelineMetricsDragFromElsewhere) {
#if OS(ANDROID)
#define MAYBE_TimelineMetricsDragFromElsewhere \
DISABLED_TimelineMetricsDragFromElsewhere
#else
#define MAYBE_TimelineMetricsDragFromElsewhere TimelineMetricsDragFromElsewhere
#endif
TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromElsewhere) {
double duration = 540; // 9 minutes double duration = 540; // 9 minutes
LoadMediaWithDuration(duration); LoadMediaWithDuration(duration);
EnsureSizing(); EnsureSizing();
...@@ -732,27 +719,20 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromElsewhere) { ...@@ -732,27 +719,20 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragFromElsewhere) {
EXPECT_LE(0.66 * duration, MediaControls().MediaElement().currentTime()); EXPECT_LE(0.66 * duration, MediaControls().MediaElement().currentTime());
EXPECT_GE(0.68 * duration, MediaControls().MediaElement().currentTime()); EXPECT_GE(0.68 * duration, MediaControls().MediaElement().currentTime());
GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType.128_255", GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType." TIMELINE_W,
2 /* SeekType::kDragFromElsewhere */, 2 /* SeekType::kDragFromElsewhere */,
1); 1);
GetHistogramTester().ExpectTotalCount( GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragGestureDuration.128_255", 1); "Media.Timeline.DragGestureDuration." TIMELINE_W, 1);
GetHistogramTester().ExpectUniqueSample("Media.Timeline.DragPercent.128_255",
42 /* [30.0%, 35.0%) */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragSumAbsTimeDelta.128_255", 15 /* [2m, 4m) */, 1); "Media.Timeline.DragPercent." TIMELINE_W, 42 /* [30.0%, 35.0%) */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragTimeDelta.128_255", 39 /* [2m, 4m) */, 1); "Media.Timeline.DragSumAbsTimeDelta." TIMELINE_W, 15 /* [2m, 4m) */, 1);
GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragTimeDelta." TIMELINE_W, 39 /* [2m, 4m) */, 1);
} }
// TODO(johnme): Fix and re-enable this on Android. TEST_F(MediaControlsImplTest, TimelineMetricsDragBackAndForth) {
#if OS(ANDROID)
#define MAYBE_TimelineMetricsDragBackAndForth \
DISABLED_TimelineMetricsDragBackAndForth
#else
#define MAYBE_TimelineMetricsDragBackAndForth TimelineMetricsDragBackAndForth
#endif
TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragBackAndForth) {
double duration = 540; // 9 minutes double duration = 540; // 9 minutes
LoadMediaWithDuration(duration); LoadMediaWithDuration(duration);
EnsureSizing(); EnsureSizing();
...@@ -778,17 +758,17 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragBackAndForth) { ...@@ -778,17 +758,17 @@ TEST_F(MediaControlsImplTest, MAYBE_TimelineMetricsDragBackAndForth) {
EXPECT_LE(0.32 * duration, MediaControls().MediaElement().currentTime()); EXPECT_LE(0.32 * duration, MediaControls().MediaElement().currentTime());
EXPECT_GE(0.34 * duration, MediaControls().MediaElement().currentTime()); EXPECT_GE(0.34 * duration, MediaControls().MediaElement().currentTime());
GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType.128_255", GetHistogramTester().ExpectUniqueSample("Media.Timeline.SeekType." TIMELINE_W,
2 /* SeekType::kDragFromElsewhere */, 2 /* SeekType::kDragFromElsewhere */,
1); 1);
GetHistogramTester().ExpectTotalCount( GetHistogramTester().ExpectTotalCount(
"Media.Timeline.DragGestureDuration.128_255", 1); "Media.Timeline.DragGestureDuration." TIMELINE_W, 1);
GetHistogramTester().ExpectUniqueSample("Media.Timeline.DragPercent.128_255", GetHistogramTester().ExpectUniqueSample(
8 /* (-35.0%, -30.0%] */, 1); "Media.Timeline.DragPercent." TIMELINE_W, 8 /* (-35.0%, -30.0%] */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragSumAbsTimeDelta.128_255", 17 /* [8m, 15m) */, 1); "Media.Timeline.DragSumAbsTimeDelta." TIMELINE_W, 17 /* [8m, 15m) */, 1);
GetHistogramTester().ExpectUniqueSample( GetHistogramTester().ExpectUniqueSample(
"Media.Timeline.DragTimeDelta.128_255", 9 /* (-4m, -2m] */, 1); "Media.Timeline.DragTimeDelta." TIMELINE_W, 9 /* (-4m, -2m] */, 1);
} }
namespace { namespace {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment