| Index: Source/core/html/TimeRangesTest.cpp
|
| diff --git a/Source/core/html/TimeRangesTest.cpp b/Source/core/html/TimeRangesTest.cpp
|
| index aab2e9d4ffb3065a0ebc3d4861634e1de7679ede..493c4f820eeee1fdd72297e4ac094b71bbbc960a 100644
|
| --- a/Source/core/html/TimeRangesTest.cpp
|
| +++ b/Source/core/html/TimeRangesTest.cpp
|
| @@ -33,10 +33,9 @@
|
|
|
| #include "bindings/core/v8/ExceptionStatePlaceholder.h"
|
| #include <gtest/gtest.h>
|
| -
|
| #include <sstream>
|
|
|
| -using blink::TimeRanges;
|
| +namespace blink {
|
|
|
| static std::string ToString(const TimeRanges& ranges)
|
| {
|
| @@ -51,17 +50,17 @@ static std::string ToString(const TimeRanges& ranges)
|
|
|
| #define ASSERT_RANGE(expected, range) ASSERT_EQ(expected, ToString(*range))
|
|
|
| -TEST(TimeRanges, Empty)
|
| +TEST(TimeRangesTest, Empty)
|
| {
|
| ASSERT_RANGE("{ }", TimeRanges::create());
|
| }
|
|
|
| -TEST(TimeRanges, SingleRange)
|
| +TEST(TimeRangesTest, SingleRange)
|
| {
|
| ASSERT_RANGE("{ [1,2) }", TimeRanges::create(1, 2));
|
| }
|
|
|
| -TEST(TimeRanges, CreateFromWebTimeRanges)
|
| +TEST(TimeRangesTest, CreateFromWebTimeRanges)
|
| {
|
| blink::WebTimeRanges webRanges(static_cast<size_t>(2));
|
| webRanges[0].start = 0;
|
| @@ -71,7 +70,7 @@ TEST(TimeRanges, CreateFromWebTimeRanges)
|
| ASSERT_RANGE("{ [0,1) [2,3) }", TimeRanges::create(webRanges));
|
| }
|
|
|
| -TEST(TimeRanges, AddOrder)
|
| +TEST(TimeRangesTest, AddOrder)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangeA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangeB = TimeRanges::create();
|
| @@ -90,7 +89,7 @@ TEST(TimeRanges, AddOrder)
|
| ASSERT_RANGE(expected, rangeB);
|
| }
|
|
|
| -TEST(TimeRanges, OverlappingAdds)
|
| +TEST(TimeRangesTest, OverlappingAdds)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create();
|
|
|
| @@ -120,7 +119,7 @@ TEST(TimeRanges, OverlappingAdds)
|
| ASSERT_RANGE("{ [-1,11) }", ranges);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_Self)
|
| +TEST(TimeRangesTest, IntersectWith_Self)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create(0, 2);
|
|
|
| @@ -131,7 +130,7 @@ TEST(TimeRanges, IntersectWith_Self)
|
| ASSERT_RANGE("{ [0,2) }", ranges);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_IdenticalRange)
|
| +TEST(TimeRangesTest, IntersectWith_IdenticalRange)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create(0, 2);
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = rangesA->copy();
|
| @@ -145,7 +144,7 @@ TEST(TimeRanges, IntersectWith_IdenticalRange)
|
| ASSERT_RANGE("{ [0,2) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_Empty)
|
| +TEST(TimeRangesTest, IntersectWith_Empty)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create(0, 2);
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -159,7 +158,7 @@ TEST(TimeRanges, IntersectWith_Empty)
|
| ASSERT_RANGE("{ }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_DisjointRanges1)
|
| +TEST(TimeRangesTest, IntersectWith_DisjointRanges1)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -179,7 +178,7 @@ TEST(TimeRanges, IntersectWith_DisjointRanges1)
|
| ASSERT_RANGE("{ [2,3) [6,7) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_DisjointRanges2)
|
| +TEST(TimeRangesTest, IntersectWith_DisjointRanges2)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -199,7 +198,7 @@ TEST(TimeRanges, IntersectWith_DisjointRanges2)
|
| ASSERT_RANGE("{ [1,4) [5,7) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_CompleteOverlap1)
|
| +TEST(TimeRangesTest, IntersectWith_CompleteOverlap1)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -219,7 +218,7 @@ TEST(TimeRanges, IntersectWith_CompleteOverlap1)
|
| ASSERT_RANGE("{ [0,10) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_CompleteOverlap2)
|
| +TEST(TimeRangesTest, IntersectWith_CompleteOverlap2)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -239,7 +238,7 @@ TEST(TimeRanges, IntersectWith_CompleteOverlap2)
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_Gaps1)
|
| +TEST(TimeRangesTest, IntersectWith_Gaps1)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -258,7 +257,7 @@ TEST(TimeRanges, IntersectWith_Gaps1)
|
| ASSERT_RANGE("{ [1,5) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_Gaps2)
|
| +TEST(TimeRangesTest, IntersectWith_Gaps2)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -278,7 +277,7 @@ TEST(TimeRanges, IntersectWith_Gaps2)
|
| ASSERT_RANGE("{ [1,9) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, IntersectWith_Gaps3)
|
| +TEST(TimeRangesTest, IntersectWith_Gaps3)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> rangesA = TimeRanges::create();
|
| RefPtrWillBeRawPtr<TimeRanges> rangesB = TimeRanges::create();
|
| @@ -299,7 +298,7 @@ TEST(TimeRanges, IntersectWith_Gaps3)
|
| ASSERT_RANGE("{ [1,5) [6,9) }", rangesB);
|
| }
|
|
|
| -TEST(TimeRanges, Nearest)
|
| +TEST(TimeRangesTest, Nearest)
|
| {
|
| RefPtrWillBeRawPtr<TimeRanges> ranges = TimeRanges::create();
|
| ranges->add(0, 2);
|
| @@ -318,3 +317,5 @@ TEST(TimeRanges, Nearest)
|
| ASSERT_EQ(7, ranges->nearest(8, 8));
|
| ASSERT_EQ(9, ranges->nearest(8, 10));
|
| }
|
| +
|
| +} // namespace blink
|
|
|